From 2253e52ab7bda332f404c3109fbd36a520dbfd09 Mon Sep 17 00:00:00 2001
From: Tim Byrne <sultan@locehilios.com>
Date: Sat, 8 Jul 2023 14:25:26 -0500
Subject: [PATCH] Update test Docker image

* Update base image (which uses a newer python)
* Update linters
* Update other dependencies
---
 Makefile              |  2 +-
 test/Dockerfile       | 10 +++++-----
 test/conftest.py      |  2 +-
 test/requirements.txt | 10 ++++++----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 69fa003..5da0918 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PYTESTS = $(wildcard test/test_*.py)
-IMAGE = docker.io/yadm/testbed:2022-01-07
+IMAGE = docker.io/yadm/testbed:2023-07-12
 OCI = docker
 
 .PHONY: all
diff --git a/test/Dockerfile b/test/Dockerfile
index e6a0a97..9fb2b3a 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:18.04
+FROM ubuntu:23.04
 MAINTAINER Tim Byrne <sultan@locehilios.com>
 
 # Shellcheck and esh versions
-ARG SC_VER=0.8.0
-ARG ESH_VER=0.3.1
+ARG SC_VER=0.9.0
+ARG ESH_VER=0.3.2
 
 # Install prerequisites and configure UTF-8 locale
 RUN \
@@ -41,8 +41,8 @@ RUN cd /opt \
 
 # Upgrade pip3 and install requirements
 COPY test/requirements.txt /tmp/requirements.txt
-RUN python3 -m pip install --upgrade pip setuptools \
-  && python3 -m pip install --upgrade -r /tmp/requirements.txt \
+RUN python3 -m pip install --break-system-packages --upgrade pip setuptools \
+  && python3 -m pip install --break-system-packages --upgrade -r /tmp/requirements.txt \
   && rm -f /tmp/requirements
 
 # Install esh
diff --git a/test/conftest.py b/test/conftest.py
index d3bbb76..f3ce22c 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -43,7 +43,7 @@ def flake8_version():
 @pytest.fixture(scope='session')
 def yamllint_version():
     """Version of yamllint supported"""
-    return '1.25.0'
+    return '1.30.0'
 
 
 @pytest.fixture(scope='session')
diff --git a/test/requirements.txt b/test/requirements.txt
index 30da6ae..e71b349 100644
--- a/test/requirements.txt
+++ b/test/requirements.txt
@@ -1,6 +1,8 @@
+black==23.1.0
 envtpl
-flake8==3.8.4
+flake8==6.0.0
+isort==5.12.0
 j2cli
-pylint==2.6.0
-pytest==6.2.1
-yamllint==1.25.0
+pylint==2.17.0
+pytest==7.2.2
+yamllint==1.30.0