Merge branch 'master' into TMMA-440

.github/workflows/run-django-test.yml

@@ -7,8 +7,7 @@ on:
       - demo_stable
       - prod_stable
   pull_request:
-    branches:
-      - python-package-updates
+    types: [review_requested]
   workflow_dispatch:
 
 jobs:

.github/workflows/run-fabric-test.yml

@@ -7,8 +7,7 @@ on:
       - demo_stable
       - prod_stable
   pull_request:
-    branches:
-      - python-package-updates
+    types: [review_requested]
   workflow_dispatch:
 
 jobs:

CHANGELOG

@@ -1,3 +1,6 @@
+8.4.1   Apply Python updates
+        Update GitHub actions
+
 8.4.0   TMMA-417: Reduce creation of spam users accounts
         Apply Python updates
         TMMA-440: Add support for regenerating requirements file in Docker environment

deploy/Dockerfile

@@ -2,11 +2,10 @@ FROM python:3.8.17-slim
 
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
-
-ENV PIP_VERSION='23.1.2'
+ENV PIP_VERSION='23.2.1'
 ENV SETUPTOOLS_VERSION='68.0.0'
-ENV PIP_TOOLS_VERSION='6.14.0'
-ENV VE_VERSION='20.13.0'
+ENV PIP_TOOLS_VERSION='7.2.0'
+ENV VE_VERSION='20.24.2'
 
 # Update system packages and install dependencies
 RUN apt update -y && \

deploy/fabfile.py

@@ -21,9 +21,9 @@
 
 # Tools not handled by pip-tools and/or requirements installs using pip
 # Also update tests/run-django-tests.sh
-PIP_VERSION = '23.1.2'
+PIP_VERSION = '23.2.1'
 SETUPTOOLS_VERSION = '68.0.0'
-PIP_TOOLS_VERSION = '6.14.0'
+PIP_TOOLS_VERSION = '7.2.0'
 
 
 def _add_file_local(path, contents, use_local_mode):

requirements/requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --generate-hashes --output-file=requirements/requirements.txt --resolver=backtracking requirements/requirements.in
+#    pip-compile --generate-hashes --output-file=requirements/requirements.txt requirements/requirements.in
 #
 --index-url https://pypi.python.org/simple/
 
@@ -59,9 +59,9 @@ clamd==1.0.2 \
     --hash=sha256:5c32546b7d1eb00fd6be00a889d79e00fbf980ed082826ccfa369bce3dcff5e7 \
     --hash=sha256:d82a2fd814684a35a1b31feadafb2e69c8ebde9403613f6bdaa5d877c0f29560
     # via django-clamd
-click==8.1.5 \
-    --hash=sha256:4be4b1af8d665c6d942909916d31a213a106800c47d0eeba73d34da3cbc11367 \
-    --hash=sha256:e576aa487d679441d7d30abb87e1b43d24fc53bffb8758443b1a9e1cee504548
+click==8.1.6 \
+    --hash=sha256:48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd \
+    --hash=sha256:fa244bb30b3b5ee2cae3da8f55c9e5e0c0e86093306301fb418eb9dc40fbded5
     # via rq
 django==3.2.20 \
     --hash=sha256:a477ab326ae7d8807dc25c186b951ab8c7648a3a23f9497763c37307a2b5ef87 \
@@ -288,9 +288,9 @@ lxml==4.9.3 \
     --hash=sha256:fcdd00edfd0a3001e0181eab3e63bd5c74ad3e67152c84f93f13769a40e073a7 \
     --hash=sha256:fe4bda6bd4340caa6e5cf95e73f8fea5c4bfc55763dd42f1b50a94c1b4a2fbd4
     # via -r requirements/requirements.in
-more-itertools==9.1.0 \
-    --hash=sha256:cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d \
-    --hash=sha256:d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3
+more-itertools==10.1.0 \
+    --hash=sha256:626c369fa0eb37bac0291bce8259b332fd59ac792fa5497b59837309cd5b114a \
+    --hash=sha256:64e0735fcfdc6f3464ea133afe8ea4483b1c5fe3a3d69852e6503b43a0b222e6
     # via -r requirements/requirements.in
 mysqlclient==2.2.0 \
     --hash=sha256:004fe1d30d2c2ff8072f8ea513bcec235fd9b896f70dad369461d0ad7e570e98 \
@@ -301,37 +301,37 @@ mysqlclient==2.2.0 \
     --hash=sha256:955dba905a7443ce4788c63fdb9f8d688316260cf60b20ff51ac3b1c77616ede \
     --hash=sha256:9c6b142836c7dba4f723bf9c93cc46b6e5081d65b2af807f400dda9eb85a16d0
     # via -r requirements/requirements.in
-numexpr==2.8.4 \
-    --hash=sha256:059546e8f6283ccdb47c683101a890844f667fa6d56258d48ae2ecf1b3875957 \
-    --hash=sha256:17ac9cfe6d0078c5fc06ba1c1bbd20b8783f28c6f475bbabd3cad53683075cab \
-    --hash=sha256:3f039321d1c17962c33079987b675fb251b273dbec0f51aac0934e932446ccc3 \
-    --hash=sha256:5538b30199bfc68886d2be18fcef3abd11d9271767a7a69ff3688defe782800a \
-    --hash=sha256:655d84eb09adfee3c09ecf4a89a512225da153fdb7de13c447404b7d0523a9a7 \
-    --hash=sha256:6931b1e9d4f629f43c14b21d44f3f77997298bea43790cfcdb4dd98804f90783 \
-    --hash=sha256:6c368aa35ae9b18840e78b05f929d3a7b3abccdba9630a878c7db74ca2368339 \
-    --hash=sha256:6ee9db7598dd4001138b482342b96d78110dd77cefc051ec75af3295604dde6a \
-    --hash=sha256:77898fdf3da6bb96aa8a4759a8231d763a75d848b2f2e5c5279dad0b243c8dfe \
-    --hash=sha256:7bca95f4473b444428061d4cda8e59ac564dc7dc6a1dea3015af9805c6bc2946 \
-    --hash=sha256:7d71add384adc9119568d7e9ffa8a35b195decae81e0abf54a2b7779852f0637 \
-    --hash=sha256:845a6aa0ed3e2a53239b89c1ebfa8cf052d3cc6e053c72805e8153300078c0b1 \
-    --hash=sha256:90f12cc851240f7911a47c91aaf223dba753e98e46dff3017282e633602e76a7 \
-    --hash=sha256:9400781553541f414f82eac056f2b4c965373650df9694286b9bd7e8d413f8d8 \
-    --hash=sha256:9e34931089a6bafc77aaae21f37ad6594b98aa1085bb8b45d5b3cd038c3c17d9 \
-    --hash=sha256:9f096d707290a6a00b6ffdaf581ee37331109fb7b6c8744e9ded7c779a48e517 \
-    --hash=sha256:a38664e699526cb1687aefd9069e2b5b9387da7feac4545de446141f1ef86f46 \
-    --hash=sha256:a6d2d7740ae83ba5f3531e83afc4b626daa71df1ef903970947903345c37bd03 \
-    --hash=sha256:a75967d46b6bd56455dd32da6285e5ffabe155d0ee61eef685bbfb8dafb2e484 \
-    --hash=sha256:b076db98ca65eeaf9bd224576e3ac84c05e451c0bd85b13664b7e5f7b62e2c70 \
-    --hash=sha256:b318541bf3d8326682ebada087ba0050549a16d8b3fa260dd2585d73a83d20a7 \
-    --hash=sha256:b96334fc1748e9ec4f93d5fadb1044089d73fb08208fdb8382ed77c893f0be01 \
-    --hash=sha256:c867cc36cf815a3ec9122029874e00d8fbcef65035c4a5901e9b120dd5d626a2 \
-    --hash=sha256:d5432537418d18691b9115d615d6daa17ee8275baef3edf1afbbf8bc69806147 \
-    --hash=sha256:db93cf1842f068247de631bfc8af20118bf1f9447cd929b531595a5e0efc9346 \
-    --hash=sha256:df35324666b693f13a016bc7957de7cc4d8801b746b81060b671bf78a52b9037 \
-    --hash=sha256:df3a1f6b24214a1ab826e9c1c99edf1686c8e307547a9aef33910d586f626d01 \
-    --hash=sha256:eaec59e9bf70ff05615c34a8b8d6c7bd042bd9f55465d7b495ea5436f45319d0 \
-    --hash=sha256:f3a920bfac2645017110b87ddbe364c9c7a742870a4d2f6120b8786c25dc6db3 \
-    --hash=sha256:ff5835e8af9a212e8480003d731aad1727aaea909926fd009e8ae6a1cba7f141
+numexpr==2.8.5 \
+    --hash=sha256:1510da20e6f5f45333610b1ded44c566e2690c6c437c84f2a212ca09627c7e01 \
+    --hash=sha256:178b85ad373c6903e55d75787d61b92380439b70d94b001cb055a501b0821335 \
+    --hash=sha256:183d5430db76826e54465c69db93a3c6ecbf03cda5aa1bb96eaad0147e9b68dc \
+    --hash=sha256:283ce8609a7ccbadf91a68f3484558b3e36d27c93c98a41ec205efb0ab43c872 \
+    --hash=sha256:34af2a0e857d02a4bc5758bc037a777d50dacb13bcd57c7905268a3e44994ed6 \
+    --hash=sha256:39ce106f92ccea5b07b1d6f2f3c4370f05edf27691dc720a63903484a2137e48 \
+    --hash=sha256:3c00be69f747f44a631830215cab482f0f77f75af2925695adff57c1cc0f9a68 \
+    --hash=sha256:45ed41e55a0abcecf3d711481e12a5fb7a904fe99d42bc282a17cc5f8ea510be \
+    --hash=sha256:4ed0e1c1ef5f34381448539f1fe9015906d21c9cfa2797c06194d4207dadb465 \
+    --hash=sha256:51f3ab160c3847ebcca93cd88f935a7802b54a01ab63fe93152994a64d7a6cf2 \
+    --hash=sha256:558390fea6370003ac749ed9d0f38d708aa096f5dcb707ddb6e0ca5a0dd37da1 \
+    --hash=sha256:55983806815035eb63c5039520688c49536bb7f3cc3fc1d7d64c6a00cf3f353e \
+    --hash=sha256:578fe4008e4d5d6ff01bbeb2d7b7ba1ec658a5cda9c720cd26a9a8325f8ef438 \
+    --hash=sha256:5a8dad2bfaad5a5c34a2e8bbf62b9df1dfab266d345fda1feb20ff4e264b347a \
+    --hash=sha256:62b4faf8e0627673b0210a837792bddd23050ecebc98069ab23eb0633ff1ef5f \
+    --hash=sha256:6df184d40d4cf9f21c71f429962f39332f7398147762588c9f3a5c77065d0c06 \
+    --hash=sha256:783324ba40eb804ecfc9ebae86120a1e339ab112d0ab8a1f0d48a26354d5bf9b \
+    --hash=sha256:894b027438b8ec88dea32a19193716c79f4ff8ddb92302dcc9731b51ba3565a8 \
+    --hash=sha256:9e8b5bf7bcb4e8dcd66522d8fc96e1db7278f901cb4fd2e155efbe62a41dde08 \
+    --hash=sha256:aea6ab45c87c0a7041183c08a798f0ad4d7c5eccbce20cfe79ce6f1a45ef3702 \
+    --hash=sha256:b594dc9e2d6291a0bc5c065e6d9caf3eee743b5663897832e9b17753c002947a \
+    --hash=sha256:b93f5a866cd13a808bc3d3a9c487d94cd02eec408b275ff0aa150f2e8e5191f8 \
+    --hash=sha256:bf85ba1327eb87ec82ae7936f13c8850fb969a0ca34f3ba9fa3897c09d5c80d7 \
+    --hash=sha256:c46350dcdb93e32f033eea5a21269514ffcaf501d9abd6036992d37e48a308b0 \
+    --hash=sha256:cbfd833ee5fdb0efb862e152aee7e6ccea9c596d5c11d22604c2e6307bff7cad \
+    --hash=sha256:db5c65417d69414f1ab31302ea01d3548303ef31209c38b4849d145be4e1d1ba \
+    --hash=sha256:dd57ab1a3d3aaa9274aff1cefbf93b8ddacc7973afef5b125905f6bf18fabab0 \
+    --hash=sha256:de29c77f674e4eb8f0846525a475cab64008c227c8bc4ba5153ab3f72441cc63 \
+    --hash=sha256:eb36ffcfa1606e41aa08d559b4277bcad0e16b83941d1a4fee8d2bd5a34f8e0e \
+    --hash=sha256:ef621b4ee366a5c6a484f6678c9259f5b826569f8bfa0b89ba2306d5055468bb
     # via -r requirements/requirements.in
 numpy==1.24.4 \
     --hash=sha256:04640dab83f7c6c85abf9cd729c5b65f1ebd0ccf9de90b270cd61935eef0197f \