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>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -33,7 +33,10 @@ 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
|
||||
@@ -111,4 +114,6 @@ are cited as `publish spec item N.M`.
|
||||
- **7.2** Repository rules: SPEC items 6.6 (tests), 9.8 (version
|
||||
bump).
|
||||
- **7.3** History: `CHANGELOG.md` entries 0.12.0 (script),
|
||||
0.12.1 (tag-guard fix, found by the first live run).
|
||||
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).
|
||||
|
||||
@@ -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.1"
|
||||
assert hello.app_version() == "0.13.0"
|
||||
|
||||
|
||||
def test_help_exits_zero(capsys):
|
||||
|
||||
@@ -166,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),
|
||||
@@ -175,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
|
||||
|
||||
|
||||
@@ -183,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():
|
||||
|
||||
Reference in New Issue
Block a user