diff options
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rwxr-xr-x | .travis/install.sh | 5 |
2 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 91635c7d..1816266d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ sudo: false +dist: trusty language: python @@ -9,7 +10,8 @@ cache: matrix: include: - - python: 2.6 # these are just to make travis's UI a bit prettier + # these are just to make travis's UI a bit prettier + - python: 2.6 env: TOXENV=py26 - python: 2.7 env: TOXENV=py27 @@ -21,12 +23,9 @@ matrix: env: TOXENV=py35 - python: 3.6 env: TOXENV=py36 - - python: pypy - env: TOXENV=pypy-nocoverage PYPY_VERSION=2.6.1 - - python: pypy - env: TOXENV=pypy PYPY_VERSION=4.0.1 - - python: pypy - env: TOXENV=pypy PYPY_VERSION=5.6.0 + - env: TOXENV=pypy-nocoverage PYPY_VERSION=2.6.1 + - env: TOXENV=pypy PYPY_VERSION=4.0.1 + - env: TOXENV=pypy PYPY_VERSION=5.6.0 - python: 2.7 env: TOXENV=py27 OPENSSL=1.1.0e - python: 3.5 diff --git a/.travis/install.sh b/.travis/install.sh index 14c29dfe..3b6de00d 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -10,7 +10,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then brew outdated openssl || brew upgrade openssl # install pyenv - git clone --depth 1 https://github.com/yyuu/pyenv.git ~/.pyenv + git clone --depth 1 https://github.com/pyenv/pyenv ~/.pyenv PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" @@ -56,7 +56,8 @@ else # temporary pyenv installation to get latest pypy until the travis # container infra is upgraded if [[ "${TOXENV}" = pypy* ]]; then - git clone https://github.com/yyuu/pyenv.git ~/.pyenv + rm -rf ~/.pyenv + git clone https://github.com/pyenv/pyenv ~/.pyenv PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" |