From 055d26bf379dc4a35b8e4196813994b6b8f84a0f Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Sat, 17 Oct 2020 12:42:18 +0200
Subject: [PATCH 1/4] Add python 3.9 support

---
 .travis.yml | 1 +
 setup.cfg   | 1 +
 tox.ini     | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c351667f..5e97e31a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ jobs:
   - python: "3.6"
   - python: "3.7"
   - python: "3.8"
+  - python: "3.9"
   - python: "3.7"
     arch: arm64
   - python: "3.7"
diff --git a/setup.cfg b/setup.cfg
index 705b12f4..bc81b446 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ classifier =
         Programming Language :: Python :: 3.6
         Programming Language :: Python :: 3.7
         Programming Language :: Python :: 3.8
+        Programming Language :: Python :: 3.9
         Programming Language :: Python :: 3 :: Only
         Topic :: Software Development
         Topic :: Software Development :: Build Tools
diff --git a/tox.ini b/tox.ini
index 1b7e5939..5f25cf3c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py36,py37,py38,lint,cov
+envlist = py36,py37,py38,py39,lint,cov
 
 [testenv]
 deps = .

From ebfbc41f2585767801a5c58278a114727cbdf3c1 Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Tue, 27 Oct 2020 13:27:05 +0100
Subject: [PATCH 2/4] Use numpy 1.19.2 for tests

---
 tests/integration/test_manylinux.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/integration/test_manylinux.py b/tests/integration/test_manylinux.py
index 7cb2e298..d6ffeb59 100644
--- a/tests/integration/test_manylinux.py
+++ b/tests/integration/test_manylinux.py
@@ -57,7 +57,8 @@
 PATH = {k: ':'.join(PATH_DIRS).format(devtoolset=v)
         for k, v in DEVTOOLSET.items()}
 WHEEL_CACHE_FOLDER = op.expanduser('~/.cache/auditwheel_tests')
-ORIGINAL_NUMPY_WHEEL = f'numpy-1.16.5-{PYTHON_ABI}-linux_{PLATFORM}.whl'
+NUMPY_VERSION = '1.19.2'
+ORIGINAL_NUMPY_WHEEL = f'numpy-{NUMPY_VERSION}-{PYTHON_ABI}-linux_{PLATFORM}.whl'
 ORIGINAL_SIX_WHEEL = 'six-1.11.0-py2.py3-none-any.whl'
 
 
@@ -202,8 +203,10 @@ def test_build_repair_numpy(any_manylinux_container, docker_python, io_folder):
         # and put the result in the cache folder to speed-up future build.
         # This part of the build is independent of the auditwheel code-base
         # so it's safe to put it in cache.
-        docker_exec(manylinux_ctr,
-            'pip wheel -w /io --no-binary=:all: numpy==1.16.5')
+        docker_exec(
+            manylinux_ctr,
+            f'pip wheel -w /io --no-binary=:all: numpy=={NUMPY_VERSION}'
+        )
         os.makedirs(op.join(WHEEL_CACHE_FOLDER, policy), exist_ok=True)
         shutil.copy2(op.join(io_folder, ORIGINAL_NUMPY_WHEEL),
                      op.join(WHEEL_CACHE_FOLDER, policy, ORIGINAL_NUMPY_WHEEL))
@@ -219,11 +222,13 @@ def test_build_repair_numpy(any_manylinux_container, docker_python, io_folder):
 
     assert len(filenames) == 2
     repaired_wheels = [fn for fn in filenames if 'manylinux' in fn]
-    assert repaired_wheels == [f'numpy-1.16.5-{PYTHON_ABI}-{policy}.whl']
+    assert repaired_wheels == [
+        f'numpy-{NUMPY_VERSION}-{PYTHON_ABI}-{policy}.whl'
+    ]
     repaired_wheel = repaired_wheels[0]
     output = docker_exec(manylinux_ctr, 'auditwheel show /io/' + repaired_wheel)
     assert (
-        f'numpy-1.16.5-{PYTHON_ABI}-{policy}.whl is consistent'
+        f'numpy-{NUMPY_VERSION}-{PYTHON_ABI}-{policy}.whl is consistent'
         f' with the following platform tag: "{policy}"'
     ) in output.replace('\n', ' ')
 

From 00c021ff8e17c471d1b053a01ca44f5a8d91ac09 Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Tue, 27 Oct 2020 15:05:35 +0100
Subject: [PATCH 3/4] Build on focal, use arm64-graviton2 for aarch64 tests

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5e97e31a..beab4df5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 os: linux
-dist: bionic
+dist: focal
 language: python
 
 jobs:
@@ -9,7 +9,9 @@ jobs:
   - python: "3.8"
   - python: "3.9"
   - python: "3.7"
-    arch: arm64
+    arch: arm64-graviton2
+    virt: vm
+    group: edge
   - python: "3.7"
     arch: ppc64le
   - python: "3.7"

From 0b60fc62c602982fe3cbf74e2c6e54be35e02ccf Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Tue, 27 Oct 2020 15:59:33 +0100
Subject: [PATCH 4/4] Use python 3.8 for aarch64, ppc64le & s390x tests

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index beab4df5..0c5fe0e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,15 +8,15 @@ jobs:
   - python: "3.7"
   - python: "3.8"
   - python: "3.9"
-  - python: "3.7"
+  - python: "3.8"
     arch: arm64-graviton2
     virt: vm
     group: edge
-  - python: "3.7"
+  - python: "3.8"
     arch: ppc64le
-  - python: "3.7"
+  - python: "3.8"
     arch: s390x
-  - python: "3.7"
+  - python: "3.8"
     env: LINTER=1
 
 services: