Skip to content

Commit

Permalink
Fix cryptography minimum version
Browse files Browse the repository at this point in the history
  • Loading branch information
hynek committed Mar 16, 2016
1 parent b1f3ca8 commit 73412e5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ def find_meta(meta):
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"
],
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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 =
Expand All @@ -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.
Expand Down

0 comments on commit 73412e5

Please sign in to comment.