From a6b6dd32c1c615089f8a1afa26dd8187d06020a2 Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Sun, 29 Dec 2024 09:33:25 -0800
Subject: [PATCH] Upgrade dependencies and containers for end-to-end tests.

---
 scripts/run-full-tests               |  9 +++------
 tests/end-to-end/docker-compose.yaml | 18 +++++++++---------
 tox.ini                              |  4 ++--
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/scripts/run-full-tests b/scripts/run-full-tests
index d57340e1..8c5be55a 100755
--- a/scripts/run-full-tests
+++ b/scripts/run-full-tests
@@ -17,12 +17,9 @@ if [ -z "$TEST_CONTAINER" ]; then
     exit 1
 fi
 
-apk add --no-cache python3 py3-pip borgbackup postgresql-client mariadb-client mongodb-tools \
-    py3-ruamel.yaml py3-ruamel.yaml.clib py3-yaml bash sqlite fish
-# If certain dependencies of black are available in this version of Alpine, install them.
-apk add --no-cache py3-typed-ast py3-regex || true
-python3 -m pip install --no-cache --upgrade pip==24.2 setuptools==72.1.0
-pip3 install --ignore-installed tox==4.11.3
+apk add --no-cache python3 py3-pip borgbackup postgresql17-client mariadb-client mongodb-tools \
+    py3-mongo py3-regex py3-ruamel.yaml py3-ruamel.yaml.clib py3-tox py3-typed-ast py3-yaml bash \
+    sqlite fish
 export COVERAGE_FILE=/tmp/.coverage
 
 tox --workdir /tmp/.tox --sitepackages
diff --git a/tests/end-to-end/docker-compose.yaml b/tests/end-to-end/docker-compose.yaml
index 12db770b..ab85bfc9 100644
--- a/tests/end-to-end/docker-compose.yaml
+++ b/tests/end-to-end/docker-compose.yaml
@@ -1,50 +1,50 @@
 services:
   postgresql:
-    image: docker.io/postgres:13.1-alpine
+    image: docker.io/postgres:17.2-alpine
     environment:
       POSTGRES_PASSWORD: test
       POSTGRES_DB: test
   postgresql2:
-    image: docker.io/postgres:13.1-alpine
+    image: docker.io/postgres:17.2-alpine
     environment:
       POSTGRES_PASSWORD: test2
       POSTGRES_DB: test
     command: docker-entrypoint.sh -p 5433
   mariadb:
-    image: docker.io/mariadb:10.11.4
+    image: docker.io/mariadb:11.4.4
     environment:
       MARIADB_ROOT_PASSWORD: test
       MARIADB_DATABASE: test
   mariadb2:
-    image: docker.io/mariadb:10.11.4
+    image: docker.io/mariadb:11.4.4
     environment:
       MARIADB_ROOT_PASSWORD: test2
       MARIADB_DATABASE: test
     command: docker-entrypoint.sh --port=3307
   not-actually-mysql:
-    image: docker.io/mariadb:10.11.4
+    image: docker.io/mariadb:11.4.4
     environment:
       MARIADB_ROOT_PASSWORD: test
       MARIADB_DATABASE: test
   not-actually-mysql2:
-    image: docker.io/mariadb:10.11.4
+    image: docker.io/mariadb:11.4.4
     environment:
       MARIADB_ROOT_PASSWORD: test2
       MARIADB_DATABASE: test
     command: docker-entrypoint.sh --port=3307
   mongodb:
-    image: docker.io/mongo:5.0.5
+    image: docker.io/mongo:7.0.16
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: test
   mongodb2:
-    image: docker.io/mongo:5.0.5
+    image: docker.io/mongo:7.0.16
     environment:
       MONGO_INITDB_ROOT_USERNAME: root2
       MONGO_INITDB_ROOT_PASSWORD: test2
     command: docker-entrypoint.sh --port=27018
   tests:
-    image: docker.io/alpine:3.13
+    image: docker.io/alpine:3.21
     environment:
       TEST_CONTAINER: true
     volumes:
diff --git a/tox.ini b/tox.ini
index c42caff4..087fdfaf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,10 +28,10 @@ commands =
 
 [testenv:end-to-end]
 package = editable
+system_site_packages = True
 deps =
     -r test_requirements.txt
-    pymongo==4.4.1
-       .
+    .
 pass_env = COVERAGE_FILE
 commands =
     pytest {posargs} --no-cov tests/end-to-end