From 415054df3974bf343c927497f4d8a2da4b3f66fb Mon Sep 17 00:00:00 2001 From: J-E Castagnede Date: Sun, 23 Feb 2025 21:35:24 +0100 Subject: [PATCH 1/4] replace deprecated coe --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d59224c37a..152bc6cb32 100644 --- a/requirements.txt +++ b/requirements.txt @@ -236,7 +236,7 @@ lxml==4.9.3 # via # mapentity # svglib -mapentity==8.12.0 +mapentity @ git+https://github.com/makinacorpus/django-mapentity.git@django_5.2 # via geotrek (setup.py) markdown==3.7 # via geotrek (setup.py) From b1d16eb4ddeb32dde34f5e97ce0b3d689b37ab96 Mon Sep 17 00:00:00 2001 From: J-E Castagnede Date: Sun, 23 Feb 2025 21:51:04 +0100 Subject: [PATCH 2/4] fix deps --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 152bc6cb32..e40e28c208 100644 --- 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 @ git+https://github.com/makinacorpus/django-mapentity.git@django_5.2 +mapentity==8.12.0 # via geotrek (setup.py) markdown==3.7 # via geotrek (setup.py) From 593b957a9688c60614049a72a3b57a1254baaa33 Mon Sep 17 00:00:00 2001 From: J-E Castagnede Date: Sun, 23 Feb 2025 21:51:39 +0100 Subject: [PATCH 3/4] fix deps --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e40e28c208..d59224c37a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -93,7 +93,7 @@ datetime==5.5 # via appy defusedxml==0.7.1 # via cairosvg -django==5.2b1 +django==4.2.19 # via # crispy-bootstrap4 # django-appconf From 69cab2100ca3b462e203bd8b5486da655a573f48 Mon Sep 17 00:00:00 2001 From: J-E Castagnede Date: Sun, 23 Feb 2025 22:53:40 +0100 Subject: [PATCH 4/4] adapt code for django 5.2 --- .github/workflows/test.yml | 6 +++--- dev-requirements.txt | 2 +- docker-compose.yml | 2 +- geotrek/core/tests/test_path_split.py | 16 +++++++--------- requirements.txt | 4 ++-- setup.py | 2 +- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d0e2a86808..b646da2322 100644 --- 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 index 5156b45fe3..f0a064e809 100644 --- 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 index b65ad29051..7cac1e40ed 100644 --- 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 index 04172c34b7..95cc3bb3d7 100644 --- 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 index d59224c37a..01b5bc52d7 100644 --- 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 index 3cf2a74a47..352d116e04 100644 --- 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',