3 Commits

Author SHA1 Message Date
nvaldez aa813f0c89 fix: README repo-relative links 404 on PyPI (v0.13.1)
PyPI renders the README alone; ./INSTALL.md, ./SPEC.md and
./CHANGELOG.md have nothing to resolve against. Links now point
at the public Gitea repository (anchors kept). 0.13.0's page is
immutable and keeps its broken links; the project page shows the
newest release's README. Found by the owner on the 0.13.0 page.

Generated by Mistral Vibe.
Co-Authored-By: Mistral Vibe <vibe@mistral.ai>
2026-11-19 11:06:27 +01:00
nvaldez bd1a10487c feat: PyPI distribution renamed daedalus-tools; PEP 625 artifact names (v0.13.0)
PyPI policy-blocks the plain name: the 0.12.1 upload was rejected
with "The name 'daedalus' isn't allowed" (near the existing
daedalus-cli and pydaedalus projects). The distribution is now
daedalus-tools; command, imports, registry, and the repository
name stay daedalus. hello's installed-version lookup follows.
publish now derives artifact file names from the PEP 625
normalized name (daedalus_tools-<version>.tar.gz) - with a
hyphenated project name the previously constructed names would
have missed what setuptools writes to dist/ (publish spec 3.2,
new regression test).

Generated by Mistral Vibe.
Co-Authored-By: Mistral Vibe <vibe@mistral.ai>
2026-11-19 10:58:33 +01:00
nvaldez 6145ae33e8 fix: publish tag guard - v<version> must be among git tag --points-at (v0.12.1)
The first live run of daedalus publish on the v0.12.0 release was
rejected by its own tag guard: git describe --exact-match returns
whichever name git picks (here: latest), not the version tag, when
several tags share the release commit. The guard now checks that
v<version> is among git tag --points-at HEAD; moving tags on the
same commit are fine (publish spec 3.3.2, reproduced by a new test).

Generated by Mistral Vibe.
Co-Authored-By: Mistral Vibe <vibe@mistral.ai>
2026-11-19 10:33:56 +01:00
11 changed files with 146 additions and 49 deletions
+47
View File
@@ -10,6 +10,53 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and
- Nothing yet.
## [0.13.1] - 2026-11-19
### Fixed in 0.13.1
- The PyPI README's repo-relative links (`./INSTALL.md`,
`./SPEC.md`, `./CHANGELOG.md`) 404 on pypi.org - the package
metadata holds only the README itself. They now point at the
public Gitea repository
(`https://gitea.nolivaldeziii.com/nvaldez/daedalus/src/branch/main/...`)
with their anchors kept. 0.13.0's already-published page keeps
its broken links (PyPI metadata is immutable); the project page
shows the newest release's README. Found by the owner on the
0.13.0 page.
## [0.13.0] - 2026-11-19
### Changed in 0.13.0
- PyPI distribution renamed to **`daedalus-tools`** (from `daedalus`):
PyPI policy-blocks the plain name - the upload of 0.12.1 was rejected
with "The name 'daedalus' isn't allowed" (near the existing
`daedalus-cli` and `pydaedalus` projects). The `daedalus` command, the
`daedalus` import package, the registry, and the repository are
unchanged; only the value of `[project] name` (and hello's installed
version lookup) moved. `pipx install daedalus-tools` puts the same
`daedalus` CLI on PATH (SPEC item 9.1).
### Fixed in 0.13.0
- `publish`'s artifact names now use the PEP 625 normalized name
(`daedalus-tools` -> `daedalus_tools-0.13.0.tar.gz`), matching what
setuptools actually writes to `dist/`; with a hyphenated project name
the constructed names would have missed the files. PyPI's version
probe keeps using the project name as written (publish spec 3.2).
## [0.12.1] - 2026-11-19
### Fixed in 0.12.1
- `publish`'s tag guard rejected a correctly tagged release when
`latest` (or any other tag) shared the release commit: `git describe
--tags --exact-match` returns whichever name git picks, not the
version tag. The guard now checks that `v<version>` is among
`git tag --points-at HEAD` (membership check, publish spec item
3.3.2); moving tags on the same commit are fine. Found by the first
live run of `daedalus publish` on the v0.12.0 release.
## [0.12.0] - 2026-11-19
### Added in 0.12.0
+6 -8
View File
@@ -17,23 +17,21 @@ Back to the [script list](./README.md#available-scripts). Repository rules:
### With pipx (recommended)
[pipx](https://pipx.pypa.io/) installs daedalus into its own environment
and puts the `daedalus` command on `PATH`.
[pipx](https://pipx.pypa.io/) installs the `daedalus-tools` distribution
(from PyPI or Git) into its own environment and puts the `daedalus`
command on `PATH` — the project name and the command differ on purpose
(plain `daedalus` is policy-blocked on PyPI; see SPEC item 9.1).
Linux (Debian 12): paste once; open a new shell if `pipx` was just
installed. Run the same block again to refresh from Git (`main`); do **not**
use `pipx upgrade daedalus` for Git installs — it does not pull the repo.
use `pipx upgrade daedalus-tools` for Git installs — it does not pull the repo.
```bash
daedalus_pipx_install() {
r="${1:-git+ssh://git@example.com/your-org/daedalus.git@main}"
command -v pipx >/dev/null || sudo apt install -y pipx
pipx ensurepath 2>/dev/null || pipx ensurepath --force
if pipx list --short 2>/dev/null | grep -qE '^daedalus '; then
pipx install --force "$r"
else
pipx install "$r"
fi
pipx install --force "$r"
daedalus --version
}; daedalus_pipx_install
```
+5 -5
View File
@@ -9,9 +9,9 @@ daedalus <category> [category...] # list scripts in the categories (AND)
daedalus --list # list everything
```
**[Install, usage, and development](./INSTALL.md)** ·
[SPEC](./SPEC.md) (how the repo is maintained) ·
[CHANGELOG](./CHANGELOG.md)
**[Install, usage, and development](https://gitea.nolivaldeziii.com/nvaldez/daedalus/src/branch/main/INSTALL.md)** ·
[SPEC](https://gitea.nolivaldeziii.com/nvaldez/daedalus/src/branch/main/SPEC.md) (how the repo is maintained) ·
[CHANGELOG](https://gitea.nolivaldeziii.com/nvaldez/daedalus/src/branch/main/CHANGELOG.md)
## Available scripts
@@ -180,7 +180,7 @@ Bash (and other shells argcomplete supports) completes script names and
category labels: `daedalus hel` + TAB completes `hello`, `daedalus test h` +
TAB completes `hello` inside the category, and options complete after `-`.
Run `daedalus init` once to register the hook in `~/.bashrc` (below); see
also [INSTALL](./INSTALL.md#tab-completion).
also [INSTALL](https://gitea.nolivaldeziii.com/nvaldez/daedalus/src/branch/main/INSTALL.md#tab-completion).
### init
@@ -232,7 +232,7 @@ check failed, `9` upload failed.
1. Clone or copy this template and name the Git remote for your team.
2. Add a script under `python/src/`, `bash/`, `powershell/`, or `batch/`
(see [SPEC layout](./SPEC.md#2-layout)); bash scripts implement the
(see [SPEC layout](https://gitea.nolivaldeziii.com/nvaldez/daedalus/src/branch/main/SPEC.md#2-layout)); bash scripts implement the
shared `help()` interface (SPEC item 6.10).
3. Register it in `daedalus/registry.py`, add a row to the table above,
write tests, bump `version` in `pyproject.toml`, and run
+5 -2
View File
@@ -616,8 +616,11 @@ autotest results
## 9. Packaging
- **9.1** `pyproject.toml` builds one wheel (setuptools 68 or newer) named
`daedalus` that holds the CLI and every script. It requires Python
- **9.1** The PyPI distribution is named `daedalus-tools` (plain
`daedalus` is policy-blocked on PyPI - near the existing
`daedalus-cli`/`pydaedalus` projects; command and import names
stay `daedalus`). `pyproject.toml` builds one wheel (setuptools 68
or newer) that holds the CLI and every script. It requires Python
3.11 or newer.
| Command | Use |
+1 -1
View File
@@ -150,7 +150,7 @@ def test_path_with_extra_words_is_a_usage_error(fake_registry, plain, capsys):
assert "usage: daedalus --path <name>" in capsys.readouterr().err
@pytest.mark.parametrize("installed, expected", [(True, "daedalus 1.2.3"), (False, "daedalus 0.12.0")])
@pytest.mark.parametrize("installed, expected", [(True, "daedalus 1.2.3"), (False, "daedalus 0.13.1")])
def test_version(monkeypatch, capsys, installed, expected):
"""--version uses metadata or pyproject.toml in a checkout."""
def fake_version(_name):
+2 -2
View File
@@ -3,8 +3,8 @@ requires = ["setuptools>=68"]
build-backend = "setuptools.build_meta"
[project]
name = "daedalus"
version = "0.12.0"
name = "daedalus-tools"
version = "0.13.1"
description = "Template for daedalus: loose scripts in one repo, run with: daedalus <name> [args...]"
readme = "README.md"
requires-python = ">=3.11"
+1 -1
View File
@@ -23,7 +23,7 @@ UNKNOWN = "unknown"
def app_version() -> str:
"""Installed daedalus version, else the checkout pyproject, else 'unknown'."""
try:
return importlib.metadata.version("daedalus") # plain and editable installs
return importlib.metadata.version("daedalus-tools") # plain and editable installs
except importlib.metadata.PackageNotFoundError:
pass
# A checkout that is not installed: python/src/hello/hello.py -> pyproject.toml
+15 -9
View File
@@ -14,6 +14,7 @@ from __future__ import annotations
import argparse
import logging
import pathlib
import re
import subprocess
import sys
import tomllib
@@ -81,11 +82,15 @@ def pypi_status(url: str) -> int | None:
def artifact_names(name: str, version: str) -> tuple[str, str]:
"""The version's sdist and wheel file names (items 3.4-3.7).
File names use the PEP 625 normalized name (lowercase, runs
of `-._` collapsed to one underscore - what setuptools
writes to dist/); the PyPI JSON probe uses `name` as written.
The wheel is a pure-Python wheel (SPEC item 9.1), so its name
follows ``<name>-<version>-py3-none-any.whl``.
follows ``<normalized>-<version>-py3-none-any.whl``.
"""
return (f"{name}-{version}.tar.gz",
f"{name}-{version}-py3-none-any.whl")
safe = re.sub(r"[-_.]+", "_", name).lower()
return (f"{safe}-{version}.tar.gz",
f"{safe}-{version}-py3-none-any.whl")
def cmd_publish(args: argparse.Namespace, run_cmd=None,
@@ -118,12 +123,13 @@ def cmd_publish(args: argparse.Namespace, run_cmd=None,
"or stash first - what ships must be committed "
"(item 3.3.1)")
return EXIT_DIRTY
code, output = run_cmd(["git", "describe", "--tags", "--exact-match",
"HEAD"], cwd=root)
if code != 0 or output.strip() != f"v{version}":
LOGGER.error("HEAD is not exactly tagged v%s; tag the release "
"first: git tag -a v%s -m \"...\" (item 3.3.2)",
version, version)
code, output = run_cmd(["git", "tag", "--points-at", "HEAD"], cwd=root)
tags = [line.strip() for line in output.splitlines() if line.strip()]
if code != 0 or f"v{version}" not in tags:
LOGGER.error("v%s is not among the tags pointing at HEAD "
"(found: %s); tag the release first: git tag -a "
"v%s -m \"...\" (item 3.3.2)",
version, tags or "none", version)
return EXIT_TAG
for module in ("build", "twine"):
code, _output = run_cmd([PY, "-m", module, "--version"], cwd=root)
+13 -5
View File
@@ -33,15 +33,20 @@ are cited as `publish spec item N.M`.
exit 2.
- **3.2** Version: read from `[project] version` in that
`pyproject.toml` (tomllib); project name for PyPI checks from
`[project] name`.
`[project] name`. Artifact *file names* use the PEP 625
normalized name (lowercase, runs of `-._` collapsed to one
`_`, e.g. `daedalus-tools` -> `daedalus_tools-<version>.tar.gz`);
the PyPI JSON probe uses the project name as written.
- **3.3** Guards, in order, each stopping before anything is
built:
- **3.3.1** Dirty working tree (`git status --porcelain` in the
repo root, any output) is exit 3 - what ships must be what is
committed, and the tag must cover the exact tree.
- **3.3.2** HEAD not exactly tagged `v<version>`
(`git describe --tags --exact-match HEAD`) is exit 4 - tag
first: `git tag -a v<version> -m ...`.
- **3.3.2** `v<version>` not among the tags that point at HEAD
(`git tag --points-at HEAD`) is exit 4 - tag the release
first: `git tag -a v<version> -m ...`. Other tags on the
same commit (`latest`, `stable`) are fine; the guard checks
membership, not the name git happens to pick.
- **3.3.3** The interpreter must provide `python -m build` and
`python -m twine` (`--version` probe each); a failure is exit 5
with the inject hint (`pipx inject daedalus build twine`, or
@@ -108,4 +113,7 @@ are cited as `publish spec item N.M`.
- **7.1** Packaging truth: SPEC items 9.1-9.5, 9.2.1.
- **7.2** Repository rules: SPEC items 6.6 (tests), 9.8 (version
bump).
- **7.3** History: `CHANGELOG.md` entry 0.12.0.
- **7.3** History: `CHANGELOG.md` entries 0.12.0 (script),
0.12.1 (tag-guard fix, found by the first live run), 0.13.0
(PEP 625 artifact names; distribution renamed daedalus-tools
after PyPI refused the name daedalus).
+1 -1
View File
@@ -34,7 +34,7 @@ def test_app_version_falls_back_to_pyproject(monkeypatch):
raise hello.importlib.metadata.PackageNotFoundError(_name)
monkeypatch.setattr(hello.importlib.metadata, "version", not_found)
assert hello.app_version() == "0.12.0"
assert hello.app_version() == "0.13.1"
def test_help_exits_zero(capsys):
+50 -15
View File
@@ -28,7 +28,7 @@ def clean_runner(version, calls=None):
py = publish.PY
return make_runner({
("git", "status"): (0, ""),
("git", "describe"): (0, f"v{version}\n"),
("git", "tag", "--points-at"): (0, f"v{version}\n"),
(py, "-m", "build", "--version"): (0, "build 1.6.1\n"),
(py, "-m", "twine", "--version"): (0, "twine 7.0.0\n"),
(py, "-m", "build"): (0, "Successfully built\n"),
@@ -61,7 +61,7 @@ def test_dirty_tree_stops_before_building():
args = publish.parse_args([])
assert publish.cmd_publish(args, runner,
lambda _u: 404) == 3
assert not any(cmd[0] == "git" and cmd[1] == "describe"
assert not any(cmd[:2] == ["git", "tag"]
or cmd[1:3] == ["-m", "build"]
for cmd, _cwd in calls)
@@ -71,7 +71,7 @@ def test_tag_mismatch_stops():
calls = []
runner = make_runner({
("git", "status"): (0, ""),
("git", "describe"): (0, "v0.0.1\n"),
("git", "tag", "--points-at"): (0, "v0.0.1\n"),
}, calls)
args = publish.parse_args([])
assert publish.cmd_publish(args, runner,
@@ -79,15 +79,40 @@ def test_tag_mismatch_stops():
def test_tag_probe_failure_stops():
"""An untagged HEAD (describe fails) is exit 4."""
"""An untagged HEAD (no tag points at it) is exit 4."""
runner = make_runner({
("git", "status"): (0, ""),
("git", "describe"): (128, "no tag\n"),
("git", "tag", "--points-at"): (1, ""),
})
assert publish.cmd_publish(publish.parse_args([]), runner,
lambda _u: 404) == 4
def test_moving_tags_on_the_same_commit_do_not_confuse_the_guard():
"""`latest` sharing the release commit is fine (item 3.3.2).
git's own name picking is not the contract; v<version>
among the tags that point at HEAD is. Live case: git
prints `latest` for a commit tagged both latest and
v<version>.
"""
calls = []
runner = make_runner({
("git", "status"): (0, ""),
("git", "tag", "--points-at"):
(0, f"latest\nv{repo_version()}\n"),
(publish.PY, "-m", "build", "--version"): (0, "build\n"),
(publish.PY, "-m", "twine", "--version"): (0, "twine\n"),
(publish.PY, "-m", "build"): (0, "ok\n"),
(publish.PY, "-m", "twine", "check"): (0, "PASSED\n"),
}, calls)
assert publish.cmd_publish(publish.parse_args([]), runner,
lambda _u: 404) == 0
tag_calls = [cmd for cmd, _ in calls
if cmd[:2] == ["git", "tag"]]
assert tag_calls == [["git", "tag", "--points-at", "HEAD"]]
def repo_version():
"""The version the checkout's pyproject carries."""
_name, version = publish.read_project(
@@ -99,7 +124,7 @@ def test_tooling_missing_stops():
"""No build/twine in the interpreter is exit 5."""
runner = make_runner({
("git", "status"): (0, ""),
("git", "describe"): (0, f"v{repo_version()}\n"),
("git", "tag", "--points-at"): (0, f"v{repo_version()}\n"),
(publish.PY, "-m", "build", "--version"): (127, "no module"),
(publish.PY, "-m", "twine", "--version"): (0, "twine\n"),
})
@@ -112,7 +137,7 @@ def test_already_on_pypi_stops():
calls = []
runner = make_runner({
("git", "status"): (0, ""),
("git", "describe"): (0, f"v{repo_version()}\n"),
("git", "tag", "--points-at"): (0, f"v{repo_version()}\n"),
(publish.PY, "-m", "build", "--version"): (0, "build\n"),
(publish.PY, "-m", "twine", "--version"): (0, "twine\n"),
}, calls)
@@ -126,7 +151,7 @@ def test_pypi_unreachable_stops():
"""A blind publish is refused: unreachable PyPI is exit 6."""
runner = make_runner({
("git", "status"): (0, ""),
("git", "describe"): (0, f"v{repo_version()}\n"),
("git", "tag", "--points-at"): (0, f"v{repo_version()}\n"),
(publish.PY, "-m", "build", "--version"): (0, "build\n"),
(publish.PY, "-m", "twine", "--version"): (0, "twine\n"),
})
@@ -141,6 +166,7 @@ def test_check_only_flow_builds_and_stops(tmp_path, capsys):
"""Without --upload: chained build, twine check, exit 0."""
name, version = publish.read_project(
publish.find_repo_root() / "pyproject.toml")
sdist, wheel = publish.artifact_names(name, version)
calls = []
assert publish.cmd_publish(publish.parse_args([]),
clean_runner(version, calls),
@@ -150,7 +176,7 @@ def test_check_only_flow_builds_and_stops(tmp_path, capsys):
assert len(build) == 1 # chained, not two runs
assert not any(cmd[3:4] == ["upload"] for cmd, _ in calls)
out = capsys.readouterr().out
assert f"{name}-{version}.tar.gz" in out
assert f"{sdist}" in out
assert "--upload" in out # the next-step hint
@@ -158,14 +184,23 @@ def test_upload_sends_exactly_this_version():
"""--upload passes only this version's sdist and wheel."""
name, version = publish.read_project(
publish.find_repo_root() / "pyproject.toml")
sdist, wheel = publish.artifact_names(name, version)
calls = []
assert publish.cmd_publish(publish.parse_args(["--upload"]),
clean_runner(version, calls),
lambda _u: 404) == 0
upload = [cmd for cmd, _ in calls if cmd[3:4] == ["upload"]][0]
assert upload[-2] == f"dist/{name}-{version}.tar.gz"
assert upload[-1].startswith(f"dist/{name}-{version}-")
assert upload[-1].endswith(".whl")
assert upload[-2] == f"dist/{sdist}"
assert upload[-1] == f"dist/{wheel}"
def test_artifact_names_normalize_pep625():
"""Filenames use the normalized name, not the project name."""
sdist, wheel = publish.artifact_names("daedalus-tools", "0.13.0")
assert sdist == "daedalus_tools-0.13.0.tar.gz"
assert wheel == "daedalus_tools-0.13.0-py3-none-any.whl"
assert publish.artifact_names("daedalus", "1.0") == \
("daedalus-1.0.tar.gz", "daedalus-1.0-py3-none-any.whl")
def test_build_failure_is_7():
@@ -175,7 +210,7 @@ def test_build_failure_is_7():
py = publish.PY
runner = make_runner({
("git", "status"): (0, ""),
("git", "describe"): (0, f"v{version}\n"),
("git", "tag", "--points-at"): (0, f"v{version}\n"),
(py, "-m", "build", "--version"): (0, "build\n"),
(py, "-m", "twine", "--version"): (0, "twine\n"),
(py, "-m", "build"): (1, "error\n"),
@@ -191,7 +226,7 @@ def test_check_failure_is_8():
py = publish.PY
runner = make_runner({
("git", "status"): (0, ""),
("git", "describe"): (0, f"v{version}\n"),
("git", "tag", "--points-at"): (0, f"v{version}\n"),
(py, "-m", "build", "--version"): (0, "build\n"),
(py, "-m", "twine", "--version"): (0, "twine\n"),
(py, "-m", "build"): (0, "ok\n"),
@@ -208,7 +243,7 @@ def test_upload_failure_is_9():
py = publish.PY
runner = make_runner({
("git", "status"): (0, ""),
("git", "describe"): (0, f"v{version}\n"),
("git", "tag", "--points-at"): (0, f"v{version}\n"),
(py, "-m", "build", "--version"): (0, "build\n"),
(py, "-m", "twine", "--version"): (0, "twine\n"),
(py, "-m", "build"): (0, "ok\n"),