diff --git a/.travis.yml b/.travis.yml index 8c43e3d5f..1dda48f94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,10 +27,10 @@ matrix: os: linux dist: xenial env: TOXENV=py37 - - language: generic - os: osx - osx_image: xcode8.3 - env: TOXENV=py34 + - python: 3.8 + os: linux + dist: xenial + env: TOXENV=py38 - language: generic os: osx osx_image: xcode8.3 @@ -38,7 +38,7 @@ matrix: - language: generic os: osx osx_image: xcode8.3 - env: TOXENV=py36 + env: TOXENV=py37 before_install: - | diff --git a/.travis/install.sh b/.travis/install.sh index d61795dce..277504938 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -4,38 +4,36 @@ set -e set -x if [[ "$(uname -s)" == 'Darwin' ]]; then - # HOMEBREW_NO_AUTO_UPDATE=1 + export HOMEBREW_NO_AUTO_UPDATE=1 export HOMEBREW_LOGS=~/brew-logs export HOMEBREW_TEMP=~/brew-temp mkdir $HOMEBREW_LOGS mkdir $HOMEBREW_TEMP - # brew update - if [[ "${OPENSSL}" != "0.9.8" ]]; then - brew outdated openssl || brew upgrade openssl - fi + brew update > /dev/null + brew cleanup > /dev/null # do this here, so it won't automatically trigger in the middle of other stuff + brew outdated pkg-config || brew upgrade pkg-config + # do NOT update openssl 1.0.x, brew will also update a lot of dependent pkgs (and their dependencies) then! + #brew outdated openssl || brew upgrade openssl + export PKG_CONFIG_PATH="/usr/local/opt/openssl@1.1/lib/pkgconfig:$PKG_CONFIG_PATH" + brew install readline + export PKG_CONFIG_PATH="/usr/local/opt/readline/lib/pkgconfig:$PKG_CONFIG_PATH" + brew install lz4 + brew install xz # required for python lzma module + brew install Caskroom/cask/osxfuse + brew outdated pyenv || brew upgrade pyenv if which pyenv > /dev/null; then eval "$(pyenv init -)" fi - brew install lz4 - brew install xz # required for python lzma module - brew outdated pyenv || brew upgrade pyenv - brew install pkg-config - brew install Caskroom/cask/osxfuse - case "${TOXENV}" in - py34) - pyenv install 3.4.5 - pyenv global 3.4.5 - ;; py35) - pyenv install 3.5.2 - pyenv global 3.5.2 + pyenv install 3.5.3 # minimum for openssl 1.1.x + pyenv global 3.5.3 ;; - py36) - pyenv install 3.6.0 - pyenv global 3.6.0 + py37) + pyenv install 3.7.0 + pyenv global 3.7.0 ;; esac pyenv rehash diff --git a/tox.ini b/tox.ini index 7b317986b..1ec50b5b3 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ # fakeroot -u tox --recreate [tox] -envlist = py{34,35,36,37},flake8 +envlist = py{34,35,36,37,38},flake8 [testenv] deps =