Merge pull request #4180 from GeotrekCE/move_from_env_file_to_dotenv

Move from `env_file` to `dotenv` (deprecated)

docs/changelog.rst

@@ -11,7 +11,12 @@ CHANGELOG
 
 **Documentation**
 
-- Add authors, creators and last_author columns in displayed lists views and exports 
+- Add authors, creators and last_author columns in displayed lists views and exports
+
+**Maintenance**
+
+- Replace deprecated `env_file` with `dotenv`
+
 
 2.109.0     (2024-08-08)
 ----------------------------

geotrek/settings/base.py

@@ -1,11 +1,10 @@
-import env_file
 import os
 import sys
 
+from django.conf.global_settings import LANGUAGES as LANGUAGES_LIST
 from django.contrib.gis.geos import fromstr
 from django.contrib.messages import constants as messages
-from django.conf.global_settings import LANGUAGES as LANGUAGES_LIST
-
+from dotenv import load_dotenv
 from easy_thumbnails.conf import Settings as easy_thumbnails_defaults
 
 from geotrek import __version__
@@ -33,7 +32,7 @@ def api_bbox(bbox, buffer):
 
 DOT_ENV_FILE = os.path.join(VAR_DIR, 'conf/env')
 if os.path.exists(DOT_ENV_FILE):
-    env_file.load(path=DOT_ENV_FILE)
+    load_dotenv(DOT_ENV_FILE)
 
 ALLOWED_HOSTS = os.getenv('SERVER_NAME', 'localhost').split(' ')
 ALLOWED_HOSTS = ['*' if host == '_' else host for host in ALLOWED_HOSTS]

requirements.txt

@@ -185,8 +185,6 @@ easy-thumbnails==2.8.5
     #   geotrek (setup.py)
     #   mapentity
     #   paperclip
-env-file==2020.12.3
-    # via geotrek (setup.py)
 filelock==3.15.4
     # via django-large-image
 fiona==1.9.4.post1
@@ -292,6 +290,8 @@ pyphen==0.11.0
     # via weasyprint
 python-dateutil==2.9.0.post0
     # via celery
+python-dotenv==1.0.0
+    # via geotrek (setup.py)
 python-magic==0.4.27
     # via paperclip
 pytz==2023.3.post1
@@ -369,8 +369,6 @@ urllib3==2.2.2
     # via
     #   requests
     #   sentry-sdk
-values==2020.12.3
-    # via env-file
 vine==5.1.0
     # via
     #   amqp

setup.py

@@ -35,7 +35,7 @@ def run(self):
         'chardet',
         'cairosvg',
         'cairocffi',
-        'env_file',
+        'python-dotenv',
         # pinned by requirements.txt
         'pymemcache',
         'coreschema',