diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-09 17:07:01 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-09 17:07:01 -0800 |
| commit | 3d5913d223ecac8e130c8b2a8fcb25a715f57f3b (patch) | |
| tree | 1903a863deeb0966a3989f83216f67f4f6a6d3f9 | |
| parent | 5b721884d70d110c405aa10cdfae667eccd81f81 (diff) | |
| parent | 3914dd0c27e4f52b8b3a173912bb1a558384484a (diff) | |
| download | cryptography-3d5913d223ecac8e130c8b2a8fcb25a715f57f3b.tar.gz cryptography-3d5913d223ecac8e130c8b2a8fcb25a715f57f3b.tar.bz2 cryptography-3d5913d223ecac8e130c8b2a8fcb25a715f57f3b.zip | |
Merge pull request #445 from reaperhulk/more-travis-poking
Workaround for travis bug
| -rw-r--r-- | .travis.yml | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index d28fef5b..babea99b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,19 +6,25 @@ compiler: - clang - gcc env: - - TOX_ENV=py26 - - TOX_ENV=py27 - - TOX_ENV=py32 - - TOX_ENV=py33 - - 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=pypy OPENSSL=0.9.8 - - TOX_ENV=docs - - TOX_ENV=pep8 - - TOX_ENV=py3pep8 + # this global section can be removed when + # https://github.com/travis-ci/travis-ci/issues/1844 is fixed + global: + - CI=true + - TRAVIS=true + matrix: + - TOX_ENV=py26 + - TOX_ENV=py27 + - TOX_ENV=py32 + - TOX_ENV=py33 + - 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=pypy OPENSSL=0.9.8 + - TOX_ENV=docs + - TOX_ENV=pep8 + - TOX_ENV=py3pep8 install: - ./.travis/install.sh |