Merge pull request #374 from hynek/tox-twisted
Add a twisted target to CI
diff --git a/.travis.yml b/.travis.yml
index 55bffb0..00902b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,11 @@
- python: "pypy"
env: TOXENV=pypy-cryptographyMaster
+ # Make sure we don't break Twisted
+ - python: "2.7"
+ env: TOXENV=py27-twistedMaster
+
+
# Also run at least a little bit against an older version of OpenSSL.
- python: "2.7"
env:
diff --git a/tox.ini b/tox.ini
index 1a8a723..11a0821 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
[tox]
-envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster},pypi-readme,check-manifest,flake8,docs,coverage-report
+envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report
[testenv]
whitelist_externals =
openssl
-passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH LD_LIBRARY_PATH
+passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH LD_LIBRARY_PATH TERM
deps =
coverage
pytest
@@ -19,6 +19,18 @@
python -c "import cryptography; print(cryptography.__version__)"
coverage run --parallel -m pytest tests
+[testenv:py27-twistedMaster]
+deps =
+ # [tls,conch] syntax doesn't work here so we enumerate all dependencies.
+ git+https://github.com/twisted/twisted
+ idna
+ service_identity
+passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH LD_LIBRARY_PATH TERM
+commands =
+ python -c "import OpenSSL.SSL; print(OpenSSL.SSL.SSLeay_version(OpenSSL.SSL.SSLEAY_VERSION))"
+ python -c "import cryptography; print(cryptography.__version__)"
+ trial twisted
+
[testenv:flake8]
deps =
flake8