Skip to content

Commit 92a3f7f

Browse files
committed
Modernize
1. Update the travis script to follow their multi-OS example. 2. Set the path to Python in the osx bulid wheels script. 3. Add newlines to a couple requirements. 4. For osx, removed all versions of python except 3.7 and 3.8.
1 parent e7e64de commit 92a3f7f

5 files changed

Lines changed: 18 additions & 21 deletions

File tree

.travis.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
sudo: required
2-
3-
matrix:
4-
include:
5-
- dist: trusty
6-
language: python
7-
services:
8-
- docker
9-
script:
10-
- ./make/manylinux1/build_wheels.sh
11-
- os: osx
12-
osx_image: xcode8.3
13-
script:
14-
- ./make/osx/build_wheels.sh
1+
language: generic
152

3+
jobs:
4+
include:
5+
- os: linux
6+
services:
7+
- docker
8+
script:
9+
- ./make/manylinux1/build_wheels.sh
10+
- os: osx
11+
osx_image: xcode9.4
12+
script:
13+
- ./make/osx/build_wheels.sh
1614
install:
1715
- if [ "${TRAVIS_OS_NAME:-}" == "osx" ]; then ./make/osx/install_python.sh; fi

make/osx/build_wheels.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
set -e
22
set +x
33

4-
for VER in 2.7 3.4 3.5 3.6 3.7; do
4+
for VER in 3.7 3.8; do
55
PIP="pip${VER}"
66
PYTHON="python${VER}"
77
VENV="venv_${VER}"
8+
PATH="/Library/Frameworks/Python.framework/Versions/${VER}/bin:$PATH"
89

910
# update pip for newer TLS support
1011
curl https://bootstrap.pypa.io/get-pip.py | ${PYTHON}

make/osx/install_python.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ set -euo pipefail
33
set -x
44

55
URLS=(
6-
'https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg'
7-
'https://www.python.org/ftp/python/3.4.4/python-3.4.4-macosx10.6.pkg'
8-
'https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg'
9-
'https://www.python.org/ftp/python/3.6.4/python-3.6.4-macosx10.6.pkg'
6+
'https://www.python.org/ftp/python/3.7.9/python-3.7.9-macosx10.9.pkg'
7+
'https://www.python.org/ftp/python/3.8.6/python-3.8.6-macosx10.9.pkg'
108
)
119

1210
for url in "${URLS[@]}"; do

requirements/setup.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-r prod.txt
1+
-r prod.txt

requirements/test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
-r prod.txt
22
tox
3-
pytest
3+
pytest

0 commit comments

Comments
 (0)