aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-04-14 14:22:17 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2014-04-14 14:22:17 -0400
commit7de318642cc5c6fda465493331e52874d4c46425 (patch)
tree1389769727fffa0a46571152f012798c1cab3001
parentb1a610ba4239519befa88e5613116b7deae0ff6f (diff)
parent8feb04764a7eebbf0113aeed4c5267fba6b4f596 (diff)
downloadcryptography-7de318642cc5c6fda465493331e52874d4c46425.tar.gz
cryptography-7de318642cc5c6fda465493331e52874d4c46425.tar.bz2
cryptography-7de318642cc5c6fda465493331e52874d4c46425.zip
Merge pull request #915 from reaperhulk/travis-advanced
update travis config to be more concise
-rw-r--r--.travis.yml48
1 files changed, 0 insertions, 48 deletions
diff --git a/.travis.yml b/.travis.yml
index 7d5663d8..6a235140 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,6 @@ compiler:
- clang
- gcc
env:
- # 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
@@ -50,49 +45,6 @@ notifications:
matrix:
exclude:
- os: osx
- env: TOX_ENV=py26
- compiler: gcc
- - os: osx
- env: TOX_ENV=py27
- compiler: gcc
- - os: osx
- env: TOX_ENV=py32
- compiler: gcc
- - os: osx
- env: TOX_ENV=py33
- compiler: gcc
- - os: osx
- env: TOX_ENV=py34
- compiler: gcc
- - os: osx
- env: TOX_ENV=pypy
- compiler: gcc
- - os: osx
- env: TOX_ENV=py26 OPENSSL=0.9.8
- compiler: gcc
- - os: osx
- env: TOX_ENV=py27 OPENSSL=0.9.8
- compiler: gcc
- - os: osx
- env: TOX_ENV=py32 OPENSSL=0.9.8
- compiler: gcc
- - os: osx
- env: TOX_ENV=py33 OPENSSL=0.9.8
- compiler: gcc
- - os: osx
- env: TOX_ENV=py34 OPENSSL=0.9.8
- compiler: gcc
- - os: osx
- env: TOX_ENV=pypy OPENSSL=0.9.8
- compiler: gcc
- - os: osx
- env: TOX_ENV=docs
- compiler: gcc
- - os: osx
- env: TOX_ENV=pep8
- compiler: gcc
- - os: osx
- env: TOX_ENV=py3pep8
compiler: gcc
- os: osx
env: TOX_ENV=pep8