Update Cypress; Update Python packaging tool

Author: asset-web

CHANGELOG

@@ -1,5 +1,8 @@
 # Changelog
 
+9.7.4   Update Cypress
+        Update Python dependencies and packaging tools
+
 9.7.3   Update Python dependencies and packaging tools
 
 9.7.2   Apply Django security update

Jenkinsfile.dc2.demo

@@ -16,7 +16,7 @@ pipeline {
         stage('Demo: Cypress tests') {
             agent {
                 docker {
-                    image 'cypress/included:13.17.0'
+                    image 'cypress/included:14.1.0'
                     args '--add-host app-dc2-tmpo-d0.epi.bris.ac.uk:172.26.10.141 --entrypoint=""'
                 }
             }

Jenkinsfile.dc2.prod

@@ -17,7 +17,7 @@ pipeline {
         stage('Production: Cypress tests') {
             agent {
                 docker {
-                    image 'cypress/included:13.17.0'
+                    image 'cypress/included:14.1.0'
                     args '--add-host www.temmpo.org.uk:172.26.10.142 --entrypoint=""'
                 }
             }

Jenkinsfile.dc2.test

@@ -16,7 +16,7 @@ pipeline {
         stage('Test: Cypress tests') {
             agent {
                 docker {
-                    image 'cypress/included:13.17.0'
+                    image 'cypress/included:14.1.0'
                     args '--add-host app-dc2-tmpo-t0.epi.bris.ac.uk:172.26.10.143 --entrypoint=""'
                 }
             }

README.md

@@ -214,7 +214,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.17.0
+    docker run --rm -it -v $PWD:/e2e -w /e2e cypress/included:14.1.0
 
 ## Warnings
 

deploy/Dockerfile

@@ -3,7 +3,7 @@ FROM python:3.12.9-slim
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 ENV PIP_VERSION='25.0.1'
-ENV SETUPTOOLS_VERSION='75.8.0'
+ENV SETUPTOOLS_VERSION='75.8.1'
 ENV PIP_TOOLS_VERSION='7.4.1'
 # NB: Version 15.1.0 is installed on RHEL
 ENV VE_VERSION='20.27.1'

deploy/Dockerfile-rhel

@@ -47,7 +47,7 @@ RUN yum update -y && \
             zip
 
 ENV PIP_VERSION='25.0.1'
-ENV SETUPTOOLS_VERSION='75.8.0'
+ENV SETUPTOOLS_VERSION='75.8.1'
 ENV PIP_TOOLS_VERSION='7.4.1'
 ENV VE_VERSION='20.27.1'
 ENV FABRIC_VERSION='1.15.0'

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 = '25.0.1'
-SETUPTOOLS_VERSION = '75.8.0'
+SETUPTOOLS_VERSION = '75.8.1'
 PIP_TOOLS_VERSION = '7.4.1'
 
 

docker-compose.override.yml

@@ -34,7 +34,7 @@ services:
     platform: linux/amd64
 
   e2e:
-    image: cypress/included:13.17.0
+    image: cypress/included:14.1.0
     working_dir: /e2e/
     links:
       # - nginx:nginx