Merge pull request #97 from kraken-tech/jamesbeith/update-project-constraints

Update project constraints

Author: jamesbeith

.github/workflows/tests.yaml

@@ -14,10 +14,11 @@ jobs:
     strategy:
       matrix:
         postgres-image:
-          - "postgres:13"
           - "postgres:14"
           - "postgres:15"
           - "postgres:16"
+          - "postgres:17"
+          - "postgres:18"
 
     services:
       postgres:
@@ -40,9 +41,11 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: |
-            3.12
-            3.11
             3.10
+            3.11
+            3.12
+            3.13
+            3.14
           cache: 'pip'
           cache-dependency-path: |
             pyproject.toml

noxfile.py

@@ -29,37 +29,46 @@ def temp_lock_file() -> Generator[IO[str], None, None]:
         yield f
 
 
-@nox.session()
+INCOMPATIBLE_PYTHON_DJANGO_VERSIONS = [
+    ("3.10", "6.0"),
+    ("3.11", "6.0"),
+]
+
+
+@nox.session(
+    python=[
+        "3.10",
+        "3.11",
+        "3.12",
+        "3.13",
+        "3.14",
+    ]
+)
 @nox.parametrize(
     "dependency_file",
     [
-        nox.param("pytest-in-nox-psycopg3", id="psycopg3"),
         nox.param("pytest-in-nox-psycopg2", id="psycopg2"),
+        nox.param("pytest-in-nox-psycopg3", id="psycopg3"),
     ],
 )
 @nox.parametrize(
-    "package_constraint",
-    [
-        nox.param("django>=4.2,<4.3", id="django=4.2.X"),
-        nox.param("django>=5.0,<5.1", id="django=5.0.X"),
-    ],
-)
-@nox.parametrize(
-    "python",
+    "django_version",
     [
-        nox.param("3.10", id="python=3.10"),
-        nox.param("3.11", id="python=3.11"),
-        nox.param("3.12", id="python=3.12"),
+        nox.param("5.2", id="django~=5.2"),
+        nox.param("6.0", id="django~=6.0"),
     ],
 )
-def tests(session: nox.Session, package_constraint: str, dependency_file: str) -> None:
+def tests(session: nox.Session, django_version: str, dependency_file: str) -> None:
     """
     Run the test suite.
     """
+    if (session.python, django_version) in INCOMPATIBLE_PYTHON_DJANGO_VERSIONS:
+        session.skip()
+
     with temp_constraints_file() as constraints_file, temp_lock_file() as lock_file:
         # Create a constraints file with the parameterized package versions.
         # It's easy to add more constraints here if needed.
-        constraints_file.write(f"{package_constraint}\n")
+        constraints_file.write(f"django~={django_version}\n")
         constraints_file.flush()
 
         # Compile a new development lock file with the additional package

pyproject.toml

@@ -37,6 +37,8 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Typing :: Typed",
 ]
 
@@ -77,7 +79,7 @@ dev = [
     # Testing
     "django_pg_migration_tools[pytest-in-nox-psycopg3]",
     "django_pg_migration_tools[docs]",
-    "django>=4.2.0",  # Django is needed for `make test`, but not for `nox`.
+    "django>=5.2.8",  # Django is needed for `make test`, but not for `nox`.
 
     # Linting
     "ruff>=0.5.2",

tests/example_app/settings.py

@@ -22,3 +22,5 @@
     "django_pg_migration_tools",
 ]
 USE_TZ = True
+
+DEFAULT_AUTO_FIELD: str = "django.db.models.AutoField"