Update test matrix to latest version of django, postgres and `mar…

…iadb` (#701) * Remove end-of-life django 4.1 from test matrix * Remove end-of-life postgres 11 from test matrix * Remove TODO now that Django 4.2.8 is released * Test against oldest and newest supported postgres releases * Remove end-of-life mariadb 10.3 * Test against newer mariadb releases * Use newer mariadb ping command
jazzband · Jan 23, 2024 · 68fb1b5 · 68fb1b5
1 parent 3a58bef
commit 68fb1b5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 36 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,23 +10,17 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
-        django-version: ['3.2', '4.1', '4.2', '5.0', 'main']
-        postgres-version: ['11', '12']
-        mariadb-version: ['10.3', '10.4']
+        django-version: ['3.2', '4.2', '5.0', 'main']
+        postgres-version: ['12', '16']
+        mariadb-version: ['10.6', '10.11', '11.2']
         exclude:
           # Django <=4.0 doesn't support python 3.11 (https://docs.djangoproject.com/en/4.1/faq/install/)
           - python-version: '3.11'
             django-version: '3.2'
           - python-version: '3.12'
             django-version: '3.2'
 
-          # Django <=4.2.7 doesn't support python 3.12 (https://docs.djangoproject.com/en/4.1/faq/install/)
-          - python-version: '3.12'
-            django-version: '4.1'
-          - python-version: '3.12'  # TODO remove this once Django 4.2.8 is released
-            django-version: '4.2'
-
-          # Django 5.0 doesn't support python <=3.9k (https://docs.djangoproject.com/en/5.0/faq/install/)
+          # Django 5.0 doesn't support python <=3.9 (https://docs.djangoproject.com/en/5.0/faq/install/)
           - python-version: '3.8'
             django-version: '5.0'
           - python-version: '3.9'
@@ -38,26 +32,6 @@ jobs:
           - django-version: '3.2'
             mariadb-version: '10.4'
 
-          - django-version: '4.1'
-            postgres-version: '12'
-          - django-version: '4.1'
-            mariadb-version: '10.4'
-
-          - django-version: '4.2'
-            postgres-version: '11'
-          - django-version: '4.2'
-            mariadb-version: '10.3'
-
-          - django-version: '5.0'
-            postgres-version: '11'
-          - django-version: '5.0'
-            mariadb-version: '10.3'
-
-          - django-version: 'main'
-            postgres-version: '11'
-          - django-version: 'main'
-            mariadb-version: '10.3'
-
     services:
       postgres:
         image: postgres:${{ matrix.postgres-version }}
@@ -79,7 +53,7 @@ jobs:
           MYSQL_ROOT_PASSWORD: mysql
           MYSQL_DATABASE: mysql
         options: >-
-          --health-cmd "mysqladmin ping"
+          --health-cmd "mariadb-admin ping"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ Silk is a live profiling and inspection tool for the Django framework. Silk inte
 
 Silk has been tested with:
 
-* Django: 3.2, 4.1, 4.2, 5.0
+* Django: 3.2, 4.2, 5.0
 * Python: 3.8, 3.9, 3.10, 3.11, 3.12
 
 ## Installation

diff --git a/docs/index.rst b/docs/index.rst
@@ -57,5 +57,5 @@ Features
 Requirements
 ------------
 
-* Django: 3.2, 4.1, 4.2, 5.0
+* Django: 3.2, 4.2, 5.0
 * Python: 3.8, 3.9, 3.10
diff --git a/setup.py b/setup.py
@@ -22,7 +22,6 @@
         'Environment :: Web Environment',
         'Framework :: Django',
         'Framework :: Django :: 3.2',
-        'Framework :: Django :: 4.1',
         'Framework :: Django :: 4.2',
         'Framework :: Django :: 5.0',
         'Intended Audience :: Developers',

diff --git a/tox.ini b/tox.ini
@@ -9,7 +9,6 @@ python =
 [gh-actions:env]
 DJANGO =
     3.2: dj32
-    4.1: dj41
     4.2: dj42
     5.0: dj50
     main: djmain
@@ -30,7 +29,6 @@ deps =
     mysql: mysqlclient
     postgresql: psycopg2-binary
     dj32: django>=3.2,<3.3
-    dj41: django>=4.1,<4.2
     dj42: django>=4.2,<4.3
     dj50: django>=5.0,<5.1
     djmain: https://github.com/django/django/archive/main.tar.gz