diff options
| author | Donald Stufft <donald@stufft.io> | 2014-12-05 21:25:01 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-12-05 21:25:01 -0500 |
| commit | 7215fcc1bcf9010e719ff167475808decaba46a0 (patch) | |
| tree | eb66193b9fb02c4674b87ee749c4bd7a309d3321 | |
| parent | e01eeb407aa77e6c8108bf08c85533d268a496bd (diff) | |
| parent | 80b84f511660fee9217852a5447e152f14880117 (diff) | |
| download | cryptography-7215fcc1bcf9010e719ff167475808decaba46a0.tar.gz cryptography-7215fcc1bcf9010e719ff167475808decaba46a0.tar.bz2 cryptography-7215fcc1bcf9010e719ff167475808decaba46a0.zip | |
Merge pull request #1509 from alex/tox-env
Change the envvar for tox env to the officla tox one
| -rw-r--r-- | .travis.yml | 40 | ||||
| -rwxr-xr-x | .travis/install.sh | 6 | ||||
| -rwxr-xr-x | .travis/run.sh | 2 |
3 files changed, 24 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml index cacd1e27..da7ecde5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,21 +7,21 @@ compiler: - gcc env: matrix: - - TOX_ENV=py26 - - TOX_ENV=py27 - - TOX_ENV=py32 - - TOX_ENV=py33 - - TOX_ENV=py34 - - TOX_ENV=pypy - - TOX_ENV=py26 OPENSSL=0.9.8 - - TOX_ENV=py27 OPENSSL=0.9.8 - - TOX_ENV=py32 OPENSSL=0.9.8 - - TOX_ENV=py33 OPENSSL=0.9.8 - - TOX_ENV=py34 OPENSSL=0.9.8 - - TOX_ENV=pypy OPENSSL=0.9.8 - - TOX_ENV=docs - - TOX_ENV=pep8 - - TOX_ENV=py3pep8 + - TOXENV=py26 + - TOXENV=py27 + - TOXENV=py32 + - TOXENV=py33 + - TOXENV=py34 + - TOXENV=pypy + - TOXENV=py26 OPENSSL=0.9.8 + - TOXENV=py27 OPENSSL=0.9.8 + - TOXENV=py32 OPENSSL=0.9.8 + - TOXENV=py33 OPENSSL=0.9.8 + - TOXENV=py34 OPENSSL=0.9.8 + - TOXENV=pypy OPENSSL=0.9.8 + - TOXENV=docs + - TOXENV=pep8 + - TOXENV=py3pep8 install: - ./.travis/install.sh @@ -44,18 +44,18 @@ matrix: - os: osx compiler: gcc - os: osx - env: TOX_ENV=pep8 + env: TOXENV=pep8 compiler: clang - os: osx - env: TOX_ENV=py3pep8 + env: TOXENV=py3pep8 compiler: clang - os: linux - env: TOX_ENV=docs + env: TOXENV=docs compiler: clang - os: linux - env: TOX_ENV=pep8 + env: TOXENV=pep8 compiler: clang - os: linux - env: TOX_ENV=py3pep8 + env: TOXENV=py3pep8 compiler: clang diff --git a/.travis/install.sh b/.travis/install.sh index 51d3097c..6dd84f2c 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -20,7 +20,7 @@ if [[ "$DARWIN" = true ]]; then eval "$(pyenv init -)" fi - case "${TOX_ENV}" in + case "${TOXENV}" in py26) curl -O https://bootstrap.pypa.io/get-pip.py sudo python get-pip.py @@ -62,7 +62,7 @@ if [[ "$DARWIN" = true ]]; then else sudo add-apt-repository -y ppa:fkrull/deadsnakes - if [[ "${TOX_ENV}" == "pypy" ]]; then + if [[ "${TOXENV}" == "pypy" ]]; then sudo add-apt-repository -y ppa:pypy/ppa fi @@ -76,7 +76,7 @@ else sudo apt-get install -y --force-yes libssl-dev/lucid fi - case "${TOX_ENV}" in + case "${TOXENV}" in py26) sudo apt-get install python2.6 python2.6-dev ;; diff --git a/.travis/run.sh b/.travis/run.sh index e4ff2661..1efbd60b 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -18,4 +18,4 @@ if [[ "$(uname -s)" == "Darwin" ]]; then fi fi source ~/.venv/bin/activate -tox -e $TOX_ENV -- $TOX_FLAGS +tox -- $TOX_FLAGS |