Skip to content

Commit

Permalink
azure-keyvault-nspkg (#7125)
Browse files Browse the repository at this point in the history
  • Loading branch information
chlowell authored Sep 10, 2019
1 parent fe4c62a commit 90fe8d9
Show file tree
Hide file tree
Showing 19 changed files with 93 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,12 @@ known_content_issues:
- ['sdk/core/azure-mgmt-nspkg/README.rst', 'nspkg and common']
- ['sdk/core/azure-core/README.md', 'nspkg and common']
- ['sdk/appconfiguration/azure-appconfiguration/README.md', 'nspkg and common']
- ['sdk/keyvault/azure-keyvault-nspkg/README.md', 'nspkg and common']

# root readme
- ['README.md', 'root readme']

# dev tools
# dev tools
- ['doc/dev/mgmt/swagger/single_api/readme.md', 'dev readme']
- ['doc/dev/mgmt/swagger/multi_api/readme.md', 'dev readme']
- ['doc/dev/mgmt/README.md', 'dev readme']
Expand Down
2 changes: 1 addition & 1 deletion scripts/devops_tasks/common_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"mgmt",
"azure-cognitiveservices",
"azure-servicefabric",
"azure-nspkg",
"nspkg"
]


Expand Down
3 changes: 0 additions & 3 deletions sdk/keyvault/azure-keyvault-certificates/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
include *.md
include azure/__init__.py
include azure/keyvault/__init__.py
include azure/keyvault/certificates/__init__.py
include azure/keyvault/certificates/_generated/__init__.py
include azure/keyvault/certificates/aio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
-e ../../../tools/azure-sdk-tools
-e ../../identity/azure-identity
-e ../azure-mgmt-keyvault
../azure-keyvault-nspkg
aiohttp>=3.0; python_version >= '3.5'
pytest-asyncio>=0.8.0; python_version > '3.4'
3 changes: 2 additions & 1 deletion sdk/keyvault/azure-keyvault-certificates/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,9 @@
"tests",
# Exclude packages that will be covered by PEP420 or nspkg
"azure",
"azure.keyvault"
]
),
install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "msrest>=0.5.0"],
extras_require={":python_version<'3.0'": ["azure-nspkg"], ":python_version<'3.5'": ["typing"]},
extras_require={":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.5'": ["typing"]},
)
3 changes: 0 additions & 3 deletions sdk/keyvault/azure-keyvault-keys/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
include *.md
include azure/__init__.py
include azure/keyvault/__init__.py
include azure/keyvault/keys/__init__.py
include azure/keyvault/keys/_generated/__init__.py
include azure/keyvault/keys/aio/__init__.py
1 change: 1 addition & 0 deletions sdk/keyvault/azure-keyvault-keys/dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
-e ../../identity/azure-identity
-e ../azure-mgmt-keyvault
-e ../../../tools/azure-sdk-tools
../azure-keyvault-nspkg
aiohttp>=3.0; python_version >= '3.5'
pytest-asyncio>=0.8.0; python_version > '3.4'
3 changes: 2 additions & 1 deletion sdk/keyvault/azure-keyvault-keys/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,9 @@
"tests",
# Exclude packages that will be covered by PEP420 or nspkg
"azure",
"azure.keyvault",
]
),
install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "msrest>=0.5.0"],
extras_require={":python_version<'3.0'": ["azure-nspkg"], ":python_version<'3.5'": ["typing"]},
extras_require={":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.5'": ["typing"]},
)
2 changes: 2 additions & 0 deletions sdk/keyvault/azure-keyvault-nspkg/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include *.md
include azure/__init__.py
13 changes: 13 additions & 0 deletions sdk/keyvault/azure-keyvault-nspkg/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Microsoft Azure SDK for Python

This is the Microsoft Azure Key Vault namespace package. It isn't intended to
be installed directly. Key Vault client libraries are located elsewhere:
- [`azure-keyvault-certificates`](https://pypi.org/project/azure-keyvault-certificates)
- [`azure-keyvault-keys`](https://pypi.org/project/azure-keyvault-keys/)
- [`azure-keyvault-secrets`](https://pypi.org/project/azure-keyvault-secrets)

This package is for Python 2 only. It provides the necessary files for other
packages to extend the `azure` namespace. Python 3.x libraries use
[`PEP420`](https://www.python.org/dev/peps/pep-0420/) instead.

![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fsdk%2Fkeyvault%2Fazure-keyvault-nspkg%2FFREADME.png)
6 changes: 6 additions & 0 deletions sdk/keyvault/azure-keyvault-nspkg/azure/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# ------------------------------------
# pylint:disable=missing-docstring
__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore
6 changes: 6 additions & 0 deletions sdk/keyvault/azure-keyvault-nspkg/azure/keyvault/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# ------------------------------------
# pylint:disable=missing-docstring
__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore
2 changes: 2 additions & 0 deletions sdk/keyvault/azure-keyvault-nspkg/sdk_packaging.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[packaging]
auto_update = false
2 changes: 2 additions & 0 deletions sdk/keyvault/azure-keyvault-nspkg/setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[bdist_wheel]
universal=1
49 changes: 49 additions & 0 deletions sdk/keyvault/azure-keyvault-nspkg/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/usr/bin/env python

# ------------------------------------
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# ------------------------------------
import sys
from setuptools import setup

# azure v0.x is not compatible with this package
# azure v0.x used to have a __version__ attribute (newer versions don't)
try:
import azure

try:
ver = azure.__version__
raise Exception(
"This package is incompatible with azure=={}. ".format(ver) + 'Uninstall it with "pip uninstall azure".'
)
except AttributeError:
pass
except ImportError:
pass

setup(
name="azure-keyvault-nspkg",
version="1.0.0",
description="Microsoft Azure Key Vault Namespace Package [Internal]",
long_description=open("README.md", "r").read(),
long_description_content_type="text/markdown",
license="MIT License",
author="Microsoft Corporation",
author_email="azpysdkhelp@microsoft.com",
url="https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"License :: OSI Approved :: MIT License",
],
zip_safe=False,
packages=["azure.keyvault"],
install_requires=["azure-nspkg>=3.0.0"],
)
3 changes: 0 additions & 3 deletions sdk/keyvault/azure-keyvault-secrets/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
include *.md
include azure/__init__.py
include azure/keyvault/__init__.py
include azure/keyvault/secrets/__init__.py
include azure/keyvault/secrets/_generated/__init__.py
include azure/keyvault/secrets/aio/__init__.py
1 change: 1 addition & 0 deletions sdk/keyvault/azure-keyvault-secrets/dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
-e ../../identity/azure-identity
-e ../azure-mgmt-keyvault
-e ../../../tools/azure-sdk-tools
../azure-keyvault-nspkg
aiohttp>=3.0; python_version >= '3.5'
pytest-asyncio>=0.8.0; python_version > '3.4'
3 changes: 2 additions & 1 deletion sdk/keyvault/azure-keyvault-secrets/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,9 @@
"tests",
# Exclude packages that will be covered by PEP420 or nspkg
"azure",
"azure.keyvault",
]
),
install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "msrest>=0.5.0"],
extras_require={":python_version<'3.0'": ["azure-nspkg"], ":python_version<'3.5'": ["typing"]},
extras_require={":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.5'": ["typing"]},
)
1 change: 1 addition & 0 deletions shared_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ azure-mgmt-subscription~=0.2.0
azure-mgmt-trafficmanager~=0.50.0
azure-mgmt-web~=0.35.0
azure-nspkg
azure-keyvault-nspkg
azure-security-nspkg
azure-servicebus~=0.21.1
azure-servicefabric~=6.3.0.0
Expand Down

0 comments on commit 90fe8d9

Please sign in to comment.