fix cg qualifiers

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
         os: [ ubuntu-latest ]
         python-version: [ "3.8", "3.9", "3.10", "3.11" ]
         django-version: [ "3.2", "4.2" ]
-        cryptography-version: [ "41" ]
+        cryptography-version: [ "41.0" ]
 
     env:
       DJANGO_CA_SECRET_KEY: dummy

README.md

@@ -26,7 +26,7 @@ Documentation is available at https://django-ca.readthedocs.org/.
 3. Certificate issuance via ACMEv2, command line or web interface.
 4. Management via command line and/or via Django's admin interface.
 5. Get email notifications about certificates about to expire.
-6. Written in Python 3.8+, Django 3.2+ and cryptography 41+.
+6. Written in Python 3.8+, Django 3.2+ and cryptography 41.0+.
 
 Please see https://django-ca.readthedocs.org for more extensive documentation.
 

devscripts/config.py

@@ -40,11 +40,6 @@ def minor_to_major(version: str) -> str:
     return ".".join(version.split(".", 2)[:2])
 
 
-def cryptography_major_version(version: str) -> str:
-    """Get the major version of cryptography (where only the major release is relevant)."""
-    return version.split(".")[0]
-
-
 def get_project_config() -> Dict[str, Any]:
     """Get project configuration from pyproject.toml."""
     # PYLINT NOTE: lazy import so that just importing this module has no external dependencies
@@ -63,7 +58,7 @@ def get_project_config() -> Dict[str, Any]:
     cfg["django-map"] = {minor_to_major(djver): djver for djver in cfg["django"]}
     cfg["django-major"] = [minor_to_major(djver) for djver in cfg["django"]]
     cfg["cryptography-map"] = {minor_to_major(cgver): cgver for cgver in cfg["cryptography"]}
-    cfg["cryptography-major"] = [cryptography_major_version(cgver) for cgver in cfg["cryptography"]]
+    cfg["cryptography-major"] = [minor_to_major(cgver) for cgver in cfg["cryptography"]]
     cfg["acme-map"] = {minor_to_major(acmever): acmever for acmever in cfg["acme"]}
     cfg["acme-major"] = [minor_to_major(acmever) for acmever in cfg["acme"]]
 

docs/source/intro.rst

@@ -11,6 +11,6 @@ Features:
 #. Certificate issuance via ACMEv2, command line, web interface or REST API.
 #. Management via command line and/or via Django's admin interface.
 #. Get email notifications about certificates about to expire.
-#. Written in Python 3.8+, Django 3.2+ and cryptography 41+.
+#. Written in Python 3.8+, Django 3.2+ and cryptography 41.0+.
 
 Please see https://django-ca.readthedocs.org for the most recent documentation.

pyproject.toml

@@ -90,7 +90,7 @@ dependencies = [
     "Django>=3.2,!=4.0.*,!=4.1.*",
     "acme>=2.6.0",
     "asn1crypto>=1.5",
-    "cryptography>=41",
+    "cryptography>=41.0",
     "django-object-actions>=4.0.0",
     "dnspython>=2.3",
     "idna>=3.2",

requirements/requirements-mypy.txt

@@ -1,8 +1,5 @@
 -r requirements-dev-common.txt
-django-stubs==4.2.3
 -r requirements-test.txt
-# mypy==1.5.0 breaks django-stubs==4.2.3:
-#   https://github.com/typeddjango/django-stubs/issues/1648
 mypy==1.5.1
 django-stubs==4.2.4
 types-docutils==0.20.0.3

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist = pylint,docs,lint,mypy,demo,dist-test
-          py{38,39,310,311}-dj{3.2,4.2}-cg{41}-acme{2.6}
+          py{38,39,310,311}-dj{3.2,4.2}-cg{41.0}-acme{2.6}
 
 [testenv]
 skipsdist = True
@@ -9,7 +9,7 @@ deps =
     -r requirements/requirements-test.txt
     dj3.2: Django~=3.2
     dj4.2: Django~=4.2
-    cg41: cryptography~=41
+    cg41.0: cryptography~=41.0
     acme2.6: acme~=2.6
 setenv =
     COVERAGE_FILE = {envdir}/.coverage