From 6e5cda7564146014e7a97ed41accb9ddeeb734bd Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Fri, 25 Sep 2020 11:41:03 -0700
Subject: [PATCH 01/14] add py39 into matrix

---
 .azure-pipelines/client.test.live.yml | 13 +++++++++++++
 .azure-pipelines/client.yml           | 21 +++++++++++++++++++++
 setup.py                              |  1 +
 3 files changed, 35 insertions(+)

diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml
index 6c5ad2f43..040d1aeb5 100644
--- a/.azure-pipelines/client.test.live.yml
+++ b/.azure-pipelines/client.test.live.yml
@@ -7,6 +7,7 @@ variables:
   PythonVersion36: '3.6'
   PythonVersion37: '3.7'
   PythonVersion38: '3.8'
+  PythonVersion39: '3.9'
 
 jobs:
   - job: 'Windows'
@@ -34,6 +35,9 @@ jobs:
         x64 Python 3.8:
           PythonArchitecture: 'x64'
           PythonVersion: '$(PythonVersion38)'
+        x64 Python 3.9:
+          PythonArchitecture: 'x64'
+          PythonVersion: '$(PythonVersion39)'
         x86 Python 2.7:
           PythonArchitecture: 'x86'
           PythonVersion: '$(PythonVersion27)'
@@ -49,6 +53,9 @@ jobs:
         x86 Python 3.8:
           PythonArchitecture: 'x86'
           PythonVersion: '$(PythonVersion38)'
+        x86 Python 3.9:
+          PythonArchitecture: 'x86'
+          PythonVersion: '$(PythonVersion39)'
 
     steps:
       - task: UsePythonVersion@0
@@ -139,6 +146,9 @@ jobs:
         Python 3.8:
           PythonBin: 'python3'
           PythonVersion: '$(PythonVersion38)'
+        Python 3.9:
+          PythonBin: 'python3'
+          PythonVersion: '$(PythonVersion39)'
 
     variables:
       MacOSXDeploymentTarget: '10.9'
@@ -148,6 +158,7 @@ jobs:
       PythonVersion36: '3.6.8'
       PythonVersion37: '3.7.6'
       PythonVersion38: '3.8.2'
+      PythonVersion39: '3.9.0rc2'
 
     steps:
       - task: DownloadPipelineArtifact@1
@@ -249,6 +260,8 @@ jobs:
           PythonVersion: '$(PythonVersion37)'
         Python 3.8:
           PythonVersion: '$(PythonVersion38)'
+        Python 3.9:
+          PythonVersion: '$(PythonVersion39)'
 
     steps:
       - task: UsePythonVersion@0
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
index c7b363ee6..dad1962d2 100644
--- a/.azure-pipelines/client.yml
+++ b/.azure-pipelines/client.yml
@@ -7,6 +7,7 @@ variables:
   PythonVersion36: '3.6'
   PythonVersion37: '3.7'
   PythonVersion38: '3.8'
+  PythonVersion39: '3.9'
 
 jobs:
   - job: 'sdist'
@@ -65,6 +66,9 @@ jobs:
         Python 3.8:
           PythonBin: 'python3'
           PythonVersion: '$(PythonVersion38)'
+        Python 3.9:
+          PythonBin: 'python3'
+          PythonVersion: '$(PythonVersion39)'
 
     variables:
       MacOSXDeploymentTarget: '10.9'
@@ -74,6 +78,7 @@ jobs:
       PythonVersion36: '3.6.8'
       PythonVersion37: '3.7.6'
       PythonVersion38: '3.8.2'
+      PythonVersion39: '3.9.0rc2'
 
     steps:
       - task: DownloadPipelineArtifact@1
@@ -164,6 +169,9 @@ jobs:
         x64 Python 3.8:
           PythonArchitecture: 'x64'
           PythonVersion: '$(PythonVersion38)'
+        x64 Python 3.9:
+          PythonArchitecture: 'x64'
+          PythonVersion: '$(PythonVersion39)'
         x86 Python 2.7:
           PythonArchitecture: 'x86'
           PythonVersion: '$(PythonVersion27)'
@@ -179,6 +187,9 @@ jobs:
         x86 Python 3.8:
           PythonArchitecture: 'x86'
           PythonVersion: '$(PythonVersion38)'
+        x86 Python 3.9:
+          PythonArchitecture: 'x86'
+          PythonVersion: '$(PythonVersion39)'
 
     steps:
       - task: UsePythonVersion@0
@@ -248,6 +259,8 @@ jobs:
           PythonVersion: '$(PythonVersion37)'
         Python 3.8:
           PythonVersion: '$(PythonVersion38)'
+        Python 3.9:
+          PythonVersion: '$(PythonVersion39)'
 
     steps:
       - task: UsePythonVersion@0
@@ -327,6 +340,10 @@ jobs:
           ContainerImage: 'manylinux_crypto_x64'
           PythonVersion: 'cp38-cp38'
           Platform: 'manylinux1_x86_64'
+        Python39-manylinux1:
+          ContainerImage: 'manylinux_crypto_x64'
+          PythonVersion: 'cp39-cp39'
+          Platform: 'manylinux1_x86_64'
         Python27m-manylinux2010:
           ContainerImage: 'manylinux2010_crypto_x64'
           PythonVersion: 'cp27-cp27m'
@@ -351,6 +368,10 @@ jobs:
           ContainerImage: 'manylinux2010_crypto_x64'
           PythonVersion: 'cp38-cp38'
           Platform: 'manylinux2010_x86_64'
+        Python39-manylinux2010:
+          ContainerImage: 'manylinux2010_crypto_x64'
+          PythonVersion: 'cp39-cp39'
+          Platform: 'manylinux2010_x86_64'
 
     steps:
       - task: Docker@1
diff --git a/setup.py b/setup.py
index 24fa64bc1..0dafa31b3 100644
--- a/setup.py
+++ b/setup.py
@@ -342,6 +342,7 @@ def build_cmake(self, ext):
         '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,

From ed35fadb3ea4e1c87d0206de287d415fc3309f00 Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Mon, 28 Sep 2020 11:39:45 -0700
Subject: [PATCH 02/14] test latest stable cython

---
 dev_requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index 0673b25f3..e18dcda47 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,4 +1,4 @@
-cython==0.28.5
+cython==0.29.21
 setuptools>=27.1.2
 wheel>=0.32.0
 pytest==5.4.1; python_version >= '3.5'

From 1bf04beaba048648250d29e26290959caec826d4 Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Thu, 1 Oct 2020 15:31:44 -0700
Subject: [PATCH 03/14] test 3.9 support

---
 .azure-pipelines/client.test.live.yml         |  14 +-
 .azure-pipelines/client.yml                   |  19 +--
 .../resolve_installer_location.py             | 158 ++++++++++++++++++
 .azure-pipelines/wrapped-use-python.yml       |  25 +++
 4 files changed, 197 insertions(+), 19 deletions(-)
 create mode 100644 .azure-pipelines/resolve_installer_location.py
 create mode 100644 .azure-pipelines/wrapped-use-python.yml

diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml
index 040d1aeb5..643838512 100644
--- a/.azure-pipelines/client.test.live.yml
+++ b/.azure-pipelines/client.test.live.yml
@@ -7,7 +7,7 @@ variables:
   PythonVersion36: '3.6'
   PythonVersion37: '3.7'
   PythonVersion38: '3.8'
-  PythonVersion39: '3.9'
+  PythonVersion39: '3.9.0-rc.2'
 
 jobs:
   - job: 'Windows'
@@ -58,9 +58,8 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - task: UsePythonVersion@0
-        displayName: 'Use Python Version'
-        inputs:
+      - template: /eng/pipelines/templates/steps/wrapped-use-python.yml
+        parameters:
           architecture: '$(PythonArchitecture)'
           versionSpec: '$(PythonVersion)'
 
@@ -158,7 +157,7 @@ jobs:
       PythonVersion36: '3.6.8'
       PythonVersion37: '3.7.6'
       PythonVersion38: '3.8.2'
-      PythonVersion39: '3.9.0rc2'
+      PythonVersion39: '3.9.0-rc.2'
 
     steps:
       - task: DownloadPipelineArtifact@1
@@ -264,9 +263,8 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - task: UsePythonVersion@0
-        displayName: 'Use Python Version'
-        inputs:
+      - template: /eng/pipelines/templates/steps/wrapped-use-python.yml
+        parameters:
           versionSpec: '$(PythonVersion)'
 
       - script: |
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
index dad1962d2..c5ba15e07 100644
--- a/.azure-pipelines/client.yml
+++ b/.azure-pipelines/client.yml
@@ -7,7 +7,7 @@ variables:
   PythonVersion36: '3.6'
   PythonVersion37: '3.7'
   PythonVersion38: '3.8'
-  PythonVersion39: '3.9'
+  PythonVersion39: '3.9.0-rc.2'
 
 jobs:
   - job: 'sdist'
@@ -17,9 +17,8 @@ jobs:
       vmImage: 'ubuntu-18.04'
 
     steps:
-      - task: UsePythonVersion@0
-        displayName: 'Use Python Version'
-        inputs:
+      - template: /eng/pipelines/templates/steps/wrapped-use-python.yml
+        parameters:
           versionSpec: '$(PythonVersion37)'
 
       - script: |
@@ -78,7 +77,7 @@ jobs:
       PythonVersion36: '3.6.8'
       PythonVersion37: '3.7.6'
       PythonVersion38: '3.8.2'
-      PythonVersion39: '3.9.0rc2'
+      PythonVersion39: '3.9.0-rc.2'
 
     steps:
       - task: DownloadPipelineArtifact@1
@@ -192,9 +191,8 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - task: UsePythonVersion@0
-        displayName: 'Use Python Version'
-        inputs:
+      - template: /eng/pipelines/templates/steps/wrapped-use-python.yml
+        parameters:
           architecture: '$(PythonArchitecture)'
           versionSpec: '$(PythonVersion)'
 
@@ -263,9 +261,8 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - task: UsePythonVersion@0
-        displayName: 'Use Python Version'
-        inputs:
+      - template: /eng/pipelines/templates/steps/wrapped-use-python.yml
+        parameters:
           versionSpec: '$(PythonVersion)'
 
       - script: |
diff --git a/.azure-pipelines/resolve_installer_location.py b/.azure-pipelines/resolve_installer_location.py
new file mode 100644
index 000000000..7c1adcc86
--- /dev/null
+++ b/.azure-pipelines/resolve_installer_location.py
@@ -0,0 +1,158 @@
+import platform
+import json
+import argparse
+import urllib
+import urllib.request
+from subprocess import check_call, CalledProcessError
+import sys
+import os
+import zipfile
+import tarfile
+import time
+
+from packaging.version import Version
+from packaging.version import parse
+from packaging.version import InvalidVersion
+
+import pdb
+
+# SOURCE OF THIS FILE: https://github.com/actions/python-versions
+# this is the official mapping file for gh-actions to retrieve python installers
+MANIFEST_LOCATION = "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json"
+
+MAX_INSTALLER_RETRY = 3
+CURRENT_UBUNTU_VERSION = "18.04"  # full title is ubuntu-18.04
+
+UNIX_INSTALL_ARRAY = ["sh", "setup.sh"]
+WIN_INSTALL_ARRAY = ["pwsh", "setup.ps1"]
+
+
+def download_installer(remote_path, local_path):
+    retries = 0
+
+    while True:
+        try:
+            urllib.request.urlretrieve(remote_path, local_path)
+            break
+        except Exception as e:
+            print(e)
+            retries += 1
+
+            if retries >= MAX_INSTALLER_RETRY:
+                print(
+                    "Unable to recover after attempting to download {} {} times".format(
+                        remote_path, retries
+                    )
+                )
+                exit(1)
+            time.sleep(10)
+
+
+def install_selected_python_version(installer_url, installer_folder):
+    current_plat = platform.system().lower()
+
+    installer_folder = os.path.normpath(os.path.abspath(installer_folder))
+    if not os.path.exists(installer_folder):
+        os.mkdir(installer_folder)
+    local_installer_ref = os.path.join(
+        installer_folder,
+        "local" + (".zip" if installer_folder.endswith("zip") else ".tar.gz"),
+    )
+
+    download_installer(installer_url, local_installer_ref)
+
+    if current_plat == "windows":
+        with zipfile.ZipFile(local_installer_ref, "r") as zip_file:
+            zip_file.extractall(installer_folder)
+        try:
+            check_call(WIN_INSTALL_ARRAY, cwd=installer_folder)
+        except CalledProcessError as err:
+            print(err)
+            exit(1)
+
+    else:
+        with tarfile.open(local_installer_ref) as tar_file:
+            tar_file.extractall(installer_folder)
+        try:
+            check_call(UNIX_INSTALL_ARRAY, cwd=installer_folder)
+        except CalledProcessError as err:
+            print(err)
+            exit(1)
+
+
+def get_installer_url(requested_version, version_manifest):
+    current_plat = platform.system().lower()
+
+    print("Current Platform Is {}".format(platform.platform()))
+
+    if version_manifest[requested_version]:
+        found_installers = version_manifest[requested_version]["files"]
+
+        # filter anything that's not x64. we don't care.
+        x64_installers = [
+            file_def for file_def in found_installers if file_def["arch"] == "x64"
+        ]
+
+        if current_plat == "windows":
+            return [
+                installer
+                for installer in x64_installers
+                if installer["platform"] == "win32"
+            ][0]
+        elif current_plat == "darwin":
+            return [
+                installer
+                for installer in x64_installers
+                if installer["platform"] == current_plat
+            ][0]
+        else:
+            return [
+                installer
+                for installer in x64_installers
+                if installer["platform"] == "linux"
+                and installer["platform_version"] == CURRENT_UBUNTU_VERSION
+            ][0]
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Takes the incoming request and attempts to resolve the version spec."
+    )
+
+    parser.add_argument(
+        "version_spec",
+        nargs="?",
+        help=("The version specifier passed in to the UsePythonVersion extended task."),
+    )
+
+    parser.add_argument(
+        "--installer_folder",
+        dest="installer_folder",
+        help=(
+            "The folder where the found installer will be extracted into and run from."
+        ),
+    )
+
+    args = parser.parse_args()
+    max_precached_version = Version("3.8.6")
+    try:
+        version_from_spec = Version(args.version_spec)
+    except InvalidVersion:
+        print("Invalid Version Spec. Skipping custom install.")
+        exit(0)
+
+    with urllib.request.urlopen(MANIFEST_LOCATION) as url:
+        version_manifest = json.load(url)
+
+    version_dict = {i["version"]: i for i in version_manifest}
+
+    if version_from_spec > max_precached_version:
+        print(
+            "Requested version {} is newer than versions pre-cached on agent. Invoking.".format(
+                args.version_spec
+            )
+        )
+        install_file_details = get_installer_url(args.version_spec, version_dict)
+        install_selected_python_version(
+            install_file_details["download_url"], args.installer_folder
+        )
\ No newline at end of file
diff --git a/.azure-pipelines/wrapped-use-python.yml b/.azure-pipelines/wrapped-use-python.yml
new file mode 100644
index 000000000..b612e4486
--- /dev/null
+++ b/.azure-pipelines/wrapped-use-python.yml
@@ -0,0 +1,25 @@
+parameters:
+  versionSpec: ''
+
+steps:
+  # use python 3.8 for tooling. packaging. platform.
+  - task: UsePythonVersion@0
+    displayName: "Use Python 3.8"
+    inputs:
+      versionSpec: 3.8
+
+  - pwsh: |
+      pip install packaging
+    displayName: Prep Environment
+  # select the appropriate version from manifest if present
+  - task: PythonScript@0
+    displayName: 'Check Version Spec Against Known Versions'
+    inputs:
+     scriptPath: '.azure-pipelines/resolve_installer_location.py'
+     arguments: '${{ parameters.versionSpec }} --installer_folder="../_pyinstaller'
+
+  # use
+  - task: UsePythonVersion@0
+    displayName: "Use Python $(PythonVersion)"
+    inputs:
+      versionSpec: ${{ parameters.versionSpec }}
\ No newline at end of file

From e0470f062ba86826eeac5741076b00336eb429ca Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Thu, 1 Oct 2020 15:34:31 -0700
Subject: [PATCH 04/14] update path

---
 .azure-pipelines/client.test.live.yml | 4 ++--
 .azure-pipelines/client.yml           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml
index 643838512..e784992a2 100644
--- a/.azure-pipelines/client.test.live.yml
+++ b/.azure-pipelines/client.test.live.yml
@@ -58,7 +58,7 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - template: /eng/pipelines/templates/steps/wrapped-use-python.yml
+      - template: /.azure-pipelines/wrapped-use-python.yml
         parameters:
           architecture: '$(PythonArchitecture)'
           versionSpec: '$(PythonVersion)'
@@ -263,7 +263,7 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - template: /eng/pipelines/templates/steps/wrapped-use-python.yml
+      - template: /.azure-pipelines/wrapped-use-python.yml
         parameters:
           versionSpec: '$(PythonVersion)'
 
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
index c5ba15e07..a7d07954b 100644
--- a/.azure-pipelines/client.yml
+++ b/.azure-pipelines/client.yml
@@ -17,7 +17,7 @@ jobs:
       vmImage: 'ubuntu-18.04'
 
     steps:
-      - template: /eng/pipelines/templates/steps/wrapped-use-python.yml
+      - template: /.azure-pipelines/wrapped-use-python.yml
         parameters:
           versionSpec: '$(PythonVersion37)'
 
@@ -191,7 +191,7 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - template: /eng/pipelines/templates/steps/wrapped-use-python.yml
+      - template: /.azure-pipelines/wrapped-use-python.yml
         parameters:
           architecture: '$(PythonArchitecture)'
           versionSpec: '$(PythonVersion)'
@@ -261,7 +261,7 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - template: /eng/pipelines/templates/steps/wrapped-use-python.yml
+      - template: /.azure-pipelines/wrapped-use-python.yml
         parameters:
           versionSpec: '$(PythonVersion)'
 

From 654c094221ebdf9cf5a39e24ad222cff3a6a8769 Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Thu, 1 Oct 2020 15:57:04 -0700
Subject: [PATCH 05/14] update macos version to match

---
 .azure-pipelines/client.test.live.yml | 2 +-
 .azure-pipelines/client.yml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml
index e784992a2..6b4993efd 100644
--- a/.azure-pipelines/client.test.live.yml
+++ b/.azure-pipelines/client.test.live.yml
@@ -125,7 +125,7 @@ jobs:
     timeoutInMinutes: 120
 
     pool:
-      vmImage: 'macOS-10.15'
+      vmImage: 'macOS-10.9'
 
     strategy:
       maxParallel: 1
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
index a7d07954b..67a1c45e2 100644
--- a/.azure-pipelines/client.yml
+++ b/.azure-pipelines/client.yml
@@ -46,7 +46,7 @@ jobs:
   - job: 'MacOS'
 
     pool:
-      vmImage: 'macOS-10.15'
+      vmImage: 'macOS-10.9'
 
     strategy:
       matrix:

From a519b97e37c712781d8462f7ab1b7965491fc823 Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Thu, 1 Oct 2020 16:33:45 -0700
Subject: [PATCH 06/14] revert back macos version

---
 .azure-pipelines/client.test.live.yml | 2 +-
 .azure-pipelines/client.yml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml
index 6b4993efd..e784992a2 100644
--- a/.azure-pipelines/client.test.live.yml
+++ b/.azure-pipelines/client.test.live.yml
@@ -125,7 +125,7 @@ jobs:
     timeoutInMinutes: 120
 
     pool:
-      vmImage: 'macOS-10.9'
+      vmImage: 'macOS-10.15'
 
     strategy:
       maxParallel: 1
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
index 67a1c45e2..a7d07954b 100644
--- a/.azure-pipelines/client.yml
+++ b/.azure-pipelines/client.yml
@@ -46,7 +46,7 @@ jobs:
   - job: 'MacOS'
 
     pool:
-      vmImage: 'macOS-10.9'
+      vmImage: 'macOS-10.15'
 
     strategy:
       matrix:

From abf001360a28ba271ce93b6c9e43dc6ee5915429 Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Fri, 2 Oct 2020 11:49:50 -0700
Subject: [PATCH 07/14] test tweak macos python version

---
 .azure-pipelines/client.test.live.yml | 2 +-
 .azure-pipelines/client.yml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml
index e784992a2..dd7e6785b 100644
--- a/.azure-pipelines/client.test.live.yml
+++ b/.azure-pipelines/client.test.live.yml
@@ -157,7 +157,7 @@ jobs:
       PythonVersion36: '3.6.8'
       PythonVersion37: '3.7.6'
       PythonVersion38: '3.8.2'
-      PythonVersion39: '3.9.0-rc.2'
+      PythonVersion39: '3.9.0rc2'
 
     steps:
       - task: DownloadPipelineArtifact@1
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
index a7d07954b..238e222b2 100644
--- a/.azure-pipelines/client.yml
+++ b/.azure-pipelines/client.yml
@@ -77,7 +77,7 @@ jobs:
       PythonVersion36: '3.6.8'
       PythonVersion37: '3.7.6'
       PythonVersion38: '3.8.2'
-      PythonVersion39: '3.9.0-rc.2'
+      PythonVersion39: '3.9.0rc2'
 
     steps:
       - task: DownloadPipelineArtifact@1

From 0c5530f07bb480a7fb36f3cbd7a8c6afed322b30 Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Fri, 2 Oct 2020 16:10:19 -0700
Subject: [PATCH 08/14] update to use latest stable cython

---
 .travis.yml          | 7 +++++++
 build_linux_sdist.sh | 2 +-
 build_many_linux.sh  | 2 +-
 setup.py             | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 160910943..8e8efbcf8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,13 @@ matrix:
         - pytest
         - python ./setup.py check -r -s
         - pylint --extension-pkg-whitelist=uamqp.c_uamqp uamqp
+    - os: linux
+      python: "3.9"
+      env: UAMQP_ENV=LINUX39
+      script:
+        - pytest
+        - python ./setup.py check -r -s
+        - pylint --extension-pkg-whitelist=uamqp.c_uamqp uamqp
 sudo: required
 services:
   - docker
diff --git a/build_linux_sdist.sh b/build_linux_sdist.sh
index d9445dcb9..bd32a6f95 100644
--- a/build_linux_sdist.sh
+++ b/build_linux_sdist.sh
@@ -8,5 +8,5 @@ apt-get update
 apt-get install -y build-essential libssl-dev uuid-dev cmake libcurl4-openssl-dev pkg-config
 
 cd /data
-pip3 install cython==0.28.5 wheel
+pip3 install cython==0.29.21 wheel
 python3 setup.py sdist
\ No newline at end of file
diff --git a/build_many_linux.sh b/build_many_linux.sh
index 17a62d6a9..bbddc2307 100755
--- a/build_many_linux.sh
+++ b/build_many_linux.sh
@@ -16,7 +16,7 @@ export PYBIN="/opt/python/$PYTHON_VERSION/bin"
 
 # Build the wheel
 pushd /data;
-$PYBIN/pip install cython==0.28.5 wheel;
+$PYBIN/pip install cython==0.29.21 wheel;
 $PYBIN/python setup.py bdist_wheel -d /wheelhouse;
 rm -rf build/;
 popd;
diff --git a/setup.py b/setup.py
index 0dafa31b3..349a7810b 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@
 
 # If the C file doesn't exist and no Cython is available, die
 if not os.path.exists("uamqp/c_uamqp.c") and not USE_CYTHON:
-    raise ValueError("You need to install cython==0.27.3 in order to execute this setup.py if 'uamqp/c_uamqp.c' does not exists")
+    raise ValueError("You need to install cython==0.29.21 in order to execute this setup.py if 'uamqp/c_uamqp.c' does not exists")
 
 is_27 = sys.version_info < (3,)
 is_x64 = platform.architecture()[0] == '64bit'

From 437b6c56bb04259d9fdfdaa89a53df6d00cfc034 Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Mon, 5 Oct 2020 11:15:16 -0700
Subject: [PATCH 09/14] update python39 version as it has been officially
 release

---
 .azure-pipelines/client.test.live.yml | 4 ++--
 .azure-pipelines/client.yml           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml
index dd7e6785b..a5707bc93 100644
--- a/.azure-pipelines/client.test.live.yml
+++ b/.azure-pipelines/client.test.live.yml
@@ -7,7 +7,7 @@ variables:
   PythonVersion36: '3.6'
   PythonVersion37: '3.7'
   PythonVersion38: '3.8'
-  PythonVersion39: '3.9.0-rc.2'
+  PythonVersion39: '3.9'
 
 jobs:
   - job: 'Windows'
@@ -157,7 +157,7 @@ jobs:
       PythonVersion36: '3.6.8'
       PythonVersion37: '3.7.6'
       PythonVersion38: '3.8.2'
-      PythonVersion39: '3.9.0rc2'
+      PythonVersion39: '3.9.0'
 
     steps:
       - task: DownloadPipelineArtifact@1
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
index 238e222b2..69fafff0c 100644
--- a/.azure-pipelines/client.yml
+++ b/.azure-pipelines/client.yml
@@ -7,7 +7,7 @@ variables:
   PythonVersion36: '3.6'
   PythonVersion37: '3.7'
   PythonVersion38: '3.8'
-  PythonVersion39: '3.9.0-rc.2'
+  PythonVersion39: '3.9'
 
 jobs:
   - job: 'sdist'
@@ -77,7 +77,7 @@ jobs:
       PythonVersion36: '3.6.8'
       PythonVersion37: '3.7.6'
       PythonVersion38: '3.8.2'
-      PythonVersion39: '3.9.0rc2'
+      PythonVersion39: '3.9.0'
 
     steps:
       - task: DownloadPipelineArtifact@1

From 8c76d49510dea2cd3bb39372b31f24f181178ed6 Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Mon, 5 Oct 2020 15:04:56 -0700
Subject: [PATCH 10/14] bump version and update changelog

---
 HISTORY.rst       | 5 +++++
 uamqp/__init__.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 3b86f71a1..16a7d19dd 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,11 @@
 Release History
 ===============
 
+1.2.12 (Unreleased)
++++++++++++++++++++
+
+- Added support for Python 3.9.
+
 1.2.11 (2020-10-01)
 +++++++++++++++++++
 
diff --git a/uamqp/__init__.py b/uamqp/__init__.py
index f76d56646..78607694e 100644
--- a/uamqp/__init__.py
+++ b/uamqp/__init__.py
@@ -35,7 +35,7 @@
     pass  # Async not supported.
 
 
-__version__ = "1.2.11"
+__version__ = "1.2.12"
 
 
 _logger = logging.getLogger(__name__)

From 7aa91ebfef4b45feab46cb7b62ce45027e08f61d Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Tue, 6 Oct 2020 11:10:06 -0700
Subject: [PATCH 11/14] update python 3.9 version

---
 .azure-pipelines/client.test.live.yml | 2 +-
 .azure-pipelines/client.yml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml
index a5707bc93..271c69938 100644
--- a/.azure-pipelines/client.test.live.yml
+++ b/.azure-pipelines/client.test.live.yml
@@ -7,7 +7,7 @@ variables:
   PythonVersion36: '3.6'
   PythonVersion37: '3.7'
   PythonVersion38: '3.8'
-  PythonVersion39: '3.9'
+  PythonVersion39: '3.9.0'
 
 jobs:
   - job: 'Windows'
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
index 69fafff0c..12e9afc50 100644
--- a/.azure-pipelines/client.yml
+++ b/.azure-pipelines/client.yml
@@ -7,7 +7,7 @@ variables:
   PythonVersion36: '3.6'
   PythonVersion37: '3.7'
   PythonVersion38: '3.8'
-  PythonVersion39: '3.9'
+  PythonVersion39: '3.9.0'
 
 jobs:
   - job: 'sdist'

From 36896dfe231e435a84baedf53d1a05b33689a200 Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Wed, 7 Oct 2020 13:27:09 -0700
Subject: [PATCH 12/14] update travis to use py3.9-dev as py3.9 is not
 available on travis yet

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8e8efbcf8..0b44b0192 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ matrix:
         - python ./setup.py check -r -s
         - pylint --extension-pkg-whitelist=uamqp.c_uamqp uamqp
     - os: linux
-      python: "3.9"
+      python: "3.9-dev"
       env: UAMQP_ENV=LINUX39
       script:
         - pytest

From 45d3aa70b36bd724a96b84ceb8cb130b6f138810 Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Wed, 7 Oct 2020 14:16:06 -0700
Subject: [PATCH 13/14] update changelog

---
 HISTORY.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/HISTORY.rst b/HISTORY.rst
index 16a7d19dd..381a6f3f3 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -6,6 +6,7 @@ Release History
 1.2.12 (Unreleased)
 +++++++++++++++++++
 
+- Updated cython dependency to 0.29.21.
 - Added support for Python 3.9.
 
 1.2.11 (2020-10-01)

From 66e0d3ac47a6e9ed95a0fe25700c189b47dc46f1 Mon Sep 17 00:00:00 2001
From: Yunhao Ling <adam_ling@outlook.com>
Date: Wed, 7 Oct 2020 15:54:25 -0700
Subject: [PATCH 14/14] rename files to match the ones in the mono repo

---
 .azure-pipelines/client.test.live.yml                       | 4 ++--
 .azure-pipelines/client.yml                                 | 6 +++---
 ...olve_installer_location.py => install_python_version.py} | 0
 .../{wrapped-use-python.yml => use-python-version.yml}      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename .azure-pipelines/{resolve_installer_location.py => install_python_version.py} (100%)
 rename .azure-pipelines/{wrapped-use-python.yml => use-python-version.yml} (90%)

diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml
index 271c69938..050829535 100644
--- a/.azure-pipelines/client.test.live.yml
+++ b/.azure-pipelines/client.test.live.yml
@@ -58,7 +58,7 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - template: /.azure-pipelines/wrapped-use-python.yml
+      - template: /.azure-pipelines/use-python-version.yml
         parameters:
           architecture: '$(PythonArchitecture)'
           versionSpec: '$(PythonVersion)'
@@ -263,7 +263,7 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - template: /.azure-pipelines/wrapped-use-python.yml
+      - template: /.azure-pipelines/use-python-version.yml
         parameters:
           versionSpec: '$(PythonVersion)'
 
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
index 12e9afc50..470d038a1 100644
--- a/.azure-pipelines/client.yml
+++ b/.azure-pipelines/client.yml
@@ -17,7 +17,7 @@ jobs:
       vmImage: 'ubuntu-18.04'
 
     steps:
-      - template: /.azure-pipelines/wrapped-use-python.yml
+      - template: /.azure-pipelines/use-python-version.yml
         parameters:
           versionSpec: '$(PythonVersion37)'
 
@@ -191,7 +191,7 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - template: /.azure-pipelines/wrapped-use-python.yml
+      - template: /.azure-pipelines/use-python-version.yml
         parameters:
           architecture: '$(PythonArchitecture)'
           versionSpec: '$(PythonVersion)'
@@ -261,7 +261,7 @@ jobs:
           PythonVersion: '$(PythonVersion39)'
 
     steps:
-      - template: /.azure-pipelines/wrapped-use-python.yml
+      - template: /.azure-pipelines/use-python-version.yml
         parameters:
           versionSpec: '$(PythonVersion)'
 
diff --git a/.azure-pipelines/resolve_installer_location.py b/.azure-pipelines/install_python_version.py
similarity index 100%
rename from .azure-pipelines/resolve_installer_location.py
rename to .azure-pipelines/install_python_version.py
diff --git a/.azure-pipelines/wrapped-use-python.yml b/.azure-pipelines/use-python-version.yml
similarity index 90%
rename from .azure-pipelines/wrapped-use-python.yml
rename to .azure-pipelines/use-python-version.yml
index b612e4486..84e2bea83 100644
--- a/.azure-pipelines/wrapped-use-python.yml
+++ b/.azure-pipelines/use-python-version.yml
@@ -15,7 +15,7 @@ steps:
   - task: PythonScript@0
     displayName: 'Check Version Spec Against Known Versions'
     inputs:
-     scriptPath: '.azure-pipelines/resolve_installer_location.py'
+     scriptPath: '.azure-pipelines/install_python_version.py'
      arguments: '${{ parameters.versionSpec }} --installer_folder="../_pyinstaller'
 
   # use