diff --git a/.travis.yml b/.travis.yml index b23556f8cc9c71bce651c8df9f72d937fa8ac617..7a47bd1e598c99c56299b897ea1ec49a776b8950 100644 --- a/.travis.yml +++ b/.travis.yml @@ -118,10 +118,12 @@ matrix: # PyPy # These are known to be broken. - - python: "pypy" + - python: "pypy2.7-6.0" + dist: xenial env: LIBRARY=ffmpeg-4.0 os: linux - - python: "pypy3" + - python: "pypy3.5-6.0" + dist: xenial env: LIBRARY=ffmpeg-4.0 os: linux @@ -144,10 +146,12 @@ matrix: allow_failures: - - python: "pypy" + - python: "pypy2.7-6.0" + dist: xenial env: LIBRARY=ffmpeg-4.0 os: linux - - python: "pypy3" + - python: "pypy3.5-6.0" + dist: xenial env: LIBRARY=ffmpeg-4.0 os: linux diff --git a/scripts/activate.sh b/scripts/activate.sh index 8a540c45da8f81d936c458faa9306692e080ffd9..ca03a8df6d6ce4dd601b6570d084086492bce21d 100755 --- a/scripts/activate.sh +++ b/scripts/activate.sh @@ -44,7 +44,7 @@ if [[ "$TRAVIS" ]]; then # Travis as a very self-contained environment. Lets just work in that. echo "We're on Travis, so not setting up another virtualenv." - if [[ "$TRAVIS_PYTHON_VERSION" = "2.7" || "$TRAVIS_PYTHON_VERSION" = "pypy" ]]; then + if [[ "$TRAVIS_PYTHON_VERSION" = "2.7" || "$TRAVIS_PYTHON_VERSION" = "pypy2.7-6.0" ]]; then PYAV_PYTHON=python PYAV_PIP=pip fi