From 9ac457da116d7e491e389d691a1e2995edf6071f Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Fri, 6 Sep 2024 14:19:10 +0200
Subject: [PATCH 1/5] drop django 3.2 and add 5.1 in CI

---
 .github/workflows/python-test.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
index c899083..8394f60 100644
--- a/.github/workflows/python-test.yml
+++ b/.github/workflows/python-test.yml
@@ -21,17 +21,10 @@ jobs:
       POSTGRES_DB: ci_test
     strategy:
       matrix:
-        python-version: ['3.8', '3.11']
-        django-version: ['3.2.*', '4.2.*']
+        python-version: ['3.8', '3.12']
+        django-version: ['4.2.*', '5.1.*']
         psycopg: ['psycopg2-binary']
-        postgis-image: ['postgis/postgis:10-2.5', 'postgis/postgis:11-2.5', 'postgis/postgis:latest']
-        exclude:
-          - postgis-image: 'postgis/postgis:11-2.5'
-            django-version: '3.2.*'  # test only with 10-2.5 and latest
-          - postgis-image: 'postgis/postgis:10-2.5'
-            django-version: '4.2.*'  # Django 4.2 supports only postgres >= 12
-          - postgis-image: 'postgis/postgis:11-2.5'
-            django-version: '4.2.*'  # Django 4.2 supports only postgres >= 12
+        postgis-image: ['postgis/postgis:11-2.5', 'postgis/postgis:latest']
         include:
           - postgis-image: 'postgis/postgis:latest'
             django-version: '4.2.*'

From 6e73ca78fa459cf825a6c06bd0429075206dc57d Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Fri, 6 Sep 2024 14:22:55 +0200
Subject: [PATCH 2/5] drop django 3.2 and add 5.1 in CI

---
 .github/workflows/python-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
index 8394f60..de40633 100644
--- a/.github/workflows/python-test.yml
+++ b/.github/workflows/python-test.yml
@@ -24,11 +24,11 @@ jobs:
         python-version: ['3.8', '3.12']
         django-version: ['4.2.*', '5.1.*']
         psycopg: ['psycopg2-binary']
-        postgis-image: ['postgis/postgis:11-2.5', 'postgis/postgis:latest']
+        postgis-image: ['postgis/postgis:12-2.5', 'postgis/postgis:latest']
         include:
           - postgis-image: 'postgis/postgis:latest'
             django-version: '4.2.*'
-            python-version: '3.11'
+            python-version: '3.12'
             psycopg: ['psycopg-binary']
 
     services:

From a9e5fd51bc053419dfcdf32f9e1713673ec03ae1 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Fri, 6 Sep 2024 14:25:51 +0200
Subject: [PATCH 3/5] drop django 3.2 and add 5.1 in CI

---
 test_vectortiles/test_app/admin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test_vectortiles/test_app/admin.py b/test_vectortiles/test_app/admin.py
index f07652a..644f959 100644
--- a/test_vectortiles/test_app/admin.py
+++ b/test_vectortiles/test_app/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from django.contrib.gis.admin import OSMGeoAdmin
+from django.contrib.gis.admin import GISModelAdmin
 
 from test_vectortiles.test_app.models import (
     Feature,
@@ -10,7 +10,7 @@
 
 
 @admin.register(Feature)
-class FeatureAdmin(OSMGeoAdmin):
+class FeatureAdmin(GISModelAdmin):
     list_display = ("id", "name", "layer", "date")
     list_filter = ("layer", "date")
     search_fields = ("name",)
@@ -36,7 +36,7 @@ class FullDataLayerAdmin(admin.ModelAdmin):
 
 
 @admin.register(FullDataFeature)
-class FulDataFeatureAdmin(OSMGeoAdmin):
+class FulDataFeatureAdmin(GISModelAdmin):
     list_display = (
         "id",
         "layer",

From c1d66d844ec29b1e65cc05aa0102c8965c5096e6 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Fri, 6 Sep 2024 14:29:21 +0200
Subject: [PATCH 4/5] drop django 3.2 and add 5.1 in CI

---
 .github/workflows/python-test.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
index de40633..26b59e9 100644
--- a/.github/workflows/python-test.yml
+++ b/.github/workflows/python-test.yml
@@ -25,6 +25,13 @@ jobs:
         django-version: ['4.2.*', '5.1.*']
         psycopg: ['psycopg2-binary']
         postgis-image: ['postgis/postgis:12-2.5', 'postgis/postgis:latest']
+        exclude:
+          - python-version: '3.8'
+            django-version: '5.1.*'
+            postgis-image: 'postgis/postgis:12-2.5'
+          - python-version: '3.8'
+            django-version: '5.1.*'
+            postgis-image: 'postgis/postgis:latest'
         include:
           - postgis-image: 'postgis/postgis:latest'
             django-version: '4.2.*'

From 05714f59d50c2ecc16c949ff3b56e5975f775721 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Fri, 6 Sep 2024 14:33:08 +0200
Subject: [PATCH 5/5] drop django 3.2 and add 5.1 in CI

---
 .github/workflows/python-test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
index 26b59e9..1148406 100644
--- a/.github/workflows/python-test.yml
+++ b/.github/workflows/python-test.yml
@@ -29,6 +29,9 @@ jobs:
           - python-version: '3.8'
             django-version: '5.1.*'
             postgis-image: 'postgis/postgis:12-2.5'
+          - python-version: '3.12'
+            django-version: '5.1.*'
+            postgis-image: 'postgis/postgis:12-2.5'
           - python-version: '3.8'
             django-version: '5.1.*'
             postgis-image: 'postgis/postgis:latest'