diff options
| author | Timothy Crosley <timothy.crosley@gmail.com> | 2019-03-02 18:56:58 -0800 |
|---|---|---|
| committer | Timothy Crosley <timothy.crosley@gmail.com> | 2019-03-02 18:56:58 -0800 |
| commit | e35b18185e8b447db138e90aa25214a31263b0f5 (patch) | |
| tree | 4e352ea2a2cbf11fe153cad2a01c78a5441909b0 | |
| parent | 379865fc871ab760013542e44f9964fddae83e8f (diff) | |
| download | isort-e35b18185e8b447db138e90aa25214a31263b0f5.tar.gz | |
Add before install step
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | before_install.sh | 28 |
3 files changed, 35 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 3754a696..7b84a86d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,9 +29,6 @@ matrix: env: TOXENV=pypy3 - os: osx language: generic - env: TOXENV=py27 - - os: osx - language: generic env: TOXENV=py34 - os: osx language: generic @@ -48,7 +45,12 @@ matrix: - os: osx language: generic env: TOXENV=py37 + +before_install: + - ./scripts/before_install.sh + install: - pip install tox + script: - tox diff --git a/CHANGELOG.md b/CHANGELOG.md index 20261be4..9aaf88cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ Changelog - Fixed "no_lines_before" to also be respected from previous empty sections. - Fixed slow-down introduced by finders mechanism by adding a LRU cache (issue #848) - Fixed issue #842 default encoding not-set in Python2 +- Restored Windows automated testing +- Added Mac automated testing ### 4.3.9 - Feburary 25, 2019 - hot fix release - Fixed a bug that led to an incompatibility with black: #831 diff --git a/before_install.sh b/before_install.sh new file mode 100644 index 00000000..fa86a770 --- /dev/null +++ b/before_install.sh @@ -0,0 +1,28 @@ +#! /bin/bash + +echo $TRAVIS_OS_NAME + + if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + + # Travis has an old version of pyenv by default, upgrade it + brew update > /dev/null 2>&1 + brew outdated pyenv || brew upgrade pyenv + + pyenv --version + + # Find the latest requested version of python + case "$TOXENV" in + py34) + python_minor=4;; + py35) + python_minor=5;; + py36) + python_minor=6;; + py37) + python_minor=7;; + esac + latest_version=`pyenv install --list | grep -e "^[ ]*3\.$python_minor" | tail -1` + + pyenv install $latest_version + pyenv local $latest_version +fi |