Revert "show that it works with cryptography main"

This reverts commit fb0136a.

Author: mhils

.github/workflows/ci.yml

@@ -9,13 +9,39 @@ jobs:
     strategy:
       matrix:
         PYTHON:
+          # Base builds
+          - {VERSION: "3.6", TOXENV: "py36"}
+          - {VERSION: "3.7", TOXENV: "py37"}
+          - {VERSION: "3.8", TOXENV: "py38"}
+          - {VERSION: "3.9", TOXENV: "py39"}
+          - {VERSION: "3.10", TOXENV: "py310"}
+          - {VERSION: "pypy3", TOXENV: "pypy3"}
           # -cryptographyMain
           - {VERSION: "3.6", TOXENV: "py36-cryptographyMain"}
           - {VERSION: "3.7", TOXENV: "py37-cryptographyMain"}
           - {VERSION: "3.8", TOXENV: "py38-cryptographyMain"}
           - {VERSION: "3.9", TOXENV: "py39-cryptographyMain"}
           - {VERSION: "3.10", TOXENV: "py310-cryptographyMain"}
           - {VERSION: "pypy3", TOXENV: "pypy3-cryptographyMain"}
+          # -cryptographyMinimum
+          - {VERSION: "3.6", TOXENV: "py36-cryptographyMinimum"}
+          - {VERSION: "3.7", TOXENV: "py37-cryptographyMinimum"}
+          - {VERSION: "3.8", TOXENV: "py38-cryptographyMinimum"}
+          - {VERSION: "3.9", TOXENV: "py39-cryptographyMinimum"}
+          - {VERSION: "3.10", TOXENV: "py310-cryptographyMinimum"}
+          - {VERSION: "pypy3", TOXENV: "pypy3-cryptographyMinimum"}
+          # Cryptography wheels
+          - {VERSION: "3.9", TOXENV: "py39-cryptographyMinimum-useWheel"}
+          - {VERSION: "3.9", TOXENV: "py39-useWheel"}
+          # Random order
+          - {VERSION: "3.9", TOXENV: "py39-randomorder"}
+          # Downstreams
+          - {VERSION: "3.7", TOXENV: "py37-twistedTrunk"}
+          # Meta
+          - {VERSION: "3.9", TOXENV: "check-manifest"}
+          - {VERSION: "3.9", TOXENV: "pypi-readme"}
+          - {VERSION: "3.9", TOXENV: "flake8"}
+          - {VERSION: "3.9", TOXENV: "docs"}
     name: "${{ matrix.PYTHON.TOXENV }}"
     steps:
       - uses: actions/checkout@v2.4.0
@@ -38,6 +64,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 }}"

setup.py

@@ -93,7 +93,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"],

tox.ini

@@ -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