From dee618a981e1a2f3e686880b108a11674b155357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Ra=C4=8Dinsk=C3=BD?= Date: Fri, 16 Oct 2026 09:51:17 +0200 Subject: [PATCH 1/3] ci: support for newer pythons --- .github/workflows/tests.yaml | 2 +- setup.cfg | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 858eaa8..c8d4b25 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "3.15"] pytest-version: [4, 5, 6, 7, 8, 9] exclude: - python-version: "3.8" diff --git a/setup.cfg b/setup.cfg index c004acf..3a7e428 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = pytest-docker -version = 3.2.5 +version = 3.2.6 description = Simple pytest fixtures for Docker and Docker Compose based tests long_description = file: README.md long_description_content_type = text/markdown @@ -19,6 +19,8 @@ classifiers = Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 Programming Language :: Python :: 3.13 + Programming Language :: Python :: 3.14 + Programming Language :: Python :: 3.15 License :: OSI Approved :: MIT License Topic :: Utilities Intended Audience :: Developers From 54b2cbccc27ba84be074282e8c8e43feac210127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Ra=C4=8Dinsk=C3=BD?= Date: Fri, 16 Oct 2026 11:18:02 +0200 Subject: [PATCH 2/3] chore: dropping older pytest versions --- .github/workflows/tests.yaml | 41 ++++++++++++++++++++++++++++++++---- setup.cfg | 2 +- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index c8d4b25..fde0036 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -8,12 +8,30 @@ jobs: strategy: matrix: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "3.15"] - pytest-version: [4, 5, 6, 7, 8, 9] + pytest-version: [6, 7, 8, 9] exclude: - python-version: "3.8" pytest-version: 9 - python-version: "3.9" pytest-version: 9 + - python-version: "3.11" + pytest-version: 6 + - python-version: "3.12" + pytest-version: 6 + - python-version: "3.13" + pytest-version: 6 + - python-version: "3.13" + pytest-version: 7 + - python-version: "3.14" + pytest-version: 6 + - python-version: "3.14" + pytest-version: 7 + - python-version: "3.15" + pytest-version: 6 + - python-version: "3.15" + pytest-version: 7 + - python-version: "3.15" + pytest-version: 8 steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -23,15 +41,30 @@ jobs: - name: Install dependencies, pytest ${{ matrix.pytest-version }} run: | python -m pip install --upgrade pip setuptools - pip install pytest==${{ matrix.pytest-version }} - pip install ".[tests]" + python -m pip install "pytest==${{ matrix.pytest-version }}.*" . "requests>=2.22.0,<3.0" - name: Build image run: | docker compose -f tests/docker-compose.yml pull docker compose -f tests/docker-compose.yml build - name: Run tests run: | - pytest -c setup.cfg + python -m pytest -c setup.cfg -o addopts= --verbose - name: Stop Docker compose + if: always() run: | docker compose -f tests/docker-compose.yml down + + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: "3.13" + - name: Install dependencies + run: | + python -m pip install --upgrade pip setuptools + python -m pip install "pytest==8.*" ".[tests]" + - name: Run static checks + run: | + python -m pytest -c setup.cfg -k "mypy or pycodestyle or pylint" diff --git a/setup.cfg b/setup.cfg index 3a7e428..c8cfedb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,7 +37,7 @@ package_dir= packages=pytest_docker install_requires = - pytest >=4.0, <10.0 + pytest >=6.2, <10.0 attrs >=19.2.0 [options.extras_require] From 85d0cfbccc54803b2e5387821591eb0dc4d21873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Ra=C4=8Dinsk=C3=BD?= Date: Fri, 16 Oct 2026 12:37:09 +0200 Subject: [PATCH 3/3] fix: support pytest 6 annotation loading [J:MLOPS-4034] --- src/pytest_docker/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pytest_docker/__init__.py b/src/pytest_docker/__init__.py index 23eb45c..efc27c0 100644 --- a/src/pytest_docker/__init__.py +++ b/src/pytest_docker/__init__.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import pytest from .plugin import (