diff options
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | _travis/fetch_gae_sdk.py | 8 | ||||
| -rwxr-xr-x | _travis/travis-install.sh | 21 | ||||
| -rwxr-xr-x | _travis/travis-run.sh | 11 |
4 files changed, 14 insertions, 36 deletions
diff --git a/.travis.yml b/.travis.yml index 2a334142..b51679db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,16 @@ language: python script: - - ./_travis/travis-run.sh + - tox before_install: - openssl version cache: directories: - ${HOME}/.cache install: -- ./_travis/travis-install.sh + - pip install tox==2.1.1 + - if [[ "${TOXENV}" == "gae" && ! -d ${GAE_PYTHONPATH} ]]; then + python _travis/fetch_gae_sdk.py ; + fi notifications: email: false env: @@ -20,11 +23,12 @@ env: - TOXENV=py27 - TOXENV=py33 - TOXENV=py34 - - TOXENV=pypy - TOXENV=gae # https://github.com/travis-ci/travis-ci/issues/4794 matrix: include: - python: 3.5 env: TOXENV=py35 + - python: pypy-5.3 + env: TOXENV=pypy sudo: false diff --git a/_travis/fetch_gae_sdk.py b/_travis/fetch_gae_sdk.py index 9eb4e1f9..f7788659 100644 --- a/_travis/fetch_gae_sdk.py +++ b/_travis/fetch_gae_sdk.py @@ -67,7 +67,13 @@ def main(argv): if len(argv) > 2: print('Usage: {0} [<destination_dir>]'.format(argv[0])) return 1 - dest_dir = argv[1] if len(argv) > 1 else '.' + if len(argv) > 1: + dest_dir = argv[1] + else: + try: + dest_dir = os.path.dirname(os.environ['GAE_PYTHONPATH']) + except IndexError: + dest_dir = '.' if not os.path.exists(dest_dir): os.makedirs(dest_dir) diff --git a/_travis/travis-install.sh b/_travis/travis-install.sh deleted file mode 100755 index ba44c612..00000000 --- a/_travis/travis-install.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -ev - -pip install tox==2.1.1 - -# Workaround Travis' old PyPy release. If Travis updates, we can remove this -# code. -if [[ "${TOXENV}" == pypy* ]]; then - git clone https://github.com/yyuu/pyenv.git ~/.pyenv - PYENV_ROOT="$HOME/.pyenv" - PATH="$PYENV_ROOT/bin:$PATH" - eval "$(pyenv init -)" - pyenv install pypy-4.0.1 - pyenv global pypy-4.0.1 - pyenv rehash -fi - -if [[ "${TOXENV}" == "gae" && ! -d ${GAE_PYTHONPATH} ]]; then - python _travis/fetch_gae_sdk.py `dirname ${GAE_PYTHONPATH}` -fi diff --git a/_travis/travis-run.sh b/_travis/travis-run.sh deleted file mode 100755 index c044a8d4..00000000 --- a/_travis/travis-run.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -ev - -if [[ "${TOXENV}" == "pypy" ]]; then - PYENV_ROOT="$HOME/.pyenv" - PATH="$PYENV_ROOT/bin:$PATH" - eval "$(pyenv init -)" -fi - -tox
\ No newline at end of file |