Merge pull request #1093 from ministryofjustice/ANPL-823-replace-djan…

…go-dotenv-with-python-dotenv ANPL-823 updated requirements.txt to lock in python-dotenv
ministryofjustice · Dec 7, 2022 · da0e248 · da0e248
2 parents ab8d751 + f52755f
commit da0e248
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -48,7 +48,6 @@ RUN pip install -U pip
 COPY requirements.txt requirements.dev.txt manage.py settings.yaml ./
 RUN pip install -U --no-cache-dir pip
 RUN pip install -r requirements.txt
-RUN pip uninstall python-dotenv -y
 
 # Re-enable dev packages
 RUN python3 -m venv --system-site-packages dev-packages \

diff --git a/doc/running.md b/doc/running.md
@@ -37,7 +37,6 @@ python3 -m venv venv
 source venv/bin/activate
 pip3 install -r requirements.txt
 pip3 install -r requirements.dev.txt
-pip3 uninstall python-dotenv    # see ANPL-823
 ```
 
 In addition, you must have:

diff --git a/manage.py b/manage.py
@@ -7,7 +7,7 @@
 from controlpanel.utils import load_app_conf_from_file
 
 if __name__ == '__main__':
-    dotenv.read_dotenv()
+    dotenv.load_dotenv()
 
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'controlpanel.settings')
 

diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,7 @@ channels==2.4.0
 channels-redis==3.3.1
 Django==3.2.15
 django-crequest==2018.5.11
-django-dotenv==1.4.2
+python-dotenv==0.21.0
 django-extensions==3.1.5
 django-filter==22.1
 django-prometheus==2.1.0
@@ -32,4 +32,4 @@ sentry-sdk==1.5.1
 slackclient==2.8.1
 urllib3==1.26.5
 uvicorn[standard]==0.17.5
-pyyaml==6.0
+pyyaml==6.0