From 07279e63837d783787740731649ed248f1bc8aef Mon Sep 17 00:00:00 2001
From: Tessa Alexander <tessa.alexander@bristol.ac.uk>
Date: Mon, 4 Sep 2023 11:59:12 +0100
Subject: [PATCH] Update Docker environment; Update packaging tools; Update dev
 dependencies

---
 deploy/Dockerfile    | 9 +++++----
 deploy/fabfile.py    | 4 ++--
 requirements/dev.txt | 6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
index ff8cb8aa..256c1dff 100644
--- a/deploy/Dockerfile
+++ b/deploy/Dockerfile
@@ -1,11 +1,12 @@
-FROM python:3.8.17-slim
+FROM python:3.8.18-slim
 
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 ENV PIP_VERSION='23.2.1'
-ENV SETUPTOOLS_VERSION='68.0.0'
-ENV PIP_TOOLS_VERSION='7.2.0'
-ENV VE_VERSION='20.24.2'
+ENV SETUPTOOLS_VERSION='68.1.2'
+ENV PIP_TOOLS_VERSION='7.3.0'
+# As per Centos installation
+ENV VE_VERSION='20.13.0'
 
 # Update system packages and install dependencies
 RUN apt update -y && \
diff --git a/deploy/fabfile.py b/deploy/fabfile.py
index 62078864..e514f719 100644
--- 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/run-django-tests.sh
 PIP_VERSION = '23.2.1'
-SETUPTOOLS_VERSION = '68.0.0'
-PIP_TOOLS_VERSION = '7.2.0'
+SETUPTOOLS_VERSION = '68.1.2'
+PIP_TOOLS_VERSION = '7.3.0'
 
 
 def _add_file_local(path, contents, use_local_mode):
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 578c2701..c7857e0e 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -12,9 +12,9 @@ asgiref==3.7.2 \
     # via
     #   -r requirements/test.txt
     #   django
-asttokens==2.2.1 \
-    --hash=sha256:4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3 \
-    --hash=sha256:6b0ac9e93fb0335014d382b8fa9b3afa7df546984258005da0b9e7095b3deb1c
+asttokens==2.3.0 \
+    --hash=sha256:2552a88626aaa7f0f299f871479fc755bd4e7c11e89078965e928fb7bb9a6afe \
+    --hash=sha256:bef1a51bc256d349e9f94e7e40e44b705ed1162f55294220dd561d24583d9877
     # via stack-data
 attrs==23.1.0 \
     --hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \