Pending python dependency updates (#265)

* Python dependency updates * Update python packaging tools * Update version of MySQL used in GitHub actions to match deployment environment --------- Co-authored-by: asset-web <[email protected]> Co-authored-by: Tessa Alexander <[email protected]>
MRCIEU · Feb 14, 2024 · 04a9e46 · 04a9e46
1 parent 374287b
commit 04a9e46
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 49 deletions.
diff --git a/.github/workflows/run-django-test.yml b/.github/workflows/run-django-test.yml
@@ -18,7 +18,7 @@ jobs:
         ports:
           - 6379:6379
       db:
-        image: mysql:5.7
+        image: mysql:8.0.36
         ports:
           - 3306:3306
         env:

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -2,11 +2,11 @@ FROM python:3.8.18-slim
 
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
-ENV PIP_VERSION='23.3.1'
-ENV SETUPTOOLS_VERSION='68.2.2'
+ENV PIP_VERSION='24.0'
+ENV SETUPTOOLS_VERSION='69.1.0'
 ENV PIP_TOOLS_VERSION='7.3.0'
 # As per Centos installation
-ENV VE_VERSION='20.13.1'
+ENV VE_VERSION='20.24.5'
 
 # Update system packages and install dependencies
 RUN apt update -y && \

diff --git a/deploy/deploy-centos.sh b/deploy/deploy-centos.sh
@@ -60,12 +60,12 @@ mv ld_library.sh /etc/profile.d/ld_library.sh
 export set LD_LIBRARY_PATH=/usr/local/lib/
 
 # Install symtem wide python requirements
-pip3.8 install -U pip==22.0.2 # As per CI server
+pip3.8 install -U pip==19.3.1 # As per app servers
 pip3.8 install Fabric==1.15.0 # NB: v1.15.0 supports Python 2, & 3.6, 3.7, & 3.8
 
-pip3.8 install mod_wsgi==4.7.1 # As per app servers
+pip3.8 install mod_wsgi==4.9.4 # As per app servers
 ls /usr/local/lib64/python3.8/site-packages/mod_wsgi/server/
-pip3.8 install virtualenv==15.1.0 # As per app servers
+pip3.8 install virtualenv==20.24.5 # As per app servers
 
 ln -s /usr/local/bin/virtualenv /usr/bin/virtualenv-3.8
 

diff --git a/deploy/fabfile.py b/deploy/fabfile.py
@@ -21,8 +21,8 @@
 
 # Tools not handled by pip-tools and/or requirements installs using pip
 # Also update tests/build-test-env.sh
-PIP_VERSION = '23.3.2'
-SETUPTOOLS_VERSION = '69.0.3'
+PIP_VERSION = '24.0'
+SETUPTOOLS_VERSION = '69.1.0'
 PIP_TOOLS_VERSION = '7.3.0'
 
 

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -576,16 +576,16 @@ mysql-connector-python==8.3.0 \
     --hash=sha256:f4ee7e07cca6b744874d60d6b0b24817d9246eb4e8d7269b7ddbe68763a0bd13 \
     --hash=sha256:f7acacdf9fd4260702f360c00952ad9a9cc73e8b7475e0d0c973c085a3dd7b7d
     # via -r requirements/test.txt
-mysqlclient==2.2.3 \
-    --hash=sha256:2fa388cf076d3fee010d7094ca979fc8236988159c762becfea4d42cd56e6580 \
-    --hash=sha256:5a5451b3eea2a2a3316b2b432c89f25b1a28b986aa924a04aca659ad454e9a5f \
-    --hash=sha256:7d74de2fa08dc7483b5ec82e130fde6d965f53c9ac6bf678f6d6c362c952b8b6 \
-    --hash=sha256:8b34574bceb548ac94a31c8cc1f67d454f414e5dee240dd29ad0e09405756638 \
-    --hash=sha256:90164463c0bda46ebe9f8ca2b7ec502ff915ab1c23af54bdf60997fc4c59e47c \
-    --hash=sha256:a47d266820fb8da26582cddc98ded1546edc7a0def556b0ca8de4a1a7dd8505c \
-    --hash=sha256:c37a7f641fa2e0582bf6808851dc4b82736b61ccb39e1607e59dce797db3f6c5 \
-    --hash=sha256:c79740385d9df70606e87dade197c5fce5c0d22c0e5c40cd048cfa693daa0e7b \
-    --hash=sha256:ee51656e36fc5a92920b807ee8b9e373e3b0e267c89cdc95d73b1dbe46863631
+mysqlclient==2.2.4 \
+    --hash=sha256:329e4eec086a2336fe3541f1ce095d87a6f169d1cc8ba7b04ac68bcb234c9711 \
+    --hash=sha256:33bc9fb3464e7d7c10b1eaf7336c5ff8f2a3d3b88bab432116ad2490beb3bf41 \
+    --hash=sha256:3c318755e06df599338dad7625f884b8a71fcf322a9939ef78c9b3db93e1de7a \
+    --hash=sha256:4e80dcad884dd6e14949ac6daf769123223a52a6805345608bf49cdaf7bc8b3a \
+    --hash=sha256:9d3310295cb682232cadc28abd172f406c718b9ada41d2371259098ae37779d3 \
+    --hash=sha256:9d4c015480c4a6b2b1602eccd9846103fc70606244788d04aa14b31c4bd1f0e2 \
+    --hash=sha256:ac44777eab0a66c14cb0d38965572f762e193ec2e5c0723bcd11319cc5b693c5 \
+    --hash=sha256:d43987bb9626096a302ca6ddcdd81feaeca65ced1d5fe892a6a66b808326aa54 \
+    --hash=sha256:e1ebe3f41d152d7cb7c265349fdb7f1eca86ccb0ca24a90036cde48e00ceb2ab
     # via -r requirements/test.txt
 numexpr==2.8.6 \
     --hash=sha256:15469dc722b5ceb92324ec8635411355ebc702303db901ae8cc87f47c5e3a124 \
@@ -832,9 +832,9 @@ typing-extensions==4.9.0 \
     #   asgiref
     #   ipython
     #   selenium
-tzdata==2023.4 \
-    --hash=sha256:aa3ace4329eeacda5b7beb7ea08ece826c28d761cda36e747cfbf97996d39bf3 \
-    --hash=sha256:dd54c94f294765522c77399649b4fefd95522479a664a0cec87f41bebc6148c9
+tzdata==2024.1 \
+    --hash=sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd \
+    --hash=sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252
     # via
     #   -r requirements/test.txt
     #   pandas

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -326,16 +326,16 @@ mysql-connector-python==8.3.0 \
     --hash=sha256:f4ee7e07cca6b744874d60d6b0b24817d9246eb4e8d7269b7ddbe68763a0bd13 \
     --hash=sha256:f7acacdf9fd4260702f360c00952ad9a9cc73e8b7475e0d0c973c085a3dd7b7d
     # via -r requirements/requirements.in
-mysqlclient==2.2.3 \
-    --hash=sha256:2fa388cf076d3fee010d7094ca979fc8236988159c762becfea4d42cd56e6580 \
-    --hash=sha256:5a5451b3eea2a2a3316b2b432c89f25b1a28b986aa924a04aca659ad454e9a5f \
-    --hash=sha256:7d74de2fa08dc7483b5ec82e130fde6d965f53c9ac6bf678f6d6c362c952b8b6 \
-    --hash=sha256:8b34574bceb548ac94a31c8cc1f67d454f414e5dee240dd29ad0e09405756638 \
-    --hash=sha256:90164463c0bda46ebe9f8ca2b7ec502ff915ab1c23af54bdf60997fc4c59e47c \
-    --hash=sha256:a47d266820fb8da26582cddc98ded1546edc7a0def556b0ca8de4a1a7dd8505c \
-    --hash=sha256:c37a7f641fa2e0582bf6808851dc4b82736b61ccb39e1607e59dce797db3f6c5 \
-    --hash=sha256:c79740385d9df70606e87dade197c5fce5c0d22c0e5c40cd048cfa693daa0e7b \
-    --hash=sha256:ee51656e36fc5a92920b807ee8b9e373e3b0e267c89cdc95d73b1dbe46863631
+mysqlclient==2.2.4 \
+    --hash=sha256:329e4eec086a2336fe3541f1ce095d87a6f169d1cc8ba7b04ac68bcb234c9711 \
+    --hash=sha256:33bc9fb3464e7d7c10b1eaf7336c5ff8f2a3d3b88bab432116ad2490beb3bf41 \
+    --hash=sha256:3c318755e06df599338dad7625f884b8a71fcf322a9939ef78c9b3db93e1de7a \
+    --hash=sha256:4e80dcad884dd6e14949ac6daf769123223a52a6805345608bf49cdaf7bc8b3a \
+    --hash=sha256:9d3310295cb682232cadc28abd172f406c718b9ada41d2371259098ae37779d3 \
+    --hash=sha256:9d4c015480c4a6b2b1602eccd9846103fc70606244788d04aa14b31c4bd1f0e2 \
+    --hash=sha256:ac44777eab0a66c14cb0d38965572f762e193ec2e5c0723bcd11319cc5b693c5 \
+    --hash=sha256:d43987bb9626096a302ca6ddcdd81feaeca65ced1d5fe892a6a66b808326aa54 \
+    --hash=sha256:e1ebe3f41d152d7cb7c265349fdb7f1eca86ccb0ca24a90036cde48e00ceb2ab
     # via -r requirements/requirements.in
 numexpr==2.8.6 \
     --hash=sha256:15469dc722b5ceb92324ec8635411355ebc702303db901ae8cc87f47c5e3a124 \
@@ -472,9 +472,9 @@ typing-extensions==4.9.0 \
     --hash=sha256:23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783 \
     --hash=sha256:af72aea155e91adfc61c3ae9e0e342dbc0cba726d6cba4b6c72c1f34e47291cd
     # via asgiref
-tzdata==2023.4 \
-    --hash=sha256:aa3ace4329eeacda5b7beb7ea08ece826c28d761cda36e747cfbf97996d39bf3 \
-    --hash=sha256:dd54c94f294765522c77399649b4fefd95522479a664a0cec87f41bebc6148c9
+tzdata==2024.1 \
+    --hash=sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd \
+    --hash=sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252
     # via pandas
 unicodecsv==0.14.1 \
     --hash=sha256:018c08037d48649a0412063ff4eda26eaa81eff1546dbffa51fa5293276ff7fc

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -527,16 +527,16 @@ mysql-connector-python==8.3.0 \
     --hash=sha256:f4ee7e07cca6b744874d60d6b0b24817d9246eb4e8d7269b7ddbe68763a0bd13 \
     --hash=sha256:f7acacdf9fd4260702f360c00952ad9a9cc73e8b7475e0d0c973c085a3dd7b7d
     # via -r requirements/requirements.txt
-mysqlclient==2.2.3 \
-    --hash=sha256:2fa388cf076d3fee010d7094ca979fc8236988159c762becfea4d42cd56e6580 \
-    --hash=sha256:5a5451b3eea2a2a3316b2b432c89f25b1a28b986aa924a04aca659ad454e9a5f \
-    --hash=sha256:7d74de2fa08dc7483b5ec82e130fde6d965f53c9ac6bf678f6d6c362c952b8b6 \
-    --hash=sha256:8b34574bceb548ac94a31c8cc1f67d454f414e5dee240dd29ad0e09405756638 \
-    --hash=sha256:90164463c0bda46ebe9f8ca2b7ec502ff915ab1c23af54bdf60997fc4c59e47c \
-    --hash=sha256:a47d266820fb8da26582cddc98ded1546edc7a0def556b0ca8de4a1a7dd8505c \
-    --hash=sha256:c37a7f641fa2e0582bf6808851dc4b82736b61ccb39e1607e59dce797db3f6c5 \
-    --hash=sha256:c79740385d9df70606e87dade197c5fce5c0d22c0e5c40cd048cfa693daa0e7b \
-    --hash=sha256:ee51656e36fc5a92920b807ee8b9e373e3b0e267c89cdc95d73b1dbe46863631
+mysqlclient==2.2.4 \
+    --hash=sha256:329e4eec086a2336fe3541f1ce095d87a6f169d1cc8ba7b04ac68bcb234c9711 \
+    --hash=sha256:33bc9fb3464e7d7c10b1eaf7336c5ff8f2a3d3b88bab432116ad2490beb3bf41 \
+    --hash=sha256:3c318755e06df599338dad7625f884b8a71fcf322a9939ef78c9b3db93e1de7a \
+    --hash=sha256:4e80dcad884dd6e14949ac6daf769123223a52a6805345608bf49cdaf7bc8b3a \
+    --hash=sha256:9d3310295cb682232cadc28abd172f406c718b9ada41d2371259098ae37779d3 \
+    --hash=sha256:9d4c015480c4a6b2b1602eccd9846103fc70606244788d04aa14b31c4bd1f0e2 \
+    --hash=sha256:ac44777eab0a66c14cb0d38965572f762e193ec2e5c0723bcd11319cc5b693c5 \
+    --hash=sha256:d43987bb9626096a302ca6ddcdd81feaeca65ced1d5fe892a6a66b808326aa54 \
+    --hash=sha256:e1ebe3f41d152d7cb7c265349fdb7f1eca86ccb0ca24a90036cde48e00ceb2ab
     # via -r requirements/requirements.txt
 numexpr==2.8.6 \
     --hash=sha256:15469dc722b5ceb92324ec8635411355ebc702303db901ae8cc87f47c5e3a124 \
@@ -727,9 +727,9 @@ typing-extensions==4.9.0 \
     #   -r requirements/requirements.txt
     #   asgiref
     #   selenium
-tzdata==2023.4 \
-    --hash=sha256:aa3ace4329eeacda5b7beb7ea08ece826c28d761cda36e747cfbf97996d39bf3 \
-    --hash=sha256:dd54c94f294765522c77399649b4fefd95522479a664a0cec87f41bebc6148c9
+tzdata==2024.1 \
+    --hash=sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd \
+    --hash=sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252
     # via
     #   -r requirements/requirements.txt
     #   pandas

diff --git a/tests/build-test-env.sh b/tests/build-test-env.sh
@@ -24,7 +24,7 @@ mkdir -p var/tmp
 echo "Check the version of pip that is installed"
 pip3 -V
 echo "Ensure using a consistent version of pip as per on premises CI server"
-pip3 install -U pip==22.0.2
+pip3 install -U pip==24.0
 pip3 -V
 
 echo "Install Fabric"