From 9e1e2d6f65fba8087df366b9530c4be5a22fdd37 Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
Date: Wed, 6 Sep 2023 16:00:40 +0200
Subject: [PATCH 1/3] release: preinstall udocker so that
 test_udocker_should_display_memory_usage doesn't timeout

---
 release-test.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release-test.sh b/release-test.sh
index 257a4e631..f5383b252 100755
--- a/release-test.sh
+++ b/release-test.sh
@@ -89,8 +89,9 @@ rm -f lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
         && pip install setuptools==${setuptoolsver} wheel
 package_tar=$(find . -name "${package}*tar.gz")
-pip install "-r${DIR}/test-requirements.txt"
+pip install "-r${DIR}/test-requirements.txt" udocker
 pip install "${package_tar}${extras}"
+udocker install
 mkdir out
 tar --extract --directory=out -z -f ${package}*.tar.gz
 pushd out/${package}*

From 6fdb9c736d0c739d76654887a8105a337e22fa24 Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
Date: Wed, 6 Sep 2023 16:00:58 +0200
Subject: [PATCH 2/3] release: testenv4 isn't needed

---
 release-test.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/release-test.sh b/release-test.sh
index f5383b252..056a05ca0 100755
--- a/release-test.sh
+++ b/release-test.sh
@@ -55,8 +55,7 @@ fi
 
 python3 -m venv testenv2
 python3 -m venv testenv3
-python3 -m venv testenv4
-rm -Rf testenv[234]/local
+rm -Rf testenv[23]/local
 
 # Secondly we test via pip
 

From c22318c033ba6396f0b4e677ee7c79cf5c1c5753 Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
Date: Wed, 6 Sep 2023 16:01:56 +0200
Subject: [PATCH 3/3] release: bump minimum setuptools version slightly to
 match Debian 11 ('bullseye').

---
 release-test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release-test.sh b/release-test.sh
index 056a05ca0..d9276c372 100755
--- a/release-test.sh
+++ b/release-test.sh
@@ -25,8 +25,8 @@ run_tests() {
 	"${test_prefix}"bin/py.test "--ignore=${mod_loc}/schemas/" \
 		--pyargs -x ${module} -n auto --dist=loadfile
 }
-pipver=20.3.3 # minimum required version of pip for Python 3.10
-setuptoolsver=50.0.1  # fix for "AttributeError: module 'importlib.util' has no attribute 'abc'"
+pipver=20.3.4 # minimum required version of pip for Python 3.10
+setuptoolsver=52.0.0
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 rm -Rf testenv? || /bin/true