Removing py3.8 from test runs and separating out 3.13 due to Django version compatibility

Author: abeed-avayu

.github/workflows/test.yml

@@ -84,8 +84,7 @@ jobs:
             - python-version: '3.12'
               database: psycopg3
             - python-version: '3.13'
-              # psycopg installs version 3+; psycopg3 not found via pip in python 3.13
-              database: psycopg
+              database: psycopg3
 
     services:
       postgres:

docs/changes.rst

@@ -4,8 +4,8 @@ Change log
 Pending
 -------
 
-* Added support for Python 3.13 to the CI matrix.
-* Removed support for Python 3.8 as it is end of life.
+* Added Python 3.13 to the CI matrix.
+* Removed support for Python 3.8 as it has reached end of life.
 
 5.0.0-alpha (2024-09-01)
 ------------------------

pyproject.toml

@@ -29,7 +29,6 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
-  "Programming Language :: Python :: 3.13",
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dynamic = [

tox.ini

@@ -5,7 +5,7 @@ envlist =
     packaging
     py{39,310,311,312}-dj{42}-{sqlite,postgresql,postgis,mysql}
     py{310,311,312}-dj{42,50,51,main}-{sqlite,postgresql,psycopg3,postgis,mysql}
-    py{313}-dj{51,main}-{sqlite,postgresql,psycopg3,postgis,mysql}
+    py{313}-dj{51,main}-{sqlite,psycopg3,mysql}
 
 [testenv]
 deps =
@@ -16,6 +16,7 @@ deps =
     postgresql: psycopg2-binary
     psycopg3: psycopg[binary]
     postgis: psycopg2-binary
+    postgis3: psycopg[binary]
     mysql: mysqlclient
     coverage[toml]
     Jinja2
@@ -50,33 +51,62 @@ pip_pre = True
 commands = python -b -W always -m coverage run -m django test -v2 {posargs:tests}
 
 
-[testenv:py{38,39,310,311,312,313}-dj{42,50,51,main}-{postgresql,psycopg3}]
+[testenv:py{39,310,311,312}-dj{42,50,51,main}-{postgresql,psycopg3}]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = postgresql
     DB_PORT = {env:DB_PORT:5432}
 
 
-[testenv:py{38,39,310,311,312,313}-dj{42,50,51,main}-postgis]
+[testenv:py{39,310,311,312}-dj{42,50,51,main}-postgis]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = postgis
     DB_PORT = {env:DB_PORT:5432}
 
 
-[testenv:py{38,39,310,311,312,313}-dj{42,50,51,main}-mysql]
+[testenv:py{39,310,311,312}-dj{42,50,51,main}-mysql]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = mysql
     DB_PORT = {env:DB_PORT:3306}
 
 
-[testenv:py{38,39,310,311,312,313}-dj{42,50,51,main}-sqlite]
+[testenv:py{39,310,311,312}-dj{42,50,51,main}-sqlite]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = sqlite3
     DB_NAME = ":memory:"
 
+
+[testenv:py313-dj{51,main}-psycopg3]
+setenv =
+    {[testenv]setenv}
+    DB_BACKEND = postgresql
+    DB_PORT = {env:DB_PORT:5432}
+
+
+[testenv:py313-dj{51,main}-postgis3]
+setenv =
+    {[testenv]setenv}
+    DB_BACKEND = postgis
+    DB_PORT = {env:DB_PORT:5432}
+
+
+[testenv:py313-dj{51,main}-mysql]
+setenv =
+    {[testenv]setenv}
+    DB_BACKEND = mysql
+    DB_PORT = {env:DB_PORT:3306}
+
+
+[testenv:py313-dj{51,main}-sqlite]
+setenv =
+    {[testenv]setenv}
+    DB_BACKEND = sqlite3
+    DB_NAME = ":memory:"
+
+
 [testenv:docs]
 commands = make -C {toxinidir}/docs {posargs:spelling}
 deps =
@@ -105,7 +135,7 @@ python =
 DB_BACKEND =
     mysql: mysql
     postgresql: postgresql
-    psycopg: psycopg
     psycopg3: psycopg3
     postgis: postgis
+    postgis3: postgis3
     sqlite3: sqlite