Merge pull request #50 from submarcos/drop_3.2_add_5.1

Drop django 3.2 and add 5.1 in CI
submarcos · Sep 6, 2024 · 8fc9fc5 · 8fc9fc5
2 parents 2a8f9c4 + 05714f5
commit 8fc9fc5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
@@ -21,21 +21,24 @@ 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']
+        postgis-image: ['postgis/postgis:12-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
+          - 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'
         include:
           - postgis-image: 'postgis/postgis:latest'
             django-version: '4.2.*'
-            python-version: '3.11'
+            python-version: '3.12'
             psycopg: ['psycopg-binary']
 
     services:

diff --git 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",