Skip to content

Commit 813f038

Browse files
author
Nicola Camillucci
committed
Added back manifest and pyproject changes
1 parent 24d2dd1 commit 813f038

4 files changed

Lines changed: 43 additions & 36 deletions

File tree

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
include *.md
22
include LICENSE
3-
include azure/keyvault/administration/py.typed
3+
include azure/keyvault/administration/_generated/py.typed
44
recursive-include tests *.py
55
recursive-include samples *.py *.md
66
include azure/__init__.py
77
include azure/keyvault/__init__.py
8+
include azure/keyvault/administration/__init__.py

sdk/keyvault/azure-keyvault-administration/setup.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414

1515
PACKAGE_NAME = "azure-keyvault-administration"
1616
PACKAGE_PPRINT_NAME = "Key Vault Administration"
17+
PACKAGE_NAMESPACE = "azure.keyvault.administration._generated"
1718

18-
# a-b-c => a/b/c
19-
package_folder_path = PACKAGE_NAME.replace("-", "/")
19+
# a.b.c => a/b/c
20+
package_folder_path = PACKAGE_NAMESPACE.replace(".", "/")
2021

2122
# Version extraction inspired from 'requests'
2223
with open(os.path.join(package_folder_path, "_version.py"), "r") as fd:
@@ -29,7 +30,6 @@
2930
setup(
3031
name=PACKAGE_NAME,
3132
version=version,
32-
include_package_data=True,
3333
description="Microsoft Corporation {} Client Library for Python".format(PACKAGE_PPRINT_NAME),
3434
long_description=open("README.md", "r").read(),
3535
long_description_content_type="text/markdown",
@@ -53,16 +53,20 @@
5353
zip_safe=False,
5454
packages=find_packages(
5555
exclude=[
56-
"samples",
5756
"tests",
5857
# Exclude packages that will be covered by PEP420 or nspkg
5958
"azure",
6059
"azure.keyvault",
60+
"azure.keyvault.administration",
6161
]
6262
),
63+
include_package_data=True,
64+
package_data={
65+
"azure.keyvault.administration._generated": ["py.typed"],
66+
},
6367
install_requires=[
6468
"isodate>=0.6.1",
65-
"azure-core>=1.38.0",
69+
"azure-core>=1.37.0",
6670
"typing-extensions>=4.6.0",
6771
],
6872
python_requires=">=3.9",
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
include *.md
22
include LICENSE
3-
include azure/keyvault/keys/py.typed
3+
include azure/keyvault/keys/_generated/py.typed
44
recursive-include tests *.py
55
recursive-include samples *.py *.md
66
include azure/__init__.py
77
include azure/keyvault/__init__.py
8+
include azure/keyvault/keys/__init__.py
Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1+
# --------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# Code generated by Microsoft (R) Python Code Generator.
5+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
6+
# --------------------------------------------------------------------------
7+
18
[build-system]
2-
requires = ["setuptools>=61.0.0", "wheel"] # Requires 61.0.0 for dynamic version
9+
requires = ["setuptools>=77.0.3", "wheel"]
310
build-backend = "setuptools.build_meta"
411

512
[project]
613
name = "azure-keyvault-keys"
714
authors = [
8-
{name = "Microsoft Corporation", email = "azpysdkhelp@microsoft.com"},
15+
{ name = "Microsoft Corporation", email = "azpysdkhelp@microsoft.com" },
916
]
1017
description = "Microsoft Corporation Azure Key Vault Keys Client Library for Python"
11-
keywords = ["azure", "azure sdk"]
12-
requires-python = ">=3.9"
13-
license = {text = "MIT License"}
18+
license = "MIT"
1419
classifiers = [
1520
"Development Status :: 5 - Production/Stable",
1621
"Programming Language :: Python",
@@ -21,49 +26,45 @@ classifiers = [
2126
"Programming Language :: Python :: 3.11",
2227
"Programming Language :: Python :: 3.12",
2328
"Programming Language :: Python :: 3.13",
24-
"License :: OSI Approved :: MIT License",
2529
]
30+
requires-python = ">=3.9"
31+
keywords = ["azure", "azure sdk"]
32+
2633
dependencies = [
27-
"azure-core>=1.31.0",
28-
"cryptography>=2.1.4",
2934
"isodate>=0.6.1",
35+
"azure-core>=1.37.0",
3036
"typing-extensions>=4.6.0",
37+
"cryptography>=2.1.4",
38+
]
39+
dynamic = [
40+
"version", "readme"
3141
]
32-
dynamic = ["version", "readme"]
3342

3443
[project.urls]
35-
repository = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk"
44+
repository = "https://github.com/Azure/azure-sdk-for-python"
3645

3746
[tool.setuptools.dynamic]
38-
version = {attr = "azure.keyvault.keys._version.VERSION"}
47+
version = {attr = "azure.keyvault.keys._generated._version.VERSION"}
3948
readme = {file = ["README.md", "CHANGELOG.md"], content-type = "text/markdown"}
4049

4150
[tool.setuptools.packages.find]
42-
exclude = ["samples*", "tests*", "azure", "azure.keyvault"]
51+
exclude = [
52+
"tests*",
53+
"generated_tests*",
54+
"samples*",
55+
"generated_samples*",
56+
"doc*",
57+
"azure",
58+
"azure.keyvault",
59+
"azure.keyvault.keys",
60+
]
4361

4462
[tool.setuptools.package-data]
4563
pytyped = ["py.typed"]
4664

4765
[tool.azure-sdk-build]
4866
pyright = false
4967

50-
[tool.uv.sources]
51-
azure-core = { path = "../../core/azure-core" }
52-
azure-keyvault-nspkg = { path = "../../nspkg/azure-keyvault-nspkg" }
53-
azure-sdk-tools = { path = "../../../eng/tools/azure-sdk-tools" }
54-
55-
[dependency-groups]
56-
dev = [
57-
"aiohttp>=3.0",
58-
"azure-core",
59-
"azure-identity>=1.24.0",
60-
"azure-keyvault-nspkg",
61-
"azure-mgmt-keyvault==10.1.0",
62-
"azure-sdk-tools",
63-
"parameterized>=0.7.3",
64-
"python-dateutil>=2.8.0",
65-
]
66-
6768
[tool.azure-sdk-conda]
6869
in_bundle = true
6970
bundle_name = "azure-keyvault"

0 commit comments

Comments
 (0)