From 0a062cd31597548136a7564129276df5cb5478b6 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Fri, 15 Jan 2021 17:29:36 -0500
Subject: [PATCH] Add support for Python 3.9 (#1504)

* Add support for Python 3.9

Python 3.9.0 was released on 10-05-2020, this commits marks the support
of Python 3.9 in qiskit-aqua. It adds the supported python version in
the package metadata and updates the CI configuration to run test jobs
on Python 3.9. This follows on from Qiskit/qiskit-terra#5189,
Qiskit/qiskit-ignis#505, and Qiskit/qiskit-aer#1071

* Add release note

* Remove 3.9 tutorial job

Jupyter on 3.9 doesn't have a good story yet, so just run tutorials on
3.6 and 3.8 for now.

* Update optional requirement system constraints

Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
---
 .github/workflows/main.yml                             | 10 +++++-----
 releasenotes/notes/add-python3.9-aa545158de52b755.yaml |  5 +++++
 setup.py                                               |  5 +++--
 tox.ini                                                |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/add-python3.9-aa545158de52b755.yaml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 00c9d5410a..04daf4764b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -163,7 +163,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -216,7 +216,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -283,7 +283,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -330,7 +330,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -377,7 +377,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
diff --git a/releasenotes/notes/add-python3.9-aa545158de52b755.yaml b/releasenotes/notes/add-python3.9-aa545158de52b755.yaml
new file mode 100644
index 0000000000..7d8c543f6f
--- /dev/null
+++ b/releasenotes/notes/add-python3.9-aa545158de52b755.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Python 3.9 support has been added in this release. You can now run Qiskit
+    Aqua using Python 3.9.
diff --git a/setup.py b/setup.py
index 93e9618c2a..34a1814067 100644
--- a/setup.py
+++ b/setup.py
@@ -74,6 +74,7 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Topic :: Scientific/Engineering"
     ),
     keywords='qiskit sdk quantum aqua',
@@ -82,8 +83,8 @@
     include_package_data=True,
     python_requires=">=3.6",
     extras_require={
-        'torch': ["torch; sys_platform == 'linux' or (python_version < '3.8' and sys_platform != 'win32')"],
-        'cplex': ["cplex; python_version >= '3.6' and python_version < '3.8'"],
+        'torch': ["torch"],
+        'cplex': ["cplex; python_version < '3.9'"],
         'cvx': ['cvxpy>1.0.0,!=1.1.0,!=1.1.1,!=1.1.2'],
         'pyscf': ["pyscf; sys_platform != 'win32'"],
         'skquant': ["scikit-quant"],
diff --git a/tox.ini b/tox.ini
index a8e32e04cc..a970b4590b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.1
-envlist = py36, py37, py38, lint
+envlist = py36, py37, py38, py39, lint
 skipsdist = True
 
 [testenv]