Skip to content

Commit

Permalink
Revert "show that it works with cryptography main"
Browse files Browse the repository at this point in the history
This reverts commit fb0136a.
  • Loading branch information
mhils committed Mar 29, 2022
1 parent 08babaa commit 681b669
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
strategy:
matrix:
TEST:
- {CONTAINER: "ubuntu-bionic", TOXENV: "py36"}
# cryptographyMain used since there's no wheel
- {CONTAINER: "ubuntu-rolling", TOXENV: "py39-cryptographyMain"}
name: "${{ matrix.TEST.TOXENV }} on ${{ matrix.TEST.CONTAINER }}"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def find_meta(meta):
package_dir={"": "src"},
install_requires=[
# Fix cryptographyMinimum in tox.ini when changing this!
"cryptography>=36.0",
"cryptography>=37.0",
],
extras_require={
"test": ["flaky", "pretend", "pytest>=3.0.1"],
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extras =
deps =
coverage>=4.2
cryptographyMain: git+https://github.com/pyca/cryptography.git
cryptographyMinimum: cryptography==36.0
cryptographyMinimum: cryptography==37.0
randomorder: pytest-randomly
setenv =
# Do not allow the executing environment to pollute the test environment
Expand Down

0 comments on commit 681b669

Please sign in to comment.