diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 598f139..60e8331 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,10 +25,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.9 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Install dependencies run: | diff --git a/test/conftest.py b/test/conftest.py index dda20f6..d51793d 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -13,7 +13,7 @@ import docker import pytest import requests from _pytest._code.code import ReprExceptionInfo -from distutils.version import LooseVersion +from packaging.version import Version from docker.models.containers import Container from requests.packages.urllib3.util.connection import HAS_IPV6 @@ -557,5 +557,5 @@ try: except docker.errors.ImageNotFound: pytest.exit("The docker image 'nginxproxy/nginx-proxy:test' is missing") -if LooseVersion(docker.__version__) < LooseVersion("5.0.0"): +if Version(docker.__version__) < Version("5.0.0"): pytest.exit("This test suite is meant to work with the python docker module v5.0.0 or later") diff --git a/test/requirements/Dockerfile-nginx-proxy-tester b/test/requirements/Dockerfile-nginx-proxy-tester index 38ee31c..90f6c5b 100644 --- a/test/requirements/Dockerfile-nginx-proxy-tester +++ b/test/requirements/Dockerfile-nginx-proxy-tester @@ -1,4 +1,4 @@ -FROM python:3.9 +FROM python:3.12 ENV PYTEST_RUNNING_IN_CONTAINER=1 diff --git a/test/test_dockergen/test_dockergen.py b/test/test_dockergen/test_dockergen.py index b696e6c..6d419cd 100644 --- a/test/test_dockergen/test_dockergen.py +++ b/test/test_dockergen/test_dockergen.py @@ -1,11 +1,11 @@ import docker import pytest -from distutils.version import LooseVersion +from packaging.version import Version raw_version = docker.from_env().version()["Version"] pytestmark = pytest.mark.skipif( - LooseVersion(raw_version) < LooseVersion("1.13"), + Version(raw_version) < Version("1.13"), reason="Docker compose syntax v3 requires docker engine v1.13 or later (got {raw_version})" )