Commit a1e5ad91 authored by Forest Gregg's avatar Forest Gregg

python 3.7 binary wheels, simplify now unnecessary persistent install for py3.6.0

parent c8bf24e1
...@@ -39,7 +39,10 @@ matrix: ...@@ -39,7 +39,10 @@ matrix:
env: TERRYFY_PYTHON='macpython 3.5' env: TERRYFY_PYTHON='macpython 3.5'
- os: osx - os: osx
language: generic language: generic
env: TERRYFY_PYTHON='macpython 3.6.0' env: TERRYFY_PYTHON='macpython 3.6.1'
- os: osx
language: generic
env: TERRYFY_PYTHON='macpython 3.7.0'
- services: - services:
- docker - docker
env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
...@@ -61,12 +64,6 @@ before_install: ...@@ -61,12 +64,6 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then get_python_environment $TERRYFY_PYTHON venv; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then get_python_environment $TERRYFY_PYTHON venv; fi
install: install:
- pip install -U pip setuptools - pip install -U pip setuptools
# persistent is a setup_requires, which gets downloaded by
# setuptools, not pip. But macpython 3.6.0 setuptools has trouble with SSL on
# Travis CI
# (https://travis-ci.org/zopefoundation/BTrees/jobs/192340692) so
# we install with pip manually.
- pip install -U persistent
- if [[ "$WITH_COVERAGE" == "1" ]]; then pip install coveralls coverage; fi - if [[ "$WITH_COVERAGE" == "1" ]]; then pip install coveralls coverage; fi
- pip install -e .[test,ZODB] - pip install -e .[test,ZODB]
script: script:
......
...@@ -13,6 +13,8 @@ environment: ...@@ -13,6 +13,8 @@ environment:
- python: 35-x64 - python: 35-x64
- python: 36 - python: 36
- python: 36-x64 - python: 36-x64
- python: 37
- python: 37-x64
install: install:
- "SET PATH=C:\\Python%PYTHON%;c:\\Python%PYTHON%\\scripts;%PATH%" - "SET PATH=C:\\Python%PYTHON%;c:\\Python%PYTHON%\\scripts;%PATH%"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment