From 9ece0a0513d8f4baf10d8952687a5ff2abb75a26 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Sat, 25 Jan 2025 23:57:35 -0500 Subject: [PATCH 1/7] Fix the wheel packaging. --- pyproject.toml | 3 ++- src/tap/__init__.py | 2 +- uv.lock | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a0d62dd..e21e1b3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "tap.py" -version = "3.2" +version = "3.2.1" description = "Test Anything Protocol (TAP) tools" readme = "docs/releases.rst" license = {text = "BSD"} @@ -55,6 +55,7 @@ sources = ["src"] [tool.hatch.build.targets.wheel] include = ["src/*", "docs/releases.rst", "LICENSE"] sources = ["src"] +packages = ["tap"] [tool.pytest.ini_options] pythonpath = [".", "src"] diff --git a/src/tap/__init__.py b/src/tap/__init__.py index db3708a..32135d3 100644 --- a/src/tap/__init__.py +++ b/src/tap/__init__.py @@ -1,4 +1,4 @@ from .runner import TAPTestRunner __all__ = ["TAPTestRunner"] -__version__ = "3.2" +__version__ = "3.2.1" diff --git a/uv.lock b/uv.lock index 67b438e..ca7db9a 100644 --- a/uv.lock +++ b/uv.lock @@ -668,7 +668,7 @@ wheels = [ [[package]] name = "tap-py" -version = "3.2" +version = "3.2.1" source = { editable = "." } [package.optional-dependencies] From b136c6a2188fd1e3a522b4024e6b85827bf34b71 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Sun, 26 Jan 2025 00:09:14 -0500 Subject: [PATCH 2/7] wheel won't have release.rst. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e21e1b3..b7bbe9b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ include = ["src/*", "docs/releases.rst", "LICENSE"] sources = ["src"] [tool.hatch.build.targets.wheel] -include = ["src/*", "docs/releases.rst", "LICENSE"] +include = ["src/*", "LICENSE"] sources = ["src"] packages = ["tap"] From f16f54d1a08b1fde6279290d707564f84ac4fda8 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Sun, 26 Jan 2025 00:29:12 -0500 Subject: [PATCH 3/7] Trim down what is included. --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b7bbe9b..3c03f92 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,11 +49,11 @@ requires = ["hatchling"] build-backend = "hatchling.build" [tool.hatch.build.targets.sdist] -include = ["src/*", "docs/releases.rst", "LICENSE"] +include = ["src/*"] sources = ["src"] [tool.hatch.build.targets.wheel] -include = ["src/*", "LICENSE"] +include = ["src/*"] sources = ["src"] packages = ["tap"] From 053e77ca21b7c2455a849a15ef97b1ef2a57dde5 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Sun, 26 Jan 2025 01:08:16 -0500 Subject: [PATCH 4/7] Update the sdist and wheel include config. --- MANIFEST.in | 5 ----- pyproject.toml | 10 ++++++++-- 2 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 5b23b27..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,5 +0,0 @@ -include AUTHORS -include LICENSE -include README.md -recursive-include docs * -prune docs/_build diff --git a/pyproject.toml b/pyproject.toml index 3c03f92..7930826 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,11 +49,17 @@ requires = ["hatchling"] build-backend = "hatchling.build" [tool.hatch.build.targets.sdist] -include = ["src/*"] +include = [ + "/src", + "/docs", + "/tests", +] sources = ["src"] [tool.hatch.build.targets.wheel] -include = ["src/*"] +include = [ + "/src", +] sources = ["src"] packages = ["tap"] From 92d0dff1bfdbd88bca7bf28fb765b84a5a59f095 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Sun, 26 Jan 2025 01:17:51 -0500 Subject: [PATCH 5/7] Fix tox integration test. --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 2d2aa33..8b40ebd 100644 --- a/tox.ini +++ b/tox.ini @@ -24,9 +24,8 @@ deps = pytest pytest-tap commands = - pytest --tap-files --tap-outdir=results src/tap + pytest --tap-files --tap-outdir=results {envsitepackagesdir}/tap tappy results -package = editable [testenv:coverage] setenv = From 2c68a314c47f6fbea68c2ef9b7ae5cd695d900c7 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Sun, 26 Jan 2025 01:22:43 -0500 Subject: [PATCH 6/7] Fix more of the extra tests. --- tox.ini | 3 --- 1 file changed, 3 deletions(-) diff --git a/tox.ini b/tox.ini index 8b40ebd..493b398 100644 --- a/tox.ini +++ b/tox.ini @@ -8,16 +8,13 @@ deps = pyyaml more-itertools commands = python tests/run.py -package = editable [testenv:runner] commands = python tests/run.py -package = editable [testenv:module] commands = python -m tap changedir = src -package = editable [testenv:integration] deps = From cbd2eb181859587921968f4ec1310fe09bdfc401 Mon Sep 17 00:00:00 2001 From: Matt Layman Date: Sun, 26 Jan 2025 13:27:31 -0500 Subject: [PATCH 7/7] Simplify wheel config. --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7930826..b0d617c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,9 +57,6 @@ include = [ sources = ["src"] [tool.hatch.build.targets.wheel] -include = [ - "/src", -] sources = ["src"] packages = ["tap"]