From 7c99131eccecf80c8b8e75793ca3b791915b1177 Mon Sep 17 00:00:00 2001 From: Anthony Shaw Date: Fri, 6 Oct 2023 13:24:12 +1100 Subject: [PATCH 1/3] flag and test 3.12 support --- .github/workflows/pythonpackage.yml | 2 +- azure-devops/setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 1a8023cc..279ae64e 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -9,7 +9,7 @@ jobs: strategy: max-parallel: 5 matrix: - python-version: [3.7, 3.8, 3.9, "3.10", "3.11"] + python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v1 diff --git a/azure-devops/setup.py b/azure-devops/setup.py index 1c91180f..baf51941 100644 --- a/azure-devops/setup.py +++ b/azure-devops/setup.py @@ -30,6 +30,7 @@ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'License :: OSI Approved :: MIT License', ] From f6a4a50c2c6ff5ef30f7952406b01b936aa7fe4f Mon Sep 17 00:00:00 2001 From: Anthony Shaw Date: Sat, 7 Oct 2023 10:49:05 +1100 Subject: [PATCH 2/3] remove pkg_resources --- azure-devops/azure/__init__.py | 2 -- azure-devops/azure/devops/__init__.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/azure-devops/azure/__init__.py b/azure-devops/azure/__init__.py index 73baee1e..34913fb3 100644 --- a/azure-devops/azure/__init__.py +++ b/azure-devops/azure/__init__.py @@ -2,5 +2,3 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -import pkg_resources -pkg_resources.declare_namespace(__name__) diff --git a/azure-devops/azure/devops/__init__.py b/azure-devops/azure/devops/__init__.py index 73baee1e..34913fb3 100644 --- a/azure-devops/azure/devops/__init__.py +++ b/azure-devops/azure/devops/__init__.py @@ -2,5 +2,3 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -import pkg_resources -pkg_resources.declare_namespace(__name__) From 4ff8a5f0a1381d2e18bf7280754bad3c853576d0 Mon Sep 17 00:00:00 2001 From: Anthony Shaw Date: Mon, 9 Oct 2023 17:32:58 +1100 Subject: [PATCH 3/3] Remove the __init__ and use namespace packages to fix the issue with the clash of azure.core namespace from the msrest package --- azure-devops/azure/__init__.py | 4 ---- azure-devops/setup.py | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 azure-devops/azure/__init__.py diff --git a/azure-devops/azure/__init__.py b/azure-devops/azure/__init__.py deleted file mode 100644 index 34913fb3..00000000 --- a/azure-devops/azure/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# -------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------------------------- diff --git a/azure-devops/setup.py b/azure-devops/setup.py index baf51941..4db64280 100644 --- a/azure-devops/setup.py +++ b/azure-devops/setup.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from setuptools import setup, find_packages +from setuptools import setup, find_namespace_packages NAME = "azure-devops" VERSION = "7.1.0b3" @@ -44,7 +44,7 @@ keywords=["Microsoft", "VSTS", "Team Services", "SDK", "AzureTfs", "AzureDevOps", "DevOps"], install_requires=REQUIRES, classifiers=CLASSIFIERS, - packages=find_packages(), + packages=find_namespace_packages(), include_package_data=True, python_requires=">=3.7", long_description="Azure DevOps Python clients"