diff --git a/.travis.yml b/.travis.yml index 930f741..d931f5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,15 @@ -sudo: required - -matrix: - include: - - dist: trusty - language: python - services: - - docker - script: - - ./make/manylinux1/build_wheels.sh - - os: osx - osx_image: xcode8.3 - script: - - ./make/osx/build_wheels.sh +language: generic +jobs: + include: + - os: linux + services: + - docker + script: + - ./make/manylinux1/build_wheels.sh + - os: osx + osx_image: xcode9.4 + script: + - ./make/osx/build_wheels.sh install: - if [ "${TRAVIS_OS_NAME:-}" == "osx" ]; then ./make/osx/install_python.sh; fi diff --git a/make/osx/build_wheels.sh b/make/osx/build_wheels.sh index 13b78d8..97c5332 100755 --- a/make/osx/build_wheels.sh +++ b/make/osx/build_wheels.sh @@ -1,10 +1,11 @@ set -e set +x -for VER in 2.7 3.4 3.5 3.6 3.7; do +for VER in 3.7 3.8; do PIP="pip${VER}" PYTHON="python${VER}" VENV="venv_${VER}" + PATH="/Library/Frameworks/Python.framework/Versions/${VER}/bin:$PATH" # update pip for newer TLS support curl https://bootstrap.pypa.io/get-pip.py | ${PYTHON} diff --git a/make/osx/install_python.sh b/make/osx/install_python.sh index 314e8fe..15cb051 100755 --- a/make/osx/install_python.sh +++ b/make/osx/install_python.sh @@ -3,10 +3,8 @@ set -euo pipefail set -x URLS=( - 'https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg' - 'https://www.python.org/ftp/python/3.4.4/python-3.4.4-macosx10.6.pkg' - 'https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg' - 'https://www.python.org/ftp/python/3.6.4/python-3.6.4-macosx10.6.pkg' + 'https://www.python.org/ftp/python/3.7.9/python-3.7.9-macosx10.9.pkg' + 'https://www.python.org/ftp/python/3.8.6/python-3.8.6-macosx10.9.pkg' ) for url in "${URLS[@]}"; do diff --git a/requirements/setup.txt b/requirements/setup.txt index 35a5061..ca0c6f8 100644 --- a/requirements/setup.txt +++ b/requirements/setup.txt @@ -1 +1 @@ --r prod.txt \ No newline at end of file +-r prod.txt diff --git a/requirements/test.txt b/requirements/test.txt index 51e9a26..8c01ca8 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,3 +1,3 @@ -r prod.txt tox -pytest \ No newline at end of file +pytest