From d2ac6c42371e9ec38ea476729b853b0c9b6bc9b6 Mon Sep 17 00:00:00 2001
From: "Adam Ling (MSFT)" <adam_ling@outlook.com>
Date: Fri, 16 Oct 2020 16:51:39 -0700
Subject: [PATCH] [EventHubs & ServiceBus] add python3.9 support (#14301)

* add python3.9 support

* update eh test yml

* use specific python39 version

* tweak changelog

* tweak changelog

* remove useless argument
---
 sdk/eventhub/azure-eventhub/CHANGELOG.md     | 3 +++
 sdk/eventhub/azure-eventhub/setup.py         | 3 ++-
 sdk/eventhub/tests.yml                       | 4 ++--
 sdk/servicebus/azure-servicebus/CHANGELOG.md | 3 ++-
 sdk/servicebus/azure-servicebus/setup.py     | 3 ++-
 sdk/servicebus/tests.yml                     | 4 ++--
 shared_requirements.txt                      | 4 ++--
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/sdk/eventhub/azure-eventhub/CHANGELOG.md b/sdk/eventhub/azure-eventhub/CHANGELOG.md
index 9c5cdf7bdb80..1149acfc7e06 100644
--- a/sdk/eventhub/azure-eventhub/CHANGELOG.md
+++ b/sdk/eventhub/azure-eventhub/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## 5.2.1 (Unreleased)
 
+**Note**
+
+* Updated uAMQP dependency to 1.2.12 adding 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..6741921a7ce9 100644
--- a/sdk/eventhub/tests.yml
+++ b/sdk/eventhub/tests.yml
@@ -9,9 +9,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.0'
         Windows_Python27:
           OSVmImage: 'windows-2019'
           PythonVersion: '2.7'
diff --git a/sdk/servicebus/azure-servicebus/CHANGELOG.md b/sdk/servicebus/azure-servicebus/CHANGELOG.md
index 0b908ed0a305..2693898d8018 100644
--- a/sdk/servicebus/azure-servicebus/CHANGELOG.md
+++ b/sdk/servicebus/azure-servicebus/CHANGELOG.md
@@ -12,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)
diff --git a/sdk/servicebus/azure-servicebus/setup.py b/sdk/servicebus/azure-servicebus/setup.py
index 84802e7402b5..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.11,<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..9fa220ac1bb0 100644
--- a/sdk/servicebus/tests.yml
+++ b/sdk/servicebus/tests.yml
@@ -22,6 +22,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.0'
\ No newline at end of file
diff --git a/shared_requirements.txt b/shared_requirements.txt
index f64d4834757e..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.11,<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