From 35b85fea404a5b218bd139e4ee567ce1da10a9a5 Mon Sep 17 00:00:00 2001 From: Yunhao Ling Date: Tue, 6 Oct 2020 13:40:57 -0700 Subject: [PATCH 1/6] add python3.9 support --- sdk/eventhub/azure-eventhub/CHANGELOG.md | 3 +++ sdk/eventhub/azure-eventhub/setup.py | 3 ++- sdk/eventhub/tests.yml | 1 + sdk/servicebus/azure-servicebus/CHANGELOG.md | 4 ++++ sdk/servicebus/azure-servicebus/setup.py | 3 ++- sdk/servicebus/tests.yml | 5 +++-- shared_requirements.txt | 4 ++-- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/sdk/eventhub/azure-eventhub/CHANGELOG.md b/sdk/eventhub/azure-eventhub/CHANGELOG.md index 9c5cdf7bdb80..4ec135a02432 100644 --- a/sdk/eventhub/azure-eventhub/CHANGELOG.md +++ b/sdk/eventhub/azure-eventhub/CHANGELOG.md @@ -2,6 +2,9 @@ ## 5.2.1 (Unreleased) +**Note** + +* Added support for Python 3.9. ## 5.2.0 (2020-09-08) diff --git a/sdk/eventhub/azure-eventhub/setup.py b/sdk/eventhub/azure-eventhub/setup.py index 0db0549b9ee1..0027646a1531 100644 --- a/sdk/eventhub/azure-eventhub/setup.py +++ b/sdk/eventhub/azure-eventhub/setup.py @@ -63,13 +63,14 @@ 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', 'License :: OSI Approved :: MIT License', ], zip_safe=False, packages=find_packages(exclude=exclude_packages), install_requires=[ "azure-core<2.0.0,>=1.5.0", - "uamqp<2.0,>=1.2.7", + "uamqp>=1.2.12,<2.0.0", ], extras_require={ ":python_version<'3.0'": ['azure-nspkg'], diff --git a/sdk/eventhub/tests.yml b/sdk/eventhub/tests.yml index d4f7da2e5f17..5bc224666f99 100644 --- a/sdk/eventhub/tests.yml +++ b/sdk/eventhub/tests.yml @@ -5,6 +5,7 @@ jobs: parameters: AllocateResourceGroup: 'false' ServiceDirectory: eventhub + InjectedPackages: $(WheelLocationsList) Matrix: Linux_Python35: OSVmImage: 'ubuntu-18.04' diff --git a/sdk/servicebus/azure-servicebus/CHANGELOG.md b/sdk/servicebus/azure-servicebus/CHANGELOG.md index 604fab5e43df..a5ba0a7a9afa 100644 --- a/sdk/servicebus/azure-servicebus/CHANGELOG.md +++ b/sdk/servicebus/azure-servicebus/CHANGELOG.md @@ -2,6 +2,10 @@ ## 7.0.0b8 (Unreleased) +**Note** + +* Added support for Python 3.9. + ## 7.0.0b7 (2020-10-05) diff --git a/sdk/servicebus/azure-servicebus/setup.py b/sdk/servicebus/azure-servicebus/setup.py index a66b6aec3de1..8481c59ad8ba 100644 --- a/sdk/servicebus/azure-servicebus/setup.py +++ b/sdk/servicebus/azure-servicebus/setup.py @@ -68,6 +68,7 @@ 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', 'License :: OSI Approved :: MIT License', ], zip_safe=False, @@ -78,7 +79,7 @@ 'azure', ]), install_requires=[ - 'uamqp>=1.2.10,<2.0.0', + "uamqp>=1.2.12,<2.0.0", 'azure-common~=1.1', 'msrest>=0.6.17,<2.0.0', 'azure-core<2.0.0,>=1.6.0', diff --git a/sdk/servicebus/tests.yml b/sdk/servicebus/tests.yml index deda3e0586d1..4ee6e6c10cc2 100644 --- a/sdk/servicebus/tests.yml +++ b/sdk/servicebus/tests.yml @@ -4,6 +4,7 @@ jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml parameters: ServiceDirectory: servicebus + InjectedPackages: $(WheelLocationsList) TestTimeoutInMinutes: 300 BuildTargetingString: azure-servicebus* EnvVars: @@ -22,6 +23,6 @@ jobs: Windows_Python27: OSVmImage: 'windows-2019' PythonVersion: '2.7' - Linux_Python38: + Linux_Python39: OSVmImage: 'ubuntu-18.04' - PythonVersion: '3.8' \ No newline at end of file + PythonVersion: '3.9' \ No newline at end of file diff --git a/shared_requirements.txt b/shared_requirements.txt index 905c8c797832..79ecc1716d96 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -152,9 +152,9 @@ opentelemetry-api==0.13b0 #override azure-eventhub-checkpointstoreblob msrest>=0.6.10 #override azure-eventhub-checkpointstoreblob-aio msrest>=0.6.10 #override azure-eventhub-checkpointstoreblob-aio aiohttp<4.0,>=3.0 -#override azure-eventhub uamqp<2.0,>=1.2.7 +#override azure-eventhub uamqp>=1.2.12,<2.0.0 #override azure-appconfiguration msrest>=0.6.10 -#override azure-servicebus uamqp>=1.2.10,<2.0.0 +#override azure-servicebus uamqp>=1.2.12,<2.0.0 #override azure-servicebus msrest>=0.6.17,<2.0.0 #override azure-servicebus azure-core<2.0.0,>=1.6.0 #override azure-search-documents msrest>=0.6.10 From 09f895b2c87f1e79ab7d6a77df281ddec854a3b4 Mon Sep 17 00:00:00 2001 From: Yunhao Ling Date: Tue, 6 Oct 2020 13:43:32 -0700 Subject: [PATCH 2/6] update eh test yml --- sdk/eventhub/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/eventhub/tests.yml b/sdk/eventhub/tests.yml index 5bc224666f99..7b0f8bbafef1 100644 --- a/sdk/eventhub/tests.yml +++ b/sdk/eventhub/tests.yml @@ -10,9 +10,9 @@ jobs: Linux_Python35: OSVmImage: 'ubuntu-18.04' PythonVersion: '3.5' - Linux_Python38: + Linux_Python39: OSVmImage: 'ubuntu-18.04' - PythonVersion: '3.8' + PythonVersion: '3.9' Windows_Python27: OSVmImage: 'windows-2019' PythonVersion: '2.7' From e0e6decf2cfd55de8b9f6449f5c95bf29fca3e07 Mon Sep 17 00:00:00 2001 From: Yunhao Ling Date: Wed, 7 Oct 2020 17:06:00 -0700 Subject: [PATCH 3/6] use specific python39 version --- sdk/eventhub/tests.yml | 2 +- sdk/servicebus/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/eventhub/tests.yml b/sdk/eventhub/tests.yml index 7b0f8bbafef1..d42ef412f40f 100644 --- a/sdk/eventhub/tests.yml +++ b/sdk/eventhub/tests.yml @@ -12,7 +12,7 @@ jobs: PythonVersion: '3.5' Linux_Python39: OSVmImage: 'ubuntu-18.04' - PythonVersion: '3.9' + PythonVersion: '3.9.0' Windows_Python27: OSVmImage: 'windows-2019' PythonVersion: '2.7' diff --git a/sdk/servicebus/tests.yml b/sdk/servicebus/tests.yml index 4ee6e6c10cc2..68d0a36ed9d6 100644 --- a/sdk/servicebus/tests.yml +++ b/sdk/servicebus/tests.yml @@ -25,4 +25,4 @@ jobs: PythonVersion: '2.7' Linux_Python39: OSVmImage: 'ubuntu-18.04' - PythonVersion: '3.9' \ No newline at end of file + PythonVersion: '3.9.0' \ No newline at end of file From 103593d072441976c7aa759bb515d9f3a0a21de7 Mon Sep 17 00:00:00 2001 From: Yunhao Ling Date: Mon, 12 Oct 2020 17:41:47 -0700 Subject: [PATCH 4/6] tweak changelog --- sdk/eventhub/azure-eventhub/CHANGELOG.md | 2 +- sdk/servicebus/azure-servicebus/CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/eventhub/azure-eventhub/CHANGELOG.md b/sdk/eventhub/azure-eventhub/CHANGELOG.md index 4ec135a02432..1149acfc7e06 100644 --- a/sdk/eventhub/azure-eventhub/CHANGELOG.md +++ b/sdk/eventhub/azure-eventhub/CHANGELOG.md @@ -4,7 +4,7 @@ **Note** -* Added support for Python 3.9. +* Updated uAMQP dependency to 1.2.12 adding support for Python 3.9. ## 5.2.0 (2020-09-08) diff --git a/sdk/servicebus/azure-servicebus/CHANGELOG.md b/sdk/servicebus/azure-servicebus/CHANGELOG.md index a5ba0a7a9afa..ac52a11fb5f6 100644 --- a/sdk/servicebus/azure-servicebus/CHANGELOG.md +++ b/sdk/servicebus/azure-servicebus/CHANGELOG.md @@ -4,7 +4,7 @@ **Note** -* Added support for Python 3.9. +* Updated uAMQP dependency to 1.2.12 adding support for Python 3.9. ## 7.0.0b7 (2020-10-05) From 5eac8cee168e5b16279d5525fd85152280bbb84f Mon Sep 17 00:00:00 2001 From: Yunhao Ling Date: Mon, 12 Oct 2020 17:43:11 -0700 Subject: [PATCH 5/6] tweak changelog --- sdk/servicebus/azure-servicebus/CHANGELOG.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sdk/servicebus/azure-servicebus/CHANGELOG.md b/sdk/servicebus/azure-servicebus/CHANGELOG.md index 5c9300257ae9..2693898d8018 100644 --- a/sdk/servicebus/azure-servicebus/CHANGELOG.md +++ b/sdk/servicebus/azure-servicebus/CHANGELOG.md @@ -2,10 +2,6 @@ ## 7.0.0b8 (Unreleased) -**Note** - -* Updated uAMQP dependency to 1.2.12 adding support for Python 3.9. - **New Features** * Added support for `timeout` parameter on the following operations: @@ -16,7 +12,8 @@ **BugFixes** -* Updated uAMQP dependency to 1.2.11. +* Updated uAMQP dependency to 1.2.12. + - Added support for Python 3.9. - Fixed bug where amqp message `footer` and `delivery_annotation` were not encoded into the outgoing payload. ## 7.0.0b7 (2020-10-05) From 35f0640f2a2da9b8f2c48bbb35861288f0551d75 Mon Sep 17 00:00:00 2001 From: Yunhao Ling Date: Tue, 13 Oct 2020 10:30:57 -0700 Subject: [PATCH 6/6] remove useless argument --- sdk/eventhub/tests.yml | 1 - sdk/servicebus/tests.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/sdk/eventhub/tests.yml b/sdk/eventhub/tests.yml index d42ef412f40f..6741921a7ce9 100644 --- a/sdk/eventhub/tests.yml +++ b/sdk/eventhub/tests.yml @@ -5,7 +5,6 @@ jobs: parameters: AllocateResourceGroup: 'false' ServiceDirectory: eventhub - InjectedPackages: $(WheelLocationsList) Matrix: Linux_Python35: OSVmImage: 'ubuntu-18.04' diff --git a/sdk/servicebus/tests.yml b/sdk/servicebus/tests.yml index 68d0a36ed9d6..9fa220ac1bb0 100644 --- a/sdk/servicebus/tests.yml +++ b/sdk/servicebus/tests.yml @@ -4,7 +4,6 @@ jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml parameters: ServiceDirectory: servicebus - InjectedPackages: $(WheelLocationsList) TestTimeoutInMinutes: 300 BuildTargetingString: azure-servicebus* EnvVars: