diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0d725ce..4b8d66a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ['3.10', '3.11', '3.12', '3.13', '3.14'] + python: ['3.11', '3.12', '3.13', '3.14', '3.15'] steps: - name: Checkout source code uses: actions/checkout@v7 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 47cb558..b9ed7bf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.16.6 + rev: v0.17.0 hooks: - id: ruff-check args: ['--fix', '--unsafe-fixes'] diff --git a/pyproject.toml b/pyproject.toml index c7dc5cc..e347c00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["pbr>=6.1.1"] +requires = ["pbr>=7.1.0"] build-backend = "pbr.build" [project] @@ -14,8 +14,8 @@ maintainers = [ ] readme = {file = "README.rst", content-type = "text/x-rst"} license = "GPL-2.0" -dynamic = ["version", "dependencies"] -requires-python = ">=3.10" +dynamic = ["version"] +requires-python = ">=3.11" keywords = ["patchwork", "api"] classifiers = [ "Development Status :: 5 - Production/Stable", @@ -28,6 +28,15 @@ classifiers = [ "Operating System :: OS Independent", ] +[dependency-groups] +test = [ + "pytest", + "pytest-cov", +] +typing = [ + "mypy", +] + [project.urls] "Bug Tracker" = "https://github.com/getpatchwork/pwclient/issues" "Source Code" = "https://github.com/getpatchwork/pwclient" @@ -36,10 +45,8 @@ classifiers = [ [project.scripts] pwclient = "pwclient.shell:main" -[tool.setuptools] -packages = [ - "pwclient" -] +[tool.setuptools.packages.find] +include = ["pwclient*"] [tool.ruff] line-length = 79 diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 359a9bf..0000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[metadata] -name = pwclient diff --git a/setup.py b/setup.py deleted file mode 100644 index aa2d8a0..0000000 --- a/setup.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python - -from setuptools import setup - -setup( - setup_requires=['pbr'], - pbr=True, -) diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index 9955dec..0000000 --- a/test-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pytest -pytest-cov diff --git a/tox.ini b/tox.ini index 6581048..86b292a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] minversion = 4.6.0 -envlist = pep8,clean,py{39,310,311,312,313},report,docs,man +envlist = pep8,clean,py{311,312,313,314,315},report,docs,man [testenv] -deps = - -r{toxinidir}/test-requirements.txt +dependency_groups = + test commands = pytest -Wall --cov=pwclient --cov-report term-missing {posargs} @@ -16,9 +16,9 @@ commands = pre-commit run --all-files --show-diff-on-failure [testenv:mypy] -deps= - mypy -commands= +dependency_groups = + typing +commands = mypy {posargs:--ignore-missing-imports --follow-imports=skip} pwclient [testenv:report] @@ -57,6 +57,3 @@ commands = --url https://github.com/getpatchwork/patchwork \ --author="Patchwork Developers" --author-email="patchwork@lists.ozlabs.org" \ --module pwclient.parser --function get_parser > man/pwclient.1' - -[flake8] -show-source = true