Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 38 additions & 5 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,31 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
pytest-version: [4, 5, 6, 7, 8, 9]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
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 }}
Expand All @@ -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"
6 changes: 4 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -35,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]
Expand Down
2 changes: 2 additions & 0 deletions src/pytest_docker/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import pytest

from .plugin import (
Expand Down
Loading