diff options
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rwxr-xr-x | setup.py | 1 | ||||
| -rw-r--r-- | tox.ini | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index c1f11aa..dce3f8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,19 +45,19 @@ matrix: - python: "pypy" env: TOXENV=pypy-cryptographyMaster - # And older cryptography versions. + # And current minimum cryptography version. - python: "2.6" - env: TOXENV=py26-cryptography1.2 + env: TOXENV=py26-cryptographyMinimum - python: "2.7" - env: TOXENV=py27-cryptography1.2 + env: TOXENV=py27-cryptographyMinimum - python: "3.3" - env: TOXENV=py33-cryptography1.2 + env: TOXENV=py33-cryptographyMinimum - python: "3.4" - env: TOXENV=py34-cryptography1.2 + env: TOXENV=py34-cryptographyMinimum - python: "3.5" - env: TOXENV=py35-cryptography1.2 + env: TOXENV=py35-cryptographyMinimum - python: "pypy" - env: TOXENV=pypy-cryptography1.2 + env: TOXENV=pypy-cryptographyMinimum # Make sure we don't break Twisted or urllib3 @@ -94,6 +94,7 @@ if __name__ == "__main__": packages=find_packages(where="src"), package_dir={"": "src"}, install_requires=[ + # Fix cryptographyMinimum in tox.ini when changing this! "cryptography>=1.2", "six>=1.5.2" ], @@ -1,5 +1,5 @@ [tox] -envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster,-cryptography1.2},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report +envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster,-cryptographyMinimum},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report [testenv] whitelist_externals = @@ -9,7 +9,7 @@ deps = coverage pytest>=2.8.5 cryptographyMaster: git+https://github.com/pyca/cryptography.git - cryptography1.2: cryptography<1.3 + cryptographyMinimum: cryptography<1.4 setenv = # Do not allow the executing environment to pollute the test environment # with extra packages. |