adapt code for django 5.2

GeotrekCE · Feb 23, 2025 · 69cab21 · 69cab21
1 parent 593b957
commit 69cab21
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 17 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -60,7 +60,7 @@ jobs:
 
     services:
       postgres:
-        image: pgrouting/pgrouting:12-3.0-3.0.0
+        image: pgrouting/pgrouting:14-3.5-3.7
         env:
           POSTGRES_DB: ci_test
           POSTGRES_PASSWORD: ci_test
@@ -265,7 +265,7 @@ jobs:
 
     services:
       postgres:
-        image: pgrouting/pgrouting:12-3.0-3.0.0
+        image: pgrouting/pgrouting:14-3.5-3.7
         env:
           POSTGRES_DB: ci_test
           POSTGRES_PASSWORD: ci_test
@@ -347,7 +347,7 @@ jobs:
 
     services:
       postgres:
-        image: pgrouting/pgrouting:12-3.0-3.0.0
+        image: pgrouting/pgrouting:14-3.5-3.7
         env:
           POSTGRES_DB: ci_test
           POSTGRES_PASSWORD: ci_test

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -16,7 +16,7 @@ click==8.1.8
     #   pip-tools
 coverage==7.6.12
     # via -r dev-requirements.in
-django==4.2.19
+django==5.2b1
     # via
     #   -c requirements.txt
     #   django-debug-toolbar

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,7 +15,7 @@ x-images:
 
 services:
   postgres:
-    image: ${POSTGRES_IMAGE:-pgrouting/pgrouting:12-3.0-3.0.0}
+    image: ${POSTGRES_IMAGE:-pgrouting/pgrouting:14-3.5-3.7}
     env_file:
       - .env
     ports:

diff --git a/geotrek/core/tests/test_path_split.py b/geotrek/core/tests/test_path_split.py
@@ -276,15 +276,13 @@ def test_split_particular_postgis_sucks(self):
             -----+----+ B
                  D
         """
-        ab = PathFactory.create(name="AB", geom=LineString((906922.77594628, 6711339.34379721),
-                                                           (906617.646677858, 6711323.89299994),
-                                                           (906644.49103274, 6711165.20449349),
-                                                           (906820.790930756, 6711164.88630011),
-                                                           (906924.174901373, 6711168.48416289)))
-        cd = PathFactory.create(name="CD", geom=LineString((906787.523777861, 6711332.49504801),
-                                                           (906801.0012688, 6711164.92201732)))
-        ab.reload()
-        cd.reload()
+        PathFactory.create(name="AB", geom=LineString((906922.77594628, 6711339.34379721),
+                                                      (906617.646677858, 6711323.89299994),
+                                                      (906644.49103274, 6711165.20449349),
+                                                      (906820.790930756, 6711164.88630011),
+                                                      (906924.174901373, 6711168.48416289)))
+        PathFactory.create(name="CD", geom=LineString((906787.523777861, 6711332.49504801),
+                                                      (906801.0012688, 6711164.92201732)))
         self.assertEqual(len(Path.objects.all()), 4)
 
     def test_split_multiple(self):

diff --git a/requirements.txt b/requirements.txt
@@ -93,7 +93,7 @@ datetime==5.5
     # via appy
 defusedxml==0.7.1
     # via cairosvg
-django==4.2.19
+django==5.2b1
     # via
     #   crispy-bootstrap4
     #   django-appconf
@@ -236,7 +236,7 @@ lxml==4.9.3
     # via
     #   mapentity
     #   svglib
-mapentity==8.12.0
+mapentity @ git+https://github.com/makinacorpus/django-mapentity.git@master
     # via geotrek (setup.py)
 markdown==3.7
     # via geotrek (setup.py)

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
     description="Geotrek",
     scripts=['manage.py'],
     install_requires=[
-        'Django==4.2.*',
+        'Django==5.2b1',
         'mapentity',
         'chardet',
         'cairosvg',