Skip to content

Commit fb0136a

Browse files
committed
show that it works with cryptography main
1 parent 73fc958 commit fb0136a

File tree

3 files changed

+2
-29
lines changed

3 files changed

+2
-29
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,13 @@ jobs:
99
strategy:
1010
matrix:
1111
PYTHON:
12-
# Base builds
13-
- {VERSION: "3.6", TOXENV: "py36"}
14-
- {VERSION: "3.7", TOXENV: "py37"}
15-
- {VERSION: "3.8", TOXENV: "py38"}
16-
- {VERSION: "3.9", TOXENV: "py39"}
17-
- {VERSION: "3.10", TOXENV: "py310"}
18-
- {VERSION: "pypy3", TOXENV: "pypy3"}
1912
# -cryptographyMain
2013
- {VERSION: "3.6", TOXENV: "py36-cryptographyMain"}
2114
- {VERSION: "3.7", TOXENV: "py37-cryptographyMain"}
2215
- {VERSION: "3.8", TOXENV: "py38-cryptographyMain"}
2316
- {VERSION: "3.9", TOXENV: "py39-cryptographyMain"}
2417
- {VERSION: "3.10", TOXENV: "py310-cryptographyMain"}
2518
- {VERSION: "pypy3", TOXENV: "pypy3-cryptographyMain"}
26-
# -cryptographyMinimum
27-
- {VERSION: "3.6", TOXENV: "py36-cryptographyMinimum"}
28-
- {VERSION: "3.7", TOXENV: "py37-cryptographyMinimum"}
29-
- {VERSION: "3.8", TOXENV: "py38-cryptographyMinimum"}
30-
- {VERSION: "3.9", TOXENV: "py39-cryptographyMinimum"}
31-
- {VERSION: "3.10", TOXENV: "py310-cryptographyMinimum"}
32-
- {VERSION: "pypy3", TOXENV: "pypy3-cryptographyMinimum"}
33-
# Cryptography wheels
34-
- {VERSION: "3.9", TOXENV: "py39-cryptographyMinimum-useWheel"}
35-
- {VERSION: "3.9", TOXENV: "py39-useWheel"}
36-
# Random order
37-
- {VERSION: "3.9", TOXENV: "py39-randomorder"}
38-
# Downstreams
39-
- {VERSION: "3.7", TOXENV: "py37-twistedTrunk"}
40-
# Meta
41-
- {VERSION: "3.9", TOXENV: "check-manifest"}
42-
- {VERSION: "3.9", TOXENV: "pypi-readme"}
43-
- {VERSION: "3.9", TOXENV: "flake8"}
44-
- {VERSION: "3.9", TOXENV: "docs"}
4519
name: "${{ matrix.PYTHON.TOXENV }}"
4620
steps:
4721
- uses: actions/[email protected]
@@ -64,7 +38,6 @@ jobs:
6438
strategy:
6539
matrix:
6640
TEST:
67-
- {CONTAINER: "ubuntu-bionic", TOXENV: "py36"}
6841
# cryptographyMain used since there's no wheel
6942
- {CONTAINER: "ubuntu-rolling", TOXENV: "py39-cryptographyMain"}
7043
name: "${{ matrix.TEST.TOXENV }} on ${{ matrix.TEST.CONTAINER }}"

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def find_meta(meta):
9393
package_dir={"": "src"},
9494
install_requires=[
9595
# Fix cryptographyMinimum in tox.ini when changing this!
96-
"cryptography>=37.0",
96+
"cryptography>=36.0",
9797
],
9898
extras_require={
9999
"test": ["flaky", "pretend", "pytest>=3.0.1"],

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extras =
1010
deps =
1111
coverage>=4.2
1212
cryptographyMain: git+https://github.com/pyca/cryptography.git
13-
cryptographyMinimum: cryptography==37.0
13+
cryptographyMinimum: cryptography==36.0
1414
randomorder: pytest-randomly
1515
setenv =
1616
# Do not allow the executing environment to pollute the test environment

0 commit comments

Comments
 (0)