Update python packaging tools and dependencies; Update Cypress

MRCIEU · Feb 28, 2024 · 8bff94e · 8bff94e
1 parent 2458bb0
commit 8bff94e
Show file tree

Hide file tree

Showing 11 changed files with 292 additions and 291 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+8.9.2   Apply python dependency and packaging tools updates
+        TMMA-502: Remove unsed CI jobs DC1 hostnames references
+        Update Cypress
+
 8.9.1   Apply Python dependency updates
         Update python packaging tools
         Update version of MySQL used in GitHub actions to match deployment environment

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.6.4'
+                    image 'cypress/included:13.6.6'
                     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.6.4'
+                    image 'cypress/included:13.6.6'
                     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.6.4'
+                    image 'cypress/included:13.6.6'
                     args '--add-host app-dc2-tmpo-t0.epi.bris.ac.uk:172.26.10.143 --entrypoint=""'
                 }
             }

diff --git a/README.md b/README.md
@@ -202,7 +202,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.6.4
+    docker run --rm -it -v $PWD:/e2e -w /e2e cypress/included:13.6.6
 
 ## Warnings
 

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -3,8 +3,8 @@ FROM python:3.8.18-slim
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 ENV PIP_VERSION='24.0'
-ENV SETUPTOOLS_VERSION='69.1.0'
-ENV PIP_TOOLS_VERSION='7.3.0'
+ENV SETUPTOOLS_VERSION='69.1.1'
+ENV PIP_TOOLS_VERSION='7.4.0'
 # As per Centos installation
 ENV VE_VERSION='20.24.5'
 

diff --git a/deploy/fabfile.py b/deploy/fabfile.py
@@ -22,8 +22,8 @@
 # Tools not handled by pip-tools and/or requirements installs using pip
 # Also update tests/build-test-env.sh
 PIP_VERSION = '24.0'
-SETUPTOOLS_VERSION = '69.1.0'
-PIP_TOOLS_VERSION = '7.3.0'
+SETUPTOOLS_VERSION = '69.1.1'
+PIP_TOOLS_VERSION = '7.4.0'
 
 
 def _add_file_local(path, contents, use_local_mode):

diff --git a/requirements/dev.txt b/requirements/dev.txt
diff --git a/requirements/requirements.in b/requirements/requirements.in
@@ -18,7 +18,7 @@ numexpr>=2.8.4
 numpy>=1.24.2
 pandas>=1.5.3
 python-magic>=0.4.27
-redis>=3.5.3
+redis>=3.5.3<4
+rq<2.0  # Drops support for Redis server < 4
 unicodecsv>=0.14.1
-# urllib3>=1.26.14        # Pinned to resolve build issue as not pinned well in egg that requires it.
 xtract>=0.1a3
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -10,50 +10,50 @@ asgiref==3.7.2 \
     --hash=sha256:89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e \
     --hash=sha256:9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed
     # via django
-bottleneck==1.3.7 \
-    --hash=sha256:01e61a512d645193cf4cf4fdacf98d3140c26ace0fcf4c4ed8fdfa366c57e0d1 \
-    --hash=sha256:1045f9b199bba2675bd7642c25dec5daa21a03a5f0444eb863f2790af52b00b0 \
-    --hash=sha256:175ae3d92142769a5acd169ac2d7df22107b72f6d4c932ff56f5afcef39d5877 \
-    --hash=sha256:2a39049aa1cb798538f96150098f50badb37417c41cecfa8a441c0c4e6433c7e \
-    --hash=sha256:4d2ae3e1ac0626107c6916783befc39473900bb22a9b275e21550c99abe8283c \
-    --hash=sha256:54fc579445688c5309a0af7634db3be4e17659c6b664f9332ec404738e847894 \
-    --hash=sha256:5977f1fd02f01035176a99c01b3fb0eefdaff002c30a4710f7279215b0a317f5 \
-    --hash=sha256:5af0c679da9dc41d6a3c436785c664fff41b4c1178d46afaa630620ab31e970f \
-    --hash=sha256:6311ee47641ed5fbc543d2e49cbfa90bd9ece208a0c1bdc2c2b14b9132982b2a \
-    --hash=sha256:64ef9ad7187282745205b735e8c33307ec14c7be39f9971bc3f375104355cfb9 \
-    --hash=sha256:685812254238c2059810f8e25c8215b09795b974f5b1a89f0accda3d93cc8734 \
-    --hash=sha256:68d0f9d32d45f62028ab27d2b51d1a2af72a5ca6a7c3b1f86e9115fedb266300 \
-    --hash=sha256:699fb76ef50cf85be8f8d644b533488de3cec4c6ddf00fd770f73cc5caac9938 \
-    --hash=sha256:752c97d64ebebdc10a5568d97b81b4971238fa4b53533248d227c4ea759aee4e \
-    --hash=sha256:752f4c3fc5b7cc49814d41e9ecf6f228f33ea407bdb8c889da53716b5628abc7 \
-    --hash=sha256:79160e49a5a0438468b970967e29addde2d9c6a6ce930144de7ccd8151077603 \
-    --hash=sha256:83d71c49dd9d6b99def958b6ccba3c8b5aac7b90849a5a9fe935648436dd46b9 \
-    --hash=sha256:8d6865327ebbea5578f99b073538789df2123cf9009e99fe94efc4d25a4b888b \
-    --hash=sha256:9170ebee4cff423c92b3760afec179bded90eaede7c70dd27cf5f406cc00a1e7 \
-    --hash=sha256:92fc5d3ecfedde3b28c56ca686cff70a8125d1ddc281eb468b5e9d6a61269802 \
-    --hash=sha256:955df78713ff58cf815c0a1fa4782b2dc51a8787c0971688472c64b267303855 \
-    --hash=sha256:a09fa97df2f572aed5da487d3fe467829c2212c97b1d63c768ec9be9fd1c57a9 \
-    --hash=sha256:a1e50fb506693186a4b8f85ac79df1a5af1ab1f774bf20004280e0658a731a89 \
-    --hash=sha256:a477101ee12155a0d2f9a82cd3e2a44b9b1aa53afe5b20acc065c91cf35c3106 \
-    --hash=sha256:abfc22762640cc7716c1bd9a409bde0f834167a2584775eb644c6afe7bae3319 \
-    --hash=sha256:ada1a9ff93fd6b1b19f12398a6761940372b00e53d86db98bd4613a751c60043 \
-    --hash=sha256:b3c65a9aedada04872cba450676d132d7af8b9da47f58b82f20ffe9b9ff77a46 \
-    --hash=sha256:b4a47f972e919d22c1725ff7262d209e6ea3a4d9bcfea71fb454a18e166515ec \
-    --hash=sha256:b5ec31e0b52cbfd716255695ec5fe87662a5961d2b8b49936f3608e36a04d926 \
-    --hash=sha256:b624023f173332d209ed5bd4134fae43d2432d61c6b17a49a6b7c5591caa7cc4 \
-    --hash=sha256:bbda2b27e81a47b7578bce6a8cb2f5eb899279c828d8efb5a154d8ede785093d \
-    --hash=sha256:bd69b1844c90f6bcf1b679a608fb2c0909be5e045f91674d61a0e4c3596644be \
-    --hash=sha256:c65d0a9498b2ccda236b28b1b36bc35402e81ebc4575b6cf44033b7e4460f067 \
-    --hash=sha256:c8fa2d85298cdd0f88f51fb46604039abe9a5a2b57e00acfe2b64f546754c053 \
-    --hash=sha256:cfe5f3010e9ad8ae54871d1e8fd61109c5981ed8d9d14e8496a1c37fe2050a04 \
-    --hash=sha256:d982e1e3f72cc7ca4f558e9ef7db7a97ce68a915b1db8249fe088b3e78974b21 \
-    --hash=sha256:e1467e373ad469da340ed0ff283214d6531cc08bfdca2083361a3aa6470681f8 \
-    --hash=sha256:e26c655736701365d66c64056fc272952d0e2a52718c637254d7dd9a7efa97a8 \
-    --hash=sha256:e2a290dcb148c0ddf182052e333892e46730c7d39a1f251af87e3d81a43cdde3 \
-    --hash=sha256:f239ba0d992c013564979cff4fecf2b251614de3730641e79d05ecc09268c00c \
-    --hash=sha256:f2c8b631552908b11905cf87b4a90dd4af332b0726dd9b49d26d6a0fbb38e6d4 \
-    --hash=sha256:f5409cf6db5e60256626a7c110b2b4c80d9f6b0d1ec0b66565bbab978f96b7a6 \
-    --hash=sha256:fa80c318b5164e39e4f2d5abf95f5ff42744e3d8535a4c85ede94ccc5fca8f9b
+bottleneck==1.3.8 \
+    --hash=sha256:019dd142d1e870388fb0b649213a0d8e569cce784326e183deba8f17826edd9f \
+    --hash=sha256:02616a830bd477f5ba51103396092da4b9d83cea2e88f5b8069e3f4f7b796704 \
+    --hash=sha256:167a278902775defde7dfded6e98e3707dfe54971ffd9aec25c43bc74e4e381a \
+    --hash=sha256:20aa31a7d9d747c499ace1610a6e1f7aba6e3d4a9923e0312f6b4b6d68a59af3 \
+    --hash=sha256:211f881159e8adb3a57df2263028ae6dc89ec4328bfd43f3421e507406c28654 \
+    --hash=sha256:271b6333522beb8aee32e640ba49a2064491d2c10317baa58a5996be3dd443e4 \
+    --hash=sha256:2948502b0394ee419945b55b092585222a505c61d41a874c741be49f2cac056f \
+    --hash=sha256:2c4ea8b9024dcb4e83b5c118a3c8faa863ace2ad572849da548a74a8ee4e8f2a \
+    --hash=sha256:350520105d9449e6565b3f0c4ce1f80a0b3e4d63695ebbf29db41f62e13f6461 \
+    --hash=sha256:38837c022350e2a656453f0e448416b7108cf67baccf11d04a0b3b70a48074dd \
+    --hash=sha256:3c74c18f86a1ffac22280b005df8bb8a58505ac6663c4d6807f39873c17dc347 \
+    --hash=sha256:4bd7183b8dcca89d0e65abe4507c19667dd31dacfbcc8ed705bad642f26a46e1 \
+    --hash=sha256:51c8bb3dffeb72c14f0382b80de76eabac6726d316babbd48f7e4056267d7910 \
+    --hash=sha256:54a1b5d9d63b2d9f2955f8542eea26c418f97873e0abf86ca52beea0208c9306 \
+    --hash=sha256:60139c5c3d2a9c1454a04af5ee981a9f56548d27fa36f264069b149a6e9b01ed \
+    --hash=sha256:6780d896969ba7f53c8995ba90c87c548beb3db435dc90c60b9a10ed1ab4d868 \
+    --hash=sha256:770b517609916adeb39d3b1a386a29bc316da03dd61e7ee6e8a38325b80cc327 \
+    --hash=sha256:7ca25f0003ef65264942f6306d793e0f270ece8b406c5a293dfc7d878146e9f8 \
+    --hash=sha256:84453548b0f722c3be912ce3c6b685917fea842bf1252eeb63714a2c1fd1ffc9 \
+    --hash=sha256:84ca5e741fae1c1796744dbdd0d2c1789cb74dd79c12ea8ec5834f83430f8520 \
+    --hash=sha256:8615eeb75009ba7c0a112a5a6a5154ed3d61fd6b0879631778b3e42e2d9a6d65 \
+    --hash=sha256:865c8ed5b798c0198b0b80553e09cc0d890c4f5feb3d81d31661517ca7819fa3 \
+    --hash=sha256:8b5ed34a540eb7df59f45da659af9f792306637de1c69c95f020294f3b9fc4a8 \
+    --hash=sha256:8d01fd5389d3160d54619119987ac24b020fa6810b7b398fff4945892237b3da \
+    --hash=sha256:90b87eed152bbd760c4eb11473c2cf036abdb26e2f84caeb00787da74fb08c40 \
+    --hash=sha256:92700867504a213cafa9b8d9be529bd6e18dc83366b2ba00e86e80769b93f678 \
+    --hash=sha256:93d359fb83eb3bdd6635ef6e64835c38ffdc211441fc190549f286e6af98b5f6 \
+    --hash=sha256:99fab17fa26c811ccad63e208314726e718ae6605314329eca09641954550523 \
+    --hash=sha256:b69fcd4d818bcf9d53497d8accd0d5f852a447728baaa33b9b7168f8c4221d06 \
+    --hash=sha256:b806b277ab47495032822f55f43b8d336e4b7e73f8506ed34d3ea3da6d644abc \
+    --hash=sha256:bcba1d5d5328c50f94852ab521fcb26f35d9e0ccd928d120d56455d1a5bb743f \
+    --hash=sha256:bf7763cf1516fa388c3587d12182fc1bc1c8089eab1a0a1bf09761f4c41af73c \
+    --hash=sha256:c6e93ed45c6c83392f73d0333b310b38772df7eb78c120c1447245691bdedaf4 \
+    --hash=sha256:cfbc4a3a934b677bfbc37ac8757c4e1264a76262b774259bd3fa8a265dbd668b \
+    --hash=sha256:d073a31e259d40b25e29dbba80f73abf38afe98fd730c79dad7edd9a0ad6cff5 \
+    --hash=sha256:d0a7f454394cd3642498b6e077e70f4a6b9fd46a8eb908c83ac737fdc9f9a98c \
+    --hash=sha256:d3400f47dda0196b5af50b0b0678e33cc8c42e52e55ae0a63cdfed60725659bc \
+    --hash=sha256:d3ae2bb5d4168912e438e377cc1301fa01df949ba59cd86317b3e00404fd4a97 \
+    --hash=sha256:d41000ea7ca196b5fd39d6fccd34bf0704c8831731cedd2da2dcae3c6ac49c42 \
+    --hash=sha256:f40724b6e965ff5b88b333d4a10097b1629e60c0db21bb3d08c24d7b1a904a16 \
+    --hash=sha256:f4dfc22a3450227e692ef2ff4657639c33eec88ad04ee3ce29d1a23a4942da24 \
+    --hash=sha256:fadfd2f3931fdff42f4b9867eb02ed7c662d01e6099ff6b347b6ced791450651 \
+    --hash=sha256:fba5fd1805c71b2eeea50bea93d59be449c4af23ebd8da5f75fd74fd0331e314
     # via -r requirements/requirements.in
 clamd==1.0.2 \
     --hash=sha256:5c32546b7d1eb00fd6be00a889d79e00fbf980ed082826ccfa369bce3dcff5e7 \
@@ -73,8 +73,8 @@ django==3.2.24 \
     #   django-hcaptcha-field
     #   django-js-asset
     #   django-rq
-django-autocomplete-light==3.9.7 \
-    --hash=sha256:a34f192ac438c4df056dbfd399550799ddc631c4661960134ded924648770373
+django-autocomplete-light==3.11.0 \
+    --hash=sha256:212576a17e3308ef7ca77e280b86684167916d2091d4b73640f38845d9516328
     # via -r requirements/requirements.in
 django-clamd==0.4.0 \
     --hash=sha256:47adaf6f8156ee613dde9e0d88adc847aa3df021dabf1a4d1aec34b47de8da11 \
@@ -454,23 +454,23 @@ redis==3.5.3 \
     #   django-redis-cache
     #   django-rq
     #   rq
-rq==1.14.1 \
-    --hash=sha256:37e003db1da205e08db6cc4653b7c6ccfd9292000954240308abfce2ebde43ba \
-    --hash=sha256:5fb86038922ddd76eb2d9aa0adeec6dcf64f159dbbe730b26358b1417120dd44
-    # via django-rq
+rq==1.16.0 \
+    --hash=sha256:aab9e0fc90d7ffd100241b0f8dd7458c1ee4039edc2bfea9f7e2cfc0567f5710 \
+    --hash=sha256:d71859da6f3af597bd79675b240e138587878ce9b693d1bcf681443e2a8193ce
+    # via
+    #   -r requirements/requirements.in
+    #   django-rq
 six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
-    # via
-    #   django-autocomplete-light
-    #   python-dateutil
+    # via python-dateutil
 sqlparse==0.4.4 \
     --hash=sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3 \
     --hash=sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c
     # via django
-typing-extensions==4.9.0 \
-    --hash=sha256:23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783 \
-    --hash=sha256:af72aea155e91adfc61c3ae9e0e342dbc0cba726d6cba4b6c72c1f34e47291cd
+typing-extensions==4.10.0 \
+    --hash=sha256:69b1a937c3a517342112fb4c6df7e72fc39a38e7891a5730ed4985b5214b5475 \
+    --hash=sha256:b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb
     # via asgiref
 tzdata==2024.1 \
     --hash=sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd \