oaknut-basic 12.16.0__tar.gz → 12.17.1__tar.gz

{oaknut_basic-12.16.0 → oaknut_basic-12.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oaknut-basic
-Version: 12.16.0
+Version: 12.17.1
 Summary: BBC BASIC tools: program tokeniser/de-tokeniser and PRINT#/INPUT# data-file reader/writer
 Author-email: Robert Smallshire <robert@smallshire.org.uk>
 License-Expression: MIT
@@ -17,8 +17,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: oaknut-exception>=10.0
 Requires-Dist: oaknut-codecs>=12.7
-Provides-Extra: cli
-Requires-Dist: oaknut-cli>=10.0; extra == "cli"
+Requires-Dist: click>=8.1.7
+Requires-Dist: asyoulikeit>=1.5.1
+Requires-Dist: oaknut-cli>=10.0
 Dynamic: license-file
 
 <p align="center">
@@ -67,12 +68,12 @@ and a data file round-trips through Python values **byte-for-byte**.
 
 ## Installation
 
-Install with the `[cli]` extra for the `oaknut-basic` command, or bare for the
-library only:
+Install as a tool for the `oaknut-basic` command, or add it to a project for
+the library:
 
 ```
-uv tool install "oaknut-basic[cli]"     # the command-line tool
-uv add oaknut-basic                       # the importable library
+uv tool install oaknut-basic     # the command-line tool
+uv add oaknut-basic              # the importable library
 ```
 
 `pip` works identically with the same names. `oaknut-basic` requires Python

{oaknut_basic-12.16.0 → oaknut_basic-12.17.1}/README.md

@@ -44,12 +44,12 @@ and a data file round-trips through Python values **byte-for-byte**.
 
 ## Installation
 
-Install with the `[cli]` extra for the `oaknut-basic` command, or bare for the
-library only:
+Install as a tool for the `oaknut-basic` command, or add it to a project for
+the library:
 
 ```
-uv tool install "oaknut-basic[cli]"     # the command-line tool
-uv add oaknut-basic                       # the importable library
+uv tool install oaknut-basic     # the command-line tool
+uv add oaknut-basic              # the importable library
 ```
 
 `pip` works identically with the same names. `oaknut-basic` requires Python

{oaknut_basic-12.16.0 → oaknut_basic-12.17.1}/pyproject.toml

@@ -20,16 +20,22 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
 ]
-# The tokeniser and de-tokeniser raise categorised errors from the shared
-# oaknut-exception hierarchy, so the CLI boundary can render them without a
-# traceback. That is the package's only runtime dependency.
-dependencies = ["oaknut-exception>=10.0", "oaknut-codecs>=12.7"]
-
-# The `cli` extra pulls the shared CLI toolkit (Click, asyoulikeit, the
-# Acorn text codec and the categorised-error boundary) so this package
-# can offer the standalone `oaknut-basic` command.
-[project.optional-dependencies]
-cli = ["oaknut-cli>=10.0"]
+# This package ships the standalone `oaknut-basic` console script (see
+# [project.scripts] below), and that script's module imports Click,
+# asyoulikeit and oaknut.cli at load time. A console script is installed
+# unconditionally, so those must be unconditional dependencies too —
+# otherwise `pip install oaknut-basic` / `uvx oaknut-basic` yields an
+# executable that dies with ModuleNotFoundError before it runs. The
+# tokeniser and de-tokeniser also raise categorised errors from the
+# shared oaknut-exception hierarchy so the CLI boundary can render them
+# without a traceback.
+dependencies = [
+    "oaknut-exception>=10.0",
+    "oaknut-codecs>=12.7",
+    "click>=8.1.7",
+    "asyoulikeit>=1.5.1",
+    "oaknut-cli>=10.0",
+]
 
 [project.scripts]
 oaknut-basic = "oaknut.basic.cli:cli"

{oaknut_basic-12.16.0 → oaknut_basic-12.17.1}/src/oaknut/basic/__init__.py

@@ -81,7 +81,7 @@ from oaknut.basic.tokens import (
     TOKEN_TO_KEYWORD,
 )
 
-__version__ = "12.16.0"
+__version__ = "12.17.1"
 
 # Canonical load addresses for BBC BASIC programs on each host.
 # Programs saved by *SAVE on a real machine use these by default.

{oaknut_basic-12.16.0 → oaknut_basic-12.17.1}/src/oaknut_basic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oaknut-basic
-Version: 12.16.0
+Version: 12.17.1
 Summary: BBC BASIC tools: program tokeniser/de-tokeniser and PRINT#/INPUT# data-file reader/writer
 Author-email: Robert Smallshire <robert@smallshire.org.uk>
 License-Expression: MIT
@@ -17,8 +17,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: oaknut-exception>=10.0
 Requires-Dist: oaknut-codecs>=12.7
-Provides-Extra: cli
-Requires-Dist: oaknut-cli>=10.0; extra == "cli"
+Requires-Dist: click>=8.1.7
+Requires-Dist: asyoulikeit>=1.5.1
+Requires-Dist: oaknut-cli>=10.0
 Dynamic: license-file
 
 <p align="center">
@@ -67,12 +68,12 @@ and a data file round-trips through Python values **byte-for-byte**.
 
 ## Installation
 
-Install with the `[cli]` extra for the `oaknut-basic` command, or bare for the
-library only:
+Install as a tool for the `oaknut-basic` command, or add it to a project for
+the library:
 
 ```
-uv tool install "oaknut-basic[cli]"     # the command-line tool
-uv add oaknut-basic                       # the importable library
+uv tool install oaknut-basic     # the command-line tool
+uv add oaknut-basic              # the importable library
 ```
 
 `pip` works identically with the same names. `oaknut-basic` requires Python

{oaknut_basic-12.16.0 → oaknut_basic-12.17.1}/src/oaknut_basic.egg-info/SOURCES.txt

@@ -33,6 +33,7 @@ tests/test_greedy_crunch.py
 tests/test_keyword_coverage.py
 tests/test_linenumber.py
 tests/test_numbering.py
+tests/test_packaging.py
 tests/test_rom_golden.py
 tests/test_rom_golden_detokenise.py
 tests/test_scanner.py

{oaknut_basic-12.16.0 → oaknut_basic-12.17.1}/src/oaknut_basic.egg-info/requires.txt

@@ -1,5 +1,5 @@
 oaknut-exception>=10.0
 oaknut-codecs>=12.7
-
-[cli]
+click>=8.1.7
+asyoulikeit>=1.5.1
 oaknut-cli>=10.0

oaknut_basic-12.17.1/tests/test_packaging.py

@@ -0,0 +1,58 @@
+"""Packaging-metadata guards for the standalone ``oaknut-basic`` command.
+
+Unlike the filesystem plugin packages (``oaknut-dfs``/``oaknut-adfs`` …),
+which only contribute ``disc`` subcommands via entry points and ship no
+console script of their own, ``oaknut-basic`` declares its own
+``[project.scripts]`` entry point. A console script that is always
+installed must have everything it imports as an *unconditional* runtime
+dependency, otherwise ``pip install oaknut-basic`` / ``uvx oaknut-basic``
+produces an executable that dies with ``ModuleNotFoundError`` at import
+(see issue #49).
+"""
+
+from importlib.metadata import entry_points, requires
+
+_DISTRIBUTION = "oaknut-basic"
+
+# Everything oaknut/basic/cli.py imports at module load, mapped to the
+# distribution that supplies it.
+_CLI_REQUIREMENTS = ("oaknut-cli", "click", "asyoulikeit")
+
+
+def _unconditional_requirements():
+    """Distribution names required without an ``extra ==`` marker."""
+    names = set()
+    for requirement in requires(_DISTRIBUTION) or []:
+        # "oaknut-cli>=10.0; extra == 'cli'" -> skip; extras are optional.
+        spec, _, marker = requirement.partition(";")
+        if "extra" in marker:
+            continue
+        name = (
+            spec.strip()
+            .split("[")[0]
+            .split("<")[0]
+            .split(">")[0]
+            .split("=")[0]
+            .split("!")[0]
+            .split("~")[0]
+            .strip()
+        )
+        names.add(name.lower())
+    return names
+
+
+def test_console_script_is_declared():
+    scripts = entry_points(group="console_scripts")
+    assert any(ep.name == "oaknut-basic" for ep in scripts)
+
+
+def test_cli_dependencies_are_unconditional():
+    unconditional = _unconditional_requirements()
+    missing = [
+        name for name in _CLI_REQUIREMENTS if name.lower() not in unconditional
+    ]
+    assert not missing, (
+        f"{_DISTRIBUTION} ships a console script but these imports of "
+        f"oaknut.basic.cli are not unconditional dependencies: {missing}. "
+        "Promote them out of the [cli] extra into [project.dependencies]."
+    )