From 4f77faab77bafce288d2baa143e66d4ec870d2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Bielawski?= <michal.bielawski@apperio.com>
Date: Fri, 30 Jul 2021 13:54:04 +0100
Subject: [PATCH] Add support for Python 3.9

---
 .github/workflows/ci.yaml |  6 +++---
 setup.py                  |  1 +
 tox.ini                   | 17 +++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7ba42dde..0a88ad2f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6,3.7,3.8]
+        python-version: [3.6,3.7,3.8,3.9]
     steps:
       - name: Install system packages
         run: sudo apt update && sudo apt-get install libcurl4-openssl-dev libssl-dev
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6,3.7,3.8,pypy3]
+        python-version: [3.6,3.7,3.8,3.9,pypy3]
     steps:
       - name: Install system packages
         run: sudo apt update && sudo apt-get install libcurl4-openssl-dev libssl-dev
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.9]
     steps:
       - name: Install system packages
         run: sudo apt update && sudo apt-get install libcurl4-openssl-dev libssl-dev
diff --git a/setup.py b/setup.py
index 3a7ad0c9..e1bf1cd4 100644
--- a/setup.py
+++ b/setup.py
@@ -141,6 +141,7 @@ setup(
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Intended Audience :: Developers',
diff --git a/tox.ini b/tox.ini
index 11ed7aa7..ddfd8aab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist =
-    {pypy3,3.6,3.7,3.8}-unit
-    {pypy3,3.6,3.7,3.8}-linux-integration-py-amqp
-    {pypy3,3.6,3.7,3.8}-linux-integration-redis
+    {pypy3,3.6,3.7,3.8,3.9}-unit
+    {pypy3,3.6,3.7,3.8,3.9}-linux-integration-py-amqp
+    {pypy3,3.6,3.7,3.8,3.9}-linux-integration-redis
     flake8
     flakeplus
     apicheck
@@ -17,10 +17,10 @@ passenv =
   DISTUTILS_USE_SDK
 deps=
     -r{toxinidir}/requirements/dev.txt
-    apicheck,pypy3,3.6,3.7,3.8: -r{toxinidir}/requirements/default.txt
-    apicheck,pypy3,3.6,3.7,3.8: -r{toxinidir}/requirements/test.txt
-    apicheck,pypy3,3.6,3.7-linux,3.8-linux: -r{toxinidir}/requirements/test-ci.txt
-    3.7-windows,3.8-windows: -r{toxinidir}/requirements/test-ci-windows.txt
+    apicheck,pypy3,3.6,3.7,3.8,3.9: -r{toxinidir}/requirements/default.txt
+    apicheck,pypy3,3.6,3.7,3.8,3.9: -r{toxinidir}/requirements/test.txt
+    apicheck,pypy3,3.6,3.7-linux,3.8-linux,3.9-linux: -r{toxinidir}/requirements/test-ci.txt
+    3.7-windows,3.8-windows,3.9-windows: -r{toxinidir}/requirements/test-ci-windows.txt
     apicheck,linkcheck: -r{toxinidir}/requirements/docs.txt
     flake8,flakeplus,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt
 
@@ -32,7 +32,8 @@ commands =
 basepython =
     3.6: python3.6
     3.7: python3.7
-    3.8,apicheck,pydocstyle,flake8,linkcheck,cov: python3.8
+    3.8: python3.8
+    3.9,apicheck,pydocstyle,flake8,linkcheck,cov: python3.9
     pypy3: pypy
 
 install_command = python -m pip --disable-pip-version-check install {opts} {packages}