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
18 changes: 9 additions & 9 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
python-version: ["3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
python-version: ["3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
python-version: ["3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
python-version: ["3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
python-version: ["3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
python-version: ["3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down Expand Up @@ -246,7 +246,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
python-version: ["3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
python-version: ["3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down Expand Up @@ -314,7 +314,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
python-version: ["3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
os: ["blacksmith-4vcpu-ubuntu-2204"]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
rev: v3.19.1
hooks:
- id: pyupgrade
args: ["--py38-plus"]
args: ["--py39-plus"]

- repo: https://github.com/PyCQA/autoflake
rev: v2.3.1
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.12"
python: "3.13"
jobs:
post_create_environment:
# Install poetry
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ What do I need?
.. sidebar:: Version Requirements
:subtitle: pytest-celery version 1.0 runs on

- Python ❨3.8, 3.9, 3.10, 3.11, 3.12❩
- Python ❨3.9, 3.10, 3.11, 3.12, 3.13, 3.14

The pytest-celery plugin is Celery-agnostic, and should work with virtually any version of Celery.

Expand Down
4,870 changes: 1,478 additions & 3,392 deletions poetry.lock

Large diffs are not rendered by default.

93 changes: 20 additions & 73 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ classifiers = [
"Framework :: Celery",
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: Implementation :: CPython",
"Operating System :: OS Independent",
]
Expand All @@ -75,7 +75,7 @@ search = ':Version: {current_version}'
replace = ':Version: {new_version}'

[tool.poetry.dependencies]
python = ">=3.8,<4.0"
python = ">=3.9,<4.0"
celery = { version = "*", allow-prereleases = true }
kombu = { version = "*", allow-prereleases = true }
redis = { version = "*", optional = true }
Expand All @@ -98,100 +98,47 @@ sqs = ["boto3", "botocore", "urllib3"]
[tool.poetry.group.dev]

[tool.poetry.group.dev.dependencies]
poetry-bumpversion = [
{ version = "^0.3.2", python = "<3.9.0" },
{ version = ">=0.3.3", python = ">=3.9.0,<4.0" },
]
poetry-bumpversion = ">=0.3.3"
black = "*"
toml-sort = [
{ version = ">=0.22.0,<0.24.0", python = ">=3.8,<3.9" },
{ version = ">=0.24.2", python = ">=3.9,<4.0" },
]
autoflake = [
{ version = "^1.7.0", python = "<3.8.1" },
{ version = ">=2.3.1", python = ">=3.8.1,<4.0" },
]
isort = [
{ version = "^5.11.0", python = "<3.9.0" },
{ version = ">=6.0.0", python = ">=3.9.0,<4.0" },
]
flake8 = [
{ version = "^5.0.0", python = "<3.8.1" },
{ version = "^6.0.0", python = ">=3.8.1,<3.9.0" },
{ version = ">=7.1.2", python = ">=3.9.0,<4.0" },
]
pre-commit = [
{ version = "^2.21.0", python = "<3.8.0" },
{ version = "^3.1.0", python = ">=3.8.0,<3.9.0" },
{ version = "^4.1.0", python = ">=3.9.0,<4.0" },
]
mypy = [
{ version = ">=1.12.0", python = "<3.9.0" },
{ version = ">=1.15.0", python = ">=3.9.0,<4.0" },
]
toml-sort = ">=0.24.2"
autoflake = ">=2.3.1"
isort = ">=6.0.0"
flake8 = ">=7.1.2"
pre-commit = "^4.1.0"
mypy = ">=1.15.0"
types-redis = ">=4.6.0.20241004"
cleanpy = [
{ version = "^0.5.0", python = "<3.9.0" },
{ version = ">=0.5.1", python = ">=3.9.0,<4.0" },
]
cleanpy = ">=0.5.1"

[tool.poetry.group.test]
optional = true

[tool.poetry.group.test.dependencies]
pytest = "^8.3.4"
coverage = [
{ version = "^7.0.0", python = "<3.9" },
{ version = ">=7.6.12", python = ">=3.9,<4.0" },
]
pytest-sugar = { version = ">=1.0.0", python = ">=3.8,<4.0" }
pytest-cov = [
{ version = ">=5.0.0,<6.0.0", python = ">=3.8,<3.9" },
{ version = ">=6.0.0", python = ">=3.9,<4.0" },
]
coverage = ">=7.6.12"
pytest-sugar = ">=1.0.0"
pytest-cov = ">=6.0.0"
pytest-xdist = ">=3.6.1"
pytest-subtests = [
{ version = "*", python = ">=3.8,<3.9" },
{ version = "^0.14.0", python = ">=3.9,<4.0" },
]
pytest-rerunfailures = [
{ version = ">=14.0,<15.0", python = ">=3.8,<3.9" },
{ version = ">=15.0", python = ">=3.9,<4.0" },
]
pytest-subtests = "^0.14.0"
pytest-rerunfailures = ">=15.0"

[tool.poetry.group.ci]
optional = true

[tool.poetry.group.ci.dependencies]
tox = [
{ version = "^3.0.0", python = "<3.8.1" },
{ version = ">=4.24.1", python = ">=3.8.1,<4.0" },
]
tox-gh-actions = [
{ version = "^2.0.0", python = "<3.8.1" },
{ version = ">=3.2.0", python = ">=3.8.1,<4.0" },
]
tox = ">=4.24.1"
tox-gh-actions = ">=3.2.0"

[tool.poetry.group.docs]
optional = true

[tool.poetry.group.docs.dependencies]
sphinx_celery = ">=2.1.3"
Sphinx = [
{ version = "^7.1.0", python = "<3.9" },
{ version = ">=7.0.0", python = ">=3.9,<4.0" },
]
Sphinx = ">=7.0.0"
sphinx-testing = ">=1.0.1"
sphinx-click = ">=6.0.0"
sphinx-autobuild = [
{ version = ">=2021.3.14", python = "<3.9" },
{ version = ">=2024.4.16", python = ">=3.9,<4.0" },
]
sphinx-autobuild = ">=2024.4.16"
sphinxcontrib-mermaid = ">=1.0.0"
docutils = [
{ version = "0.20.1", python = "<3.9.0" },
{ version = ">=0.20.1", python = ">=3.9.0,<4.0" },
]
docutils = ">=0.20.1"

[tool.poetry.plugins.pytest11]
celery = "pytest_celery.plugin"
Expand Down
2 changes: 1 addition & 1 deletion src/pytest_celery/api/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from __future__ import annotations

from abc import abstractmethod
from typing import Iterator
from collections.abc import Iterator

import pytest_docker_tools
from celery import Celery
Expand Down
2 changes: 1 addition & 1 deletion src/pytest_celery/vendors/worker/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from __future__ import annotations

import time
from collections.abc import Iterable
from typing import Any
from typing import Iterable

import celery.utils
from celery import Task
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ requires =
tox>4
tox-gh-actions
envlist =
{py38,py39,py310,py311,py312,py313}-unit
{py38,py39,py310,py311,py312,py313}-integration
{py38,py39,py310,py311,py312,py313}-smoke
{py39,py310,py311,py312,py313,py314}-unit
{py39,py310,py311,py312,py313,py314}-integration
{py39,py310,py311,py312,py313,py314}-smoke
suicide_timeout = 1

[gh-actions]
python =
3.8: py38-unit, py38-integration, py38-smoke
3.9: py39-unit, py39-integration, py39-smoke
3.10: py310-unit, py310-integration, py310-smoke
3.11: py311-unit, py311-integration, py311-smoke
3.12: py312-unit, py312-integration, py312-smoke
3.13: py313-unit, py313-integration, py313-smoke
3.14: py314-unit, py314-integration, py314-smoke

[testenv]
description = Run tests using {basepython}
Expand All @@ -31,12 +31,12 @@ commands =
integration: poetry run pytest tests/integration/ --exitfirst --dist=loadscope {posargs}
smoke: poetry run pytest tests/smoke/ --exitfirst --dist=loadscope {posargs}
basepython =
3.8: py38
3.9: py39
3.10: py310
3.11: py311
3.12: py312
3.13: py313
3.14: py314
mypy: py313
lint: py313
clean: py313
Expand Down