Update python packaging tools versions; Adjust GitHub action trigger …

…for running checks on pull requests
MRCIEU · Aug 8, 2023 · 82854fb · 82854fb
1 parent 6407cb8
commit 82854fb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/run-django-test.yml b/.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:

diff --git a/.github/workflows/run-fabric-test.yml b/.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:

diff --git a/CHANGELOG b/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

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -1,9 +1,9 @@
 FROM python:3.8.17-slim
 
-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 && \

diff --git a/deploy/fabfile.py b/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):