Remove tox workaround for Travis CI

No longer necessary.
This commit is contained in:
Jon Dufresne 2017-04-16 15:12:55 -07:00 committed by Ian Stapleton Cordasco
parent 2ed99483f1
commit 24979fb90a
No known key found for this signature in database
GPG Key ID: C9D7A2604B4FCB2A
2 changed files with 3 additions and 23 deletions

View File

@ -19,11 +19,8 @@ matrix:
- python: 3.6
env: TOXENV=py36
- python: pypy
env: TOXENV=pypy PYPY_VERSION=5.1
env: TOXENV=pypy
install:
- ./.travis/install.sh
install: pip install tox
script:
- source ~/.venv/bin/activate
- tox
script: tox

View File

@ -1,17 +0,0 @@
# 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
PYENV_ROOT="$HOME/.pyenv"
PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"
pyenv install "pypy-$PYPY_VERSION"
pyenv global "pypy-$PYPY_VERSION"
pyenv rehash
fi
pip install --upgrade virtualenv
virtualenv ~/.venv
source ~/.venv/bin/activate
pip install --upgrade tox