Skip to content

Commit 90fe8d9

Browse files
chlowellchlowell
authored
azure-keyvault-nspkg (Azure#7125)
1 parent fe4c62a commit 90fe8d9

File tree

19 files changed

+93
-14
lines changed

19 files changed

+93
-14
lines changed

‎.docsettings.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,12 @@ known_content_issues:
6363
- ['sdk/core/azure-mgmt-nspkg/README.rst', 'nspkg and common']
6464
- ['sdk/core/azure-core/README.md', 'nspkg and common']
6565
- ['sdk/appconfiguration/azure-appconfiguration/README.md', 'nspkg and common']
66+
- ['sdk/keyvault/azure-keyvault-nspkg/README.md', 'nspkg and common']
6667

6768
# root readme
6869
- ['README.md', 'root readme']
6970

70-
# dev tools
71+
# dev tools
7172
- ['doc/dev/mgmt/swagger/single_api/readme.md', 'dev readme']
7273
- ['doc/dev/mgmt/swagger/multi_api/readme.md', 'dev readme']
7374
- ['doc/dev/mgmt/README.md', 'dev readme']

‎scripts/devops_tasks/common_tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"mgmt",
2626
"azure-cognitiveservices",
2727
"azure-servicefabric",
28-
"azure-nspkg",
28+
"nspkg"
2929
]
3030

3131

‎sdk/keyvault/azure-keyvault-certificates/MANIFEST.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
include *.md
22
include azure/__init__.py
33
include azure/keyvault/__init__.py
4-
include azure/keyvault/certificates/__init__.py
5-
include azure/keyvault/certificates/_generated/__init__.py
6-
include azure/keyvault/certificates/aio/__init__.py

‎sdk/keyvault/azure-keyvault-certificates/dev_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
-e ../../../tools/azure-sdk-tools
44
-e ../../identity/azure-identity
55
-e ../azure-mgmt-keyvault
6+
../azure-keyvault-nspkg
67
aiohttp>=3.0; python_version >= '3.5'
78
pytest-asyncio>=0.8.0; python_version > '3.4'

‎sdk/keyvault/azure-keyvault-certificates/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@
7575
"tests",
7676
# Exclude packages that will be covered by PEP420 or nspkg
7777
"azure",
78+
"azure.keyvault"
7879
]
7980
),
8081
install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "msrest>=0.5.0"],
81-
extras_require={":python_version<'3.0'": ["azure-nspkg"], ":python_version<'3.5'": ["typing"]},
82+
extras_require={":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.5'": ["typing"]},
8283
)

‎sdk/keyvault/azure-keyvault-keys/MANIFEST.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
include *.md
22
include azure/__init__.py
33
include azure/keyvault/__init__.py
4-
include azure/keyvault/keys/__init__.py
5-
include azure/keyvault/keys/_generated/__init__.py
6-
include azure/keyvault/keys/aio/__init__.py

‎sdk/keyvault/azure-keyvault-keys/dev_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
-e ../../identity/azure-identity
44
-e ../azure-mgmt-keyvault
55
-e ../../../tools/azure-sdk-tools
6+
../azure-keyvault-nspkg
67
aiohttp>=3.0; python_version >= '3.5'
78
pytest-asyncio>=0.8.0; python_version > '3.4'

‎sdk/keyvault/azure-keyvault-keys/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@
7575
"tests",
7676
# Exclude packages that will be covered by PEP420 or nspkg
7777
"azure",
78+
"azure.keyvault",
7879
]
7980
),
8081
install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "msrest>=0.5.0"],
81-
extras_require={":python_version<'3.0'": ["azure-nspkg"], ":python_version<'3.5'": ["typing"]},
82+
extras_require={":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.5'": ["typing"]},
8283
)

‎sdk/keyvault/azure-keyvault-nspkg/MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include *.md
2+
include azure/__init__.py

‎sdk/keyvault/azure-keyvault-nspkg/README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Microsoft Azure SDK for Python
2+
3+
This is the Microsoft Azure Key Vault namespace package. It isn't intended to
4+
be installed directly. Key Vault client libraries are located elsewhere:
5+
- [`azure-keyvault-certificates`](https://pypi.org/project/azure-keyvault-certificates)
6+
- [`azure-keyvault-keys`](https://pypi.org/project/azure-keyvault-keys/)
7+
- [`azure-keyvault-secrets`](https://pypi.org/project/azure-keyvault-secrets)
8+
9+
This package is for Python 2 only. It provides the necessary files for other
10+
packages to extend the `azure` namespace. Python 3.x libraries use
11+
[`PEP420`](https://www.python.org/dev/peps/pep-0420/) instead.
12+
13+
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fsdk%2Fkeyvault%2Fazure-keyvault-nspkg%2FFREADME.png)

‎sdk/keyvault/azure-keyvault-nspkg/azure/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# ------------------------------------
2+
# Copyright (c) Microsoft Corporation.
3+
# Licensed under the MIT License.
4+
# ------------------------------------
5+
# pylint:disable=missing-docstring
6+
__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore

‎sdk/keyvault/azure-keyvault-nspkg/azure/keyvault/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# ------------------------------------
2+
# Copyright (c) Microsoft Corporation.
3+
# Licensed under the MIT License.
4+
# ------------------------------------
5+
# pylint:disable=missing-docstring
6+
__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore

‎sdk/keyvault/azure-keyvault-nspkg/sdk_packaging.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[packaging]
2+
auto_update = false

‎sdk/keyvault/azure-keyvault-nspkg/setup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[bdist_wheel]
2+
universal=1

‎sdk/keyvault/azure-keyvault-nspkg/setup.py

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/usr/bin/env python
2+
3+
# ------------------------------------
4+
# Copyright (c) Microsoft Corporation.
5+
# Licensed under the MIT License.
6+
# ------------------------------------
7+
import sys
8+
from setuptools import setup
9+
10+
# azure v0.x is not compatible with this package
11+
# azure v0.x used to have a __version__ attribute (newer versions don't)
12+
try:
13+
import azure
14+
15+
try:
16+
ver = azure.__version__
17+
raise Exception(
18+
"This package is incompatible with azure=={}. ".format(ver) + 'Uninstall it with "pip uninstall azure".'
19+
)
20+
except AttributeError:
21+
pass
22+
except ImportError:
23+
pass
24+
25+
setup(
26+
name="azure-keyvault-nspkg",
27+
version="1.0.0",
28+
description="Microsoft Azure Key Vault Namespace Package [Internal]",
29+
long_description=open("README.md", "r").read(),
30+
long_description_content_type="text/markdown",
31+
license="MIT License",
32+
author="Microsoft Corporation",
33+
author_email="azpysdkhelp@microsoft.com",
34+
url="https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault",
35+
classifiers=[
36+
"Development Status :: 5 - Production/Stable",
37+
"Programming Language :: Python",
38+
"Programming Language :: Python :: 2",
39+
"Programming Language :: Python :: 2.7",
40+
"Programming Language :: Python :: 3",
41+
"Programming Language :: Python :: 3.5",
42+
"Programming Language :: Python :: 3.6",
43+
"Programming Language :: Python :: 3.7",
44+
"License :: OSI Approved :: MIT License",
45+
],
46+
zip_safe=False,
47+
packages=["azure.keyvault"],
48+
install_requires=["azure-nspkg>=3.0.0"],
49+
)

‎sdk/keyvault/azure-keyvault-secrets/MANIFEST.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
include *.md
22
include azure/__init__.py
33
include azure/keyvault/__init__.py
4-
include azure/keyvault/secrets/__init__.py
5-
include azure/keyvault/secrets/_generated/__init__.py
6-
include azure/keyvault/secrets/aio/__init__.py

‎sdk/keyvault/azure-keyvault-secrets/dev_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
-e ../../identity/azure-identity
44
-e ../azure-mgmt-keyvault
55
-e ../../../tools/azure-sdk-tools
6+
../azure-keyvault-nspkg
67
aiohttp>=3.0; python_version >= '3.5'
78
pytest-asyncio>=0.8.0; python_version > '3.4'

‎sdk/keyvault/azure-keyvault-secrets/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@
7575
"tests",
7676
# Exclude packages that will be covered by PEP420 or nspkg
7777
"azure",
78+
"azure.keyvault",
7879
]
7980
),
8081
install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "msrest>=0.5.0"],
81-
extras_require={":python_version<'3.0'": ["azure-nspkg"], ":python_version<'3.5'": ["typing"]},
82+
extras_require={":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.5'": ["typing"]},
8283
)

‎shared_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ azure-mgmt-subscription~=0.2.0
7777
azure-mgmt-trafficmanager~=0.50.0
7878
azure-mgmt-web~=0.35.0
7979
azure-nspkg
80+
azure-keyvault-nspkg
8081
azure-security-nspkg
8182
azure-servicebus~=0.21.1
8283
azure-servicefabric~=6.3.0.0

0 commit comments

Comments
 (0)