From b6b1468e22dd5b025b4f3aab0dd7798e2e16dc8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 04:20:44 +0000
Subject: [PATCH 1/4] Bump djangorestframework-gis from 1.0 to 1.1

Bumps [djangorestframework-gis](https://github.com/openwisp/django-rest-framework-gis) from 1.0 to 1.1.
- [Release notes](https://github.com/openwisp/django-rest-framework-gis/releases)
- [Changelog](https://github.com/openwisp/django-rest-framework-gis/blob/master/CHANGES.rst)
- [Commits](https://github.com/openwisp/django-rest-framework-gis/compare/v1.0.0...v1.1.0)

---
updated-dependencies:
- dependency-name: djangorestframework-gis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index fae44b4da3..5f265ec421 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -176,7 +176,7 @@ djangorestframework==3.15.2
     #   mapentity
 djangorestframework-datatables==0.7.2
     # via mapentity
-djangorestframework-gis==1.0
+djangorestframework-gis==1.1
     # via mapentity
 docutils==0.20.1
     # via geotrek (setup.py)

From ea6595ddf8a016d1a2780ed6538004711cbc5978 Mon Sep 17 00:00:00 2001
From: Jean-Etienne Castagnede <j.e.castagnede@gmail.com>
Date: Mon, 20 Jan 2025 13:41:16 +0000
Subject: [PATCH 2/4] fix deps

---
 requirements.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5f265ec421..4c949646d1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -177,7 +177,9 @@ djangorestframework==3.15.2
 djangorestframework-datatables==0.7.2
     # via mapentity
 djangorestframework-gis==1.1
-    # via mapentity
+    # via
+    #   djangorestframework-gis
+    #   mapentity
 docutils==0.20.1
     # via geotrek (setup.py)
 drf-dynamic-fields==0.4.0

From c26d07a53c7d0dbbc3a4a930eeb7f79f4fdf205a Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Tue, 28 Jan 2025 13:34:39 +0100
Subject: [PATCH 3/4] fix deps

---
 docker-compose.yml         | 4 ++--
 geotrek/api/v2/viewsets.py | 2 +-
 requirements.txt           | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1f1eea41e3..a2434ef289 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,8 +18,8 @@ services:
     image: postgis/postgis:12-2.5
     env_file:
       - .env
-    ports:
-      - "${POSTGRES_LOCAL_PORT:-5432}:5432"
+    #ports:
+     # - "${POSTGRES_LOCAL_PORT:-5432}:5432"
     volumes:
       - postgres:/var/lib/postgresql/data
 
diff --git a/geotrek/api/v2/viewsets.py b/geotrek/api/v2/viewsets.py
index 2f43c4205c..be8c451066 100644
--- a/geotrek/api/v2/viewsets.py
+++ b/geotrek/api/v2/viewsets.py
@@ -1,4 +1,4 @@
-from hashlib import md5
+²²²²²²²from hashlib import md5
 
 from django.conf import settings
 from django_filters.rest_framework.backends import DjangoFilterBackend
diff --git a/requirements.txt b/requirements.txt
index 4c949646d1..a43a2eb206 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -145,7 +145,9 @@ django-embed-video==1.4.10
 django-extended-choices==1.3.3
     # via geotrek (setup.py)
 django-filter==24.3
-    # via mapentity
+    # via
+    #   djangorestframework-gis
+    #   mapentity
 django-js-asset==2.2.0
     # via django-mptt
 django-large-image==0.8.1
@@ -177,9 +179,7 @@ djangorestframework==3.15.2
 djangorestframework-datatables==0.7.2
     # via mapentity
 djangorestframework-gis==1.1
-    # via
-    #   djangorestframework-gis
-    #   mapentity
+    # via mapentity
 docutils==0.20.1
     # via geotrek (setup.py)
 drf-dynamic-fields==0.4.0

From e45f5b4e579139a8bbce2d28b34c2346cb7a74a6 Mon Sep 17 00:00:00 2001
From: Jean-Etienne Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 29 Jan 2025 14:09:54 +0100
Subject: [PATCH 4/4] Apply suggestions from code review

---
 docker-compose.yml         | 4 ++--
 geotrek/api/v2/viewsets.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a2434ef289..1f1eea41e3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,8 +18,8 @@ services:
     image: postgis/postgis:12-2.5
     env_file:
       - .env
-    #ports:
-     # - "${POSTGRES_LOCAL_PORT:-5432}:5432"
+    ports:
+      - "${POSTGRES_LOCAL_PORT:-5432}:5432"
     volumes:
       - postgres:/var/lib/postgresql/data
 
diff --git a/geotrek/api/v2/viewsets.py b/geotrek/api/v2/viewsets.py
index be8c451066..2f43c4205c 100644
--- a/geotrek/api/v2/viewsets.py
+++ b/geotrek/api/v2/viewsets.py
@@ -1,4 +1,4 @@
-²²²²²²²from hashlib import md5
+from hashlib import md5
 
 from django.conf import settings
 from django_filters.rest_framework.backends import DjangoFilterBackend