Browse Source

Upgrade dependencies and containers for end-to-end tests.

Dan Helfman 5 months ago
parent
commit
a6b6dd32c1
3 changed files with 14 additions and 17 deletions
  1. 3 6
      scripts/run-full-tests
  2. 9 9
      tests/end-to-end/docker-compose.yaml
  3. 2 2
      tox.ini

+ 3 - 6
scripts/run-full-tests

@@ -17,12 +17,9 @@ if [ -z "$TEST_CONTAINER" ]; then
     exit 1
     exit 1
 fi
 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
 export COVERAGE_FILE=/tmp/.coverage
 
 
 tox --workdir /tmp/.tox --sitepackages
 tox --workdir /tmp/.tox --sitepackages

+ 9 - 9
tests/end-to-end/docker-compose.yaml

@@ -1,50 +1,50 @@
 services:
 services:
   postgresql:
   postgresql:
-    image: docker.io/postgres:13.1-alpine
+    image: docker.io/postgres:17.2-alpine
     environment:
     environment:
       POSTGRES_PASSWORD: test
       POSTGRES_PASSWORD: test
       POSTGRES_DB: test
       POSTGRES_DB: test
   postgresql2:
   postgresql2:
-    image: docker.io/postgres:13.1-alpine
+    image: docker.io/postgres:17.2-alpine
     environment:
     environment:
       POSTGRES_PASSWORD: test2
       POSTGRES_PASSWORD: test2
       POSTGRES_DB: test
       POSTGRES_DB: test
     command: docker-entrypoint.sh -p 5433
     command: docker-entrypoint.sh -p 5433
   mariadb:
   mariadb:
-    image: docker.io/mariadb:10.11.4
+    image: docker.io/mariadb:11.4.4
     environment:
     environment:
       MARIADB_ROOT_PASSWORD: test
       MARIADB_ROOT_PASSWORD: test
       MARIADB_DATABASE: test
       MARIADB_DATABASE: test
   mariadb2:
   mariadb2:
-    image: docker.io/mariadb:10.11.4
+    image: docker.io/mariadb:11.4.4
     environment:
     environment:
       MARIADB_ROOT_PASSWORD: test2
       MARIADB_ROOT_PASSWORD: test2
       MARIADB_DATABASE: test
       MARIADB_DATABASE: test
     command: docker-entrypoint.sh --port=3307
     command: docker-entrypoint.sh --port=3307
   not-actually-mysql:
   not-actually-mysql:
-    image: docker.io/mariadb:10.11.4
+    image: docker.io/mariadb:11.4.4
     environment:
     environment:
       MARIADB_ROOT_PASSWORD: test
       MARIADB_ROOT_PASSWORD: test
       MARIADB_DATABASE: test
       MARIADB_DATABASE: test
   not-actually-mysql2:
   not-actually-mysql2:
-    image: docker.io/mariadb:10.11.4
+    image: docker.io/mariadb:11.4.4
     environment:
     environment:
       MARIADB_ROOT_PASSWORD: test2
       MARIADB_ROOT_PASSWORD: test2
       MARIADB_DATABASE: test
       MARIADB_DATABASE: test
     command: docker-entrypoint.sh --port=3307
     command: docker-entrypoint.sh --port=3307
   mongodb:
   mongodb:
-    image: docker.io/mongo:5.0.5
+    image: docker.io/mongo:7.0.16
     environment:
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: test
       MONGO_INITDB_ROOT_PASSWORD: test
   mongodb2:
   mongodb2:
-    image: docker.io/mongo:5.0.5
+    image: docker.io/mongo:7.0.16
     environment:
     environment:
       MONGO_INITDB_ROOT_USERNAME: root2
       MONGO_INITDB_ROOT_USERNAME: root2
       MONGO_INITDB_ROOT_PASSWORD: test2
       MONGO_INITDB_ROOT_PASSWORD: test2
     command: docker-entrypoint.sh --port=27018
     command: docker-entrypoint.sh --port=27018
   tests:
   tests:
-    image: docker.io/alpine:3.13
+    image: docker.io/alpine:3.21
     environment:
     environment:
       TEST_CONTAINER: true
       TEST_CONTAINER: true
     volumes:
     volumes:

+ 2 - 2
tox.ini

@@ -28,10 +28,10 @@ commands =
 
 
 [testenv:end-to-end]
 [testenv:end-to-end]
 package = editable
 package = editable
+system_site_packages = True
 deps =
 deps =
     -r test_requirements.txt
     -r test_requirements.txt
-    pymongo==4.4.1
-       .
+    .
 pass_env = COVERAGE_FILE
 pass_env = COVERAGE_FILE
 commands =
 commands =
     pytest {posargs} --no-cov tests/end-to-end
     pytest {posargs} --no-cov tests/end-to-end