Updates 2024 08 15 - v9.7.0 (#314)

* Update Cypress version * Update python dependencies and tweak docker config for improved performance
MRCIEU · Aug 15, 2024 · ea5b51b · ea5b51b
1 parent f55d627
commit ea5b51b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 13 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:8.0.36
+        image: mysql:8.0.39
         ports:
           - 3306:3306
         env:

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+9.7.0   Update Python packaging tools
+        Update Cypress
+        Update version of MySQL used in GitHub actions
+
 9.6.1   Update Python dependencies
 
 9.6.0   Apply Django security update

diff --git a/Jenkinsfile.dc2.demo b/Jenkinsfile.dc2.demo
@@ -16,7 +16,7 @@ pipeline {
         stage('Demo: Cypress tests') {
             agent {
                 docker {
-                    image 'cypress/included:13.12.0'
+                    image 'cypress/included:13.13.3'
                     args '--add-host app-dc2-tmpo-d0.epi.bris.ac.uk:172.26.10.141 --entrypoint=""'
                 }
             }

diff --git a/Jenkinsfile.dc2.prod b/Jenkinsfile.dc2.prod
@@ -17,7 +17,7 @@ pipeline {
         stage('Production: Cypress tests') {
             agent {
                 docker {
-                    image 'cypress/included:13.12.0'
+                    image 'cypress/included:13.13.3'
                     args '--add-host www.temmpo.org.uk:172.26.10.142 --entrypoint=""'
                 }
             }

diff --git a/Jenkinsfile.dc2.test b/Jenkinsfile.dc2.test
@@ -16,7 +16,7 @@ pipeline {
         stage('Test: Cypress tests') {
             agent {
                 docker {
-                    image 'cypress/included:13.12.0'
+                    image 'cypress/included:13.13.3'
                     args '--add-host app-dc2-tmpo-t0.epi.bris.ac.uk:172.26.10.143 --entrypoint=""'
                 }
             }

diff --git a/README.md b/README.md
@@ -212,7 +212,7 @@ NB: Some tests require these environment variables `CREDENTIALS_USR` and `CREDEN
 
 Using docker and electron browser
 
-    docker run --rm -it -v $PWD:/e2e -w /e2e cypress/included:13.12.0
+    docker run --rm -it -v $PWD:/e2e -w /e2e cypress/included:13.13.3
 
 ## Warnings
 

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -1,14 +1,12 @@
 FROM python:3.8.19-slim
 
-ARG REQUIREMENTS_FILE='requirements.txt'
-
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
-ENV PIP_VERSION='24.1.1'
-ENV SETUPTOOLS_VERSION='70.2.0'
+ENV PIP_VERSION='24.2'
+ENV SETUPTOOLS_VERSION='72.2.0'
 ENV PIP_TOOLS_VERSION='7.4.1'
 # NB: Version 15.1.0 is installed on RHEL
-ENV VE_VERSION='20.26.3' 
+ENV VE_VERSION='20.26.3'
 
 # Update system packages and install dependencies
 RUN apt update -y && \
@@ -49,6 +47,7 @@ WORKDIR /srv
 
 VOLUME [ "/srv" ]
 
+ARG REQUIREMENTS_FILE='requirements.txt'
 COPY requirements/$REQUIREMENTS_FILE /srv
 RUN pip install --no-deps -r /srv/$REQUIREMENTS_FILE
 

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 pip version in tests/build-test-env.sh and Dockerfile
-PIP_VERSION = '24.1.1'
-SETUPTOOLS_VERSION = '70.2.0'
+PIP_VERSION = '24.2'
+SETUPTOOLS_VERSION = '72.2.0'
 PIP_TOOLS_VERSION = '7.4.1'
 
 

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==24.1.1
+pip3 install -U pip==24.2
 pip3 -V
 
 echo "Install Fabric"