drop python 3.6 support, minimum cryptography>=41.0.0 (#1221)

pyca · May 31, 2023 · 5134ca1 · 5134ca1
1 parent 0d603cb
commit 5134ca1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,6 @@ jobs:
       matrix:
         PYTHON:
           # Base builds
-          - {VERSION: "3.6", TOXENV: "py36", OS: "ubuntu-20.04" }
           - {VERSION: "3.7", TOXENV: "py37"}
           - {VERSION: "3.8", TOXENV: "py38"}
           - {VERSION: "3.9", TOXENV: "py39"}
@@ -28,7 +27,6 @@ jobs:
           - {VERSION: "pypy-3.8", TOXENV: "pypy3-cryptographyMain"}
           - {VERSION: "pypy-3.9", TOXENV: "pypy3-cryptographyMain"}
           # -cryptographyMinimum
-          - {VERSION: "3.6", TOXENV: "py36-cryptographyMinimum", OS: "ubuntu-20.04"}
           - {VERSION: "3.7", TOXENV: "py37-cryptographyMinimum"}
           - {VERSION: "3.8", TOXENV: "py38-cryptographyMinimum"}
           - {VERSION: "3.9", TOXENV: "py39-cryptographyMinimum"}
@@ -69,7 +67,6 @@ jobs:
     strategy:
       matrix:
         TEST:
-          - {CONTAINER: "ubuntu-bionic", TOXENV: "py36"}
           # cryptographyMain used since there's no wheel
           - {CONTAINER: "ubuntu-rolling", TOXENV: "py311-cryptographyMain"}
     name: "${{ matrix.TEST.TOXENV }} on ${{ matrix.TEST.CONTAINER }}"

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -10,6 +10,9 @@ The third digit is only for regressions.
 Backward-incompatible changes:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+- Dropped support for Python 3.6.
+- The minimum ``cryptography`` version is now 41.0.0.
+
 Deprecations:
 ^^^^^^^^^^^^^
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,4 +1,4 @@
 [tool.black]
 line-length = 79
-target-version = ["py36"]
+target-version = ["py37"]
 
diff --git a/setup.py b/setup.py
@@ -81,7 +81,6 @@ def find_meta(meta):
             "Operating System :: Microsoft :: Windows",
             "Operating System :: POSIX",
             "Programming Language :: Python :: 3",
-            "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
@@ -93,13 +92,11 @@ def find_meta(meta):
             "Topic :: Software Development :: Libraries :: Python Modules",
             "Topic :: System :: Networking",
         ],
-        python_requires=">=3.6",
+        python_requires=">=3.7",
         packages=find_packages(where="src"),
         package_dir={"": "src"},
         install_requires=[
-            # Fix cryptographyMinimum in tox.ini when changing this!
-            # 40.0.0 and .1 are missing X509_V_* constants that we re-export.
-            "cryptography>=38.0.0,<42,!=40.0.0,!=40.0.1",
+            "cryptography>=41.0.0,<42",
         ],
         extras_require={
             "test": ["flaky", "pretend", "pytest>=3.0.1"],

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{py,py3,36,37,38,39,310,311}{,-cryptographyMinimum}{,-useWheel}{,-randomorder},py311-twistedTrunk,check-manifest,flake8,py311-mypy,docs,coverage-report
+envlist = py{py,py3,37,38,39,310,311}{,-cryptographyMinimum}{,-useWheel}{,-randomorder},py311-twistedTrunk,check-manifest,flake8,py311-mypy,docs,coverage-report
 
 [testenv]
 allowlist_externals =