Merge pull request #253 from hynek/fix-crypto-master
Fix CI tests against cryptography master
diff --git a/.travis.yml b/.travis.yml
index c244622..9c91b2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,25 +18,20 @@
env: TOXENV=py34
- python: "pypy"
env: TOXENV=pypy
+
# Also run the tests against cryptography master.
- python: "2.6"
- env:
- CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py26
+ env: TOXENV=py26-cryptographyMaster
- python: "2.7"
- env:
- CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py27
+ env: TOXENV=py27-cryptographyMaster
- python: "3.2"
- env:
- CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py32
+ env: TOXENV=py32-cryptographyMaster
- python: "3.3"
- env:
- CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py33
+ env: TOXENV=py33-cryptographyMaster
- python: "3.4"
- env:
- CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py34
+ env: TOXENV=py34-cryptographyMaster
- python: "pypy"
- env:
- CRYPTOGRAPHY_GIT_MASTER=true TOXENV=pypy
+ env: TOXENV=pypy-cryptographyMaster
# Also run at least a little bit against an older version of OpenSSL.
- python: "2.7"
@@ -57,17 +52,14 @@
- language: generic
os: osx
env: TOXENV=py27
- - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py26
- - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py27
- - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py32
- - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py33
- - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py34
- - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=pypy
+ - env: TOXENV=py26-cryptographyMaster
+ - env: TOXENV=py27-cryptographyMaster
+ - env: TOXENV=py32-cryptographyMaster
+ - env: TOXENV=py33-cryptographyMaster
+ - env: TOXENV=py34-cryptographyMaster
+ - env: TOXENV=pypy-cryptographyMaster
- env: OPENSSL=0.9.8 TOXENV=py27
-before_install:
- - if [ -n "$CRYPTOGRAPHY_GIT_MASTER" ]; then pip install git+https://github.com/pyca/cryptography.git;fi
-
install:
- |
if [[ "$(uname -s)" == 'Darwin' ]]; then
diff --git a/tox.ini b/tox.ini
index da54916..23cc151 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,17 @@
[tox]
-envlist = pypy,py26,py27,py32,py33,py34
+envlist = {pypy,py26,py27,py32,py33,py34}{,-cryptographyMaster}
[testenv]
deps =
setuptools>=7.0 # older setuptools pollute CWD with egg files of dependencies
coverage
+ cryptographyMaster: git+https://github.com/pyca/cryptography.git
setenv =
# Do not allowed the executing environment to pollute the test environment
# with extra packages.
PYTHONPATH=
commands =
python -c "import OpenSSL.SSL; print(OpenSSL.SSL.SSLeay_version(OpenSSL.SSL.SSLEAY_VERSION))"
+ python -c "import cryptography; print(cryptography.__version__)"
coverage run --branch --source=OpenSSL setup.py test
coverage report -m