From 1c29a00a68743f67695478452762c8483412d84a Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 6 Jan 2026 17:46:08 +0000 Subject: [PATCH 1/4] Remove redundant packaging config from setup.cfg This is already indicated by pyproject.toml. Signed-off-by: Stephen Finucane --- pyproject.toml | 2 +- setup.cfg | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 32fb0dd..6af2e9e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=38.3.0", "wheel"] +requires = ["setuptools>=64.0.0"] build-backend = "setuptools.build_meta" [project] diff --git a/setup.cfg b/setup.cfg index 62ec0f8..5ddf1bd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,47 +1,3 @@ -# --- Project configuration ------------------------------------------------- - -[metadata] -name = wrapt -version = attr: wrapt.__version__ -readme = "RELEASE.rst" -author = Graham Dumpleton -author_email = Graham.Dumpleton@gmail.com -url = https://github.com/GrahamDumpleton/wrapt -description = Module for decorators, wrappers and monkey patching. -long_description = file: RELEASE.rst -long_description_content_type = text/x-rst -platform = any -keywords = wrapper, proxy, decorator -classifiers = - Development Status :: 5 - Production/Stable - Programming Language :: Python :: 3 - 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 - Programming Language :: Python :: Implementation :: PyPy -project_urls = - Bug Tracker = https://github.com/GrahamDumpleton/wrapt/issues/ - Changelog = https://wrapt.readthedocs.io/en/latest/changes.html - Documentation = https://wrapt.readthedocs.io/ - -[options] -zip_safe = false -python_requires = >= 3.9 -packages = find: -package_dir = - =src -test_suite = tests - -[options.packages.find] -where=src - -[bdist_wheel] -universal = false - # --- Test and coverage configuration ------------------------------------------ [coverage:run] From f5b0a8e768ce416eed3ae4fa2ffd05a03a0dd767 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 6 Jan 2026 17:56:22 +0000 Subject: [PATCH 2/4] Remove redundant pytest config from setup.cfg Once again, this is already indicated by pyproject.toml. Signed-off-by: Stephen Finucane --- setup.cfg | 5 ----- 1 file changed, 5 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5ddf1bd..dbda902 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,11 +14,6 @@ src = .tox/*/lib/*/site-packages/ .tox/pypy*/site-packages/ -[tool:pytest] -testpaths = ["tests"] -addopts = ["-v"] -norecursedirs = [".tox", ".venv", "venv", "build", "dist"] - # --- Tox automation configuration --------------------------------------------- [tox:tox] From f94ddad8b4df0f381243d292c233e83992e9c615 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 6 Jan 2026 17:53:36 +0000 Subject: [PATCH 3/4] Move tox configuration to tox.ini This might be better placed in pyproject.toml, but I have no idea how to do that while preserving the factor-based configuration. Signed-off-by: Stephen Finucane --- setup.cfg | 32 -------------------------------- tox.ini | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 32 deletions(-) create mode 100644 tox.ini diff --git a/setup.cfg b/setup.cfg index dbda902..a91747d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,35 +13,3 @@ src = src/ .tox/*/lib/*/site-packages/ .tox/pypy*/site-packages/ - -# --- Tox automation configuration --------------------------------------------- - -[tox:tox] -envlist = - py{39,310,311,312,313,314} - py{39,310,311,312,313,314}-{without,install,disable}-extensions, - pypy-without-extensions - -[gh-actions] -python = - 3.9: py39, py39-without-extensions, py39-install-extensions, py39-disable-extensions - 3.10: py310, py310-without-extensions, py310-install-extensions, py310-disable-extensions - 3.11: py311, py311-without-extensions, py311-install-extensions, py311-disable-extensions - 3.12: py312, py312-without-extensions, py312-install-extensions, py312-disable-extensions - 3.13: py313, py313-without-extensions, py313-install-extensions, py313-disable-extensions - 3.14: py314, py314-without-extensions, py314-install-extensions, py314-disable-extensions - pypy-3.9: pypy-without-extensions - pypy-3.10: pypy-without-extensions - -[testenv] -deps = - coverage - pytest -install_command = - python -m pip install --no-binary coverage {opts} {packages} -commands = - python -m coverage run --rcfile {toxinidir}/setup.cfg -m pytest -v {posargs} {toxinidir}/tests -setenv = - without-extensions: WRAPT_INSTALL_EXTENSIONS = false - install-extensions,disable-extensions: WRAPT_INSTALL_EXTENSIONS = true - disable-extensions: WRAPT_DISABLE_EXTENSIONS = true diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..77205f8 --- /dev/null +++ b/tox.ini @@ -0,0 +1,28 @@ +[tox] +envlist = + py{39,310,311,312,313,314} + py{39,310,311,312,313,314}-{without,install,disable}-extensions, + pypy-without-extensions + +[testenv] +deps = + coverage + pytest +install_command = python -m pip install --no-binary coverage {opts} {packages} +setenv = + without-extensions: WRAPT_INSTALL_EXTENSIONS = false + install-extensions,disable-extensions: WRAPT_INSTALL_EXTENSIONS = true + disable-extensions: WRAPT_DISABLE_EXTENSIONS = true +commands = + python -m coverage run --rcfile {toxinidir}/setup.cfg -m pytest -v {posargs} {toxinidir}/tests + +[gh-actions] +python = + 3.9: py39, py39-without-extensions, py39-install-extensions, py39-disable-extensions + 3.10: py310, py310-without-extensions, py310-install-extensions, py310-disable-extensions + 3.11: py311, py311-without-extensions, py311-install-extensions, py311-disable-extensions + 3.12: py312, py312-without-extensions, py312-install-extensions, py312-disable-extensions + 3.13: py313, py313-without-extensions, py313-install-extensions, py313-disable-extensions + 3.14: py314, py314-without-extensions, py314-install-extensions, py314-disable-extensions + pypy-3.9: pypy-without-extensions + pypy-3.10: pypy-without-extensions From 82e2abc0902d85715b475345cd9d02041875b7d7 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 6 Jan 2026 17:55:41 +0000 Subject: [PATCH 4/4] Move coverage configuration to pyproject.toml Signed-off-by: Stephen Finucane --- pyproject.toml | 17 +++++++++++++++++ setup.cfg | 15 --------------- tox.ini | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) delete mode 100644 setup.cfg diff --git a/pyproject.toml b/pyproject.toml index 6af2e9e..a787384 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -75,6 +75,23 @@ extend-exclude = ''' )/ ''' +# coverage configuration +[tool.coverage.run] +branch = true +relative_files = true +parallel = true +source = [ + "tests", + "wrapt", +] + +[tool.coverage.paths] +src = [ + "src/", + ".tox/*/lib/*/site-packages/", + ".tox/pypy*/site-packages/", +] + # pytest configuration [tool.pytest.ini_options] testpaths = ["tests"] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index a91747d..0000000 --- a/setup.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# --- Test and coverage configuration ------------------------------------------ - -[coverage:run] -branch = true -relative_files = true -parallel = true -source = - tests - wrapt - -[coverage:paths] -src = - src/ - .tox/*/lib/*/site-packages/ - .tox/pypy*/site-packages/ diff --git a/tox.ini b/tox.ini index 77205f8..33df451 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ setenv = install-extensions,disable-extensions: WRAPT_INSTALL_EXTENSIONS = true disable-extensions: WRAPT_DISABLE_EXTENSIONS = true commands = - python -m coverage run --rcfile {toxinidir}/setup.cfg -m pytest -v {posargs} {toxinidir}/tests + python -m coverage run --rcfile {toxinidir}/pyproject.toml -m pytest -v {posargs} {toxinidir}/tests [gh-actions] python =