Skip to content

Commit 5fd5e27

Browse files
authored
Merge pull request #238 from mayeut/devtoolset-9
manylinux2014 now uses devtoolset-9 Also fixes travis-ci build issues.
2 parents af13871 + 69f00c4 commit 5fd5e27

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
os: linux
2+
dist: bionic
23
language: python
34

4-
matrix:
5+
jobs:
56
include:
67
- python: "3.5"
78
- python: "3.6"
89
- python: "3.7"
910
- python: "3.8"
10-
- language: c
11+
- python: "3.7"
1112
arch: arm64
12-
- language: c
13+
- python: "3.7"
1314
arch: ppc64le
14-
- language: c
15+
- python: "3.7"
1516
arch: s390x
1617
- python: "3.7"
1718
env: LINTER=1
1819

19-
sudo: required
2020
services:
2121
- docker
2222

2323
notifications:
2424
email: false
2525

2626
before_install:
27-
- if [ "$(uname -m)" != "x86_64" ]; then sudo apt-get install -y python3-pip python3-venv && python3 -m venv ./.venv && source ./.venv/bin/activate; fi
2827
- pip install --upgrade pip setuptools
2928

3029
install:
3130
- pip install -r test-requirements.txt
3231
- pip install tox codecov
3332
- pip install -e .
33+
# pull manylinux images that will be used, this helps passing tests which would otherwise timeout.
34+
- python -c $'from tests.integration.test_manylinux import MANYLINUX_IMAGES\nfor image in MANYLINUX_IMAGES.values():\n print(image)' | xargs -L 1 docker pull
3435

3536
script:
3637
- tests/travis.sh

tests/integration/test_manylinux.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
DEVTOOLSET = {
4040
'manylinux1': 'devtoolset-2',
4141
'manylinux2010': 'devtoolset-8',
42-
'manylinux2014': 'devtoolset-8',
42+
'manylinux2014': 'devtoolset-9',
4343
}
4444
PATH_DIRS = [
4545
'/opt/python/{}/bin'.format(PYTHON_ABI),
@@ -182,7 +182,6 @@ def any_manylinux_container(any_manylinux_img, io_folder):
182182
yield '{}_{}'.format(policy, PLATFORM), container
183183

184184

185-
@pytest.mark.xfail(condition=(PLATFORM == 'aarch64'), reason='numpy build fails on aarch64', strict=True)
186185
def test_build_repair_numpy(any_manylinux_container, docker_python, io_folder):
187186
# Integration test: repair numpy built from scratch
188187

0 commit comments

Comments
 (0)