Skip to content

Commit 3fd90dd

Browse files
authored
Merge pull request #265 from mayeut/python-3.9
Add python 3.9 tests & advertise python 3.9 support
2 parents 7502b9d + 0b60fc6 commit 3fd90dd

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

.travis.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
os: linux
2-
dist: bionic
2+
dist: focal
33
language: python
44

55
jobs:
66
include:
77
- python: "3.6"
88
- python: "3.7"
99
- python: "3.8"
10-
- python: "3.7"
11-
arch: arm64
12-
- python: "3.7"
10+
- python: "3.9"
11+
- python: "3.8"
12+
arch: arm64-graviton2
13+
virt: vm
14+
group: edge
15+
- python: "3.8"
1316
arch: ppc64le
14-
- python: "3.7"
17+
- python: "3.8"
1518
arch: s390x
16-
- python: "3.7"
19+
- python: "3.8"
1720
env: LINTER=1
1821

1922
services:

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ classifier =
1717
Programming Language :: Python :: 3.6
1818
Programming Language :: Python :: 3.7
1919
Programming Language :: Python :: 3.8
20+
Programming Language :: Python :: 3.9
2021
Programming Language :: Python :: 3 :: Only
2122
Topic :: Software Development
2223
Topic :: Software Development :: Build Tools

tests/integration/test_manylinux.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
PATH = {k: ':'.join(PATH_DIRS).format(devtoolset=v)
5858
for k, v in DEVTOOLSET.items()}
5959
WHEEL_CACHE_FOLDER = op.expanduser('~/.cache/auditwheel_tests')
60-
ORIGINAL_NUMPY_WHEEL = f'numpy-1.16.5-{PYTHON_ABI}-linux_{PLATFORM}.whl'
60+
NUMPY_VERSION = '1.19.2'
61+
ORIGINAL_NUMPY_WHEEL = f'numpy-{NUMPY_VERSION}-{PYTHON_ABI}-linux_{PLATFORM}.whl'
6162
ORIGINAL_SIX_WHEEL = 'six-1.11.0-py2.py3-none-any.whl'
6263

6364

@@ -202,8 +203,10 @@ def test_build_repair_numpy(any_manylinux_container, docker_python, io_folder):
202203
# and put the result in the cache folder to speed-up future build.
203204
# This part of the build is independent of the auditwheel code-base
204205
# so it's safe to put it in cache.
205-
docker_exec(manylinux_ctr,
206-
'pip wheel -w /io --no-binary=:all: numpy==1.16.5')
206+
docker_exec(
207+
manylinux_ctr,
208+
f'pip wheel -w /io --no-binary=:all: numpy=={NUMPY_VERSION}'
209+
)
207210
os.makedirs(op.join(WHEEL_CACHE_FOLDER, policy), exist_ok=True)
208211
shutil.copy2(op.join(io_folder, ORIGINAL_NUMPY_WHEEL),
209212
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):
219222

220223
assert len(filenames) == 2
221224
repaired_wheels = [fn for fn in filenames if 'manylinux' in fn]
222-
assert repaired_wheels == [f'numpy-1.16.5-{PYTHON_ABI}-{policy}.whl']
225+
assert repaired_wheels == [
226+
f'numpy-{NUMPY_VERSION}-{PYTHON_ABI}-{policy}.whl'
227+
]
223228
repaired_wheel = repaired_wheels[0]
224229
output = docker_exec(manylinux_ctr, 'auditwheel show /io/' + repaired_wheel)
225230
assert (
226-
f'numpy-1.16.5-{PYTHON_ABI}-{policy}.whl is consistent'
231+
f'numpy-{NUMPY_VERSION}-{PYTHON_ABI}-{policy}.whl is consistent'
227232
f' with the following platform tag: "{policy}"'
228233
) in output.replace('\n', ' ')
229234

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
minversion = 1.6
33
skipsdist = True
4-
envlist = py36,py37,py38,lint,cov
4+
envlist = py36,py37,py38,py39,lint,cov
55

66
[testenv]
77
deps = .

0 commit comments

Comments
 (0)