Apply Django security update; Update Python dependencies and packagin…

…g tools
MRCIEU · Jan 14, 2025 · 047af32 · 047af32
1 parent 2bfbdf2
commit 047af32
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 # Changelog
 
+9.7.2   Apply Django security update
+        Update Python dependencies and packaging tools
+
 9.7.1   Update version of virtualenv used in testing
         Run tests in parallel
 

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -3,7 +3,7 @@ FROM python:3.12.8-slim
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 ENV PIP_VERSION='24.3.1'
-ENV SETUPTOOLS_VERSION='75.6.0'
+ENV SETUPTOOLS_VERSION='75.8.0'
 ENV PIP_TOOLS_VERSION='7.4.1'
 # NB: Version 15.1.0 is installed on RHEL
 ENV VE_VERSION='20.24.5'

diff --git a/deploy/Dockerfile-rhel b/deploy/Dockerfile-rhel
@@ -47,7 +47,7 @@ RUN yum update -y && \
             zip
 
 ENV PIP_VERSION='24.3.1'
-ENV SETUPTOOLS_VERSION='75.6.0'
+ENV SETUPTOOLS_VERSION='75.8.0'
 ENV PIP_TOOLS_VERSION='7.4.1'
 ENV VE_VERSION='20.24.5'
 ENV FABRIC_VERSION='1.15.0'

diff --git a/deploy/fabfile.py b/deploy/fabfile.py
@@ -19,7 +19,7 @@
 # Tools not handled by pip-tools and/or requirements installs using pip
 # Also update pip version in tests/build-test-env.sh and Dockerfile
 PIP_VERSION = '24.3.1'
-SETUPTOOLS_VERSION = '75.6.0'
+SETUPTOOLS_VERSION = '75.8.0'
 PIP_TOOLS_VERSION = '7.4.1'
 
 

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -247,9 +247,9 @@ decorator==5.1.1 \
     --hash=sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 \
     --hash=sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186
     # via ipython
-django==4.2.17 \
-    --hash=sha256:3a93350214ba25f178d4045c0786c61573e7dbfa3c509b3551374f1e11ba8de0 \
-    --hash=sha256:6b56d834cc94c8b21a8f4e775064896be3b4a4ca387f2612d4406a5927cd2fdc
+django==4.2.18 \
+    --hash=sha256:52ae8eacf635617c0f13b44f749e5ea13dc34262819b2cc8c8636abb08d82c4b \
+    --hash=sha256:ba52eff7e228f1c775d5b0db2ba53d8c49d2f8bfe6ca0234df6b7dd12fb25b19
     # via
     #   -r /srv/requirements/test.txt
     #   django-autocomplete-light

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -56,9 +56,9 @@ click==8.1.8 \
     --hash=sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2 \
     --hash=sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a
     # via rq
-django==4.2.17 \
-    --hash=sha256:3a93350214ba25f178d4045c0786c61573e7dbfa3c509b3551374f1e11ba8de0 \
-    --hash=sha256:6b56d834cc94c8b21a8f4e775064896be3b4a4ca387f2612d4406a5927cd2fdc
+django==4.2.18 \
+    --hash=sha256:52ae8eacf635617c0f13b44f749e5ea13dc34262819b2cc8c8636abb08d82c4b \
+    --hash=sha256:ba52eff7e228f1c775d5b0db2ba53d8c49d2f8bfe6ca0234df6b7dd12fb25b19
     # via
     #   -r requirements/requirements.in
     #   django-autocomplete-light

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -235,9 +235,9 @@ coverage==7.6.10 \
 csvvalidator==1.2 \
     --hash=sha256:f1f222993589f9d8f8d83088d0bf80475462e5fa848baf920d0c03c03690c37e
     # via -r requirements/test.in
-django==4.2.17 \
-    --hash=sha256:3a93350214ba25f178d4045c0786c61573e7dbfa3c509b3551374f1e11ba8de0 \
-    --hash=sha256:6b56d834cc94c8b21a8f4e775064896be3b4a4ca387f2612d4406a5927cd2fdc
+django==4.2.18 \
+    --hash=sha256:52ae8eacf635617c0f13b44f749e5ea13dc34262819b2cc8c8636abb08d82c4b \
+    --hash=sha256:ba52eff7e228f1c775d5b0db2ba53d8c49d2f8bfe6ca0234df6b7dd12fb25b19
     # via
     #   -r /srv/requirements/requirements.txt
     #   django-autocomplete-light