Merge branch 'master' into pyup-scheduled-update-09-04-2017

fusionapp · Sep 5, 2017 · 5f30b50 · 5f30b50
2 parents 24d9ebb + 043ded3
commit 5f30b50
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 sudo: false
 language: python
+dist: trusty
 cache:
   directories:
   - "$HOME/.cache/pip"
@@ -11,19 +12,12 @@ branches:
 matrix:
   include:
     - env: TOXENV=py27
+      python: 2.7.13
     - env: TOXENV=pypy
+      python: pypy2.7-5.8.0
 install:
 - pip install -U pip setuptools wheel
 - pip install tox codecov
-- |
-  if [ "${TOXENV}" == "pypy" ]; then
-    git clone --depth 1 /~https://github.com/yyuu/pyenv.git ~/.pyenv
-    PYENV_ROOT="$HOME/.pyenv"
-    PATH="$PYENV_ROOT/bin:$PATH"
-    eval "$(pyenv init -)"
-    pyenv install pypy2.7-5.8.0
-    pyenv global pypy2.7-5.8.0
-  fi
 script:
 - tox
 after_success: