fixes

Author: timkpaine

hatch_build.py

@@ -1,21 +1,31 @@
 from os import environ
+from pathlib import Path
 from sys import platform
 from platform import machine
 from hatchling.builders.hooks.plugin.interface import BuildHookInterface
 
+
 class CustomHook(BuildHookInterface):
     def initialize(self, version, build_data):
-        build_data['pure_python'] = False
+        build_data["pure_python"] = False
         arch = environ.get("AUDITWHEEL_ARCH", machine())
         if "darwin" in platform:
             if "arm" in arch:
-                build_data['tag'] = "py3-none-macosx_11_0_arm64"
+                build_data["tag"] = "py3-none-macosx_11_0_arm64"
             else:
-                build_data['tag'] = "py3-none-macosx_11_0_x86_64"
+                build_data["tag"] = "py3-none-macosx_11_0_x86_64"
         elif "linux" in platform:
             if "arm" in arch or "aarch" in arch:
-                build_data['tag'] = "py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64"
+                build_data["tag"] = "py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64"
             else:
-                build_data['tag'] = 'py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64'
+                build_data["tag"] = "py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64"
         else:
-            build_data['tag'] = "py3-none-win_amd64"
+            build_data["tag"] = "py3-none-win_amd64"
+
+        # Include native verible binaries as scripts so they land in $PREFIX/bin
+        bins_dir = Path(self.root) / "verible" / "bin"
+        if bins_dir.is_dir():
+            shared = build_data.setdefault("shared_data", {})
+            for f in bins_dir.iterdir():
+                if f.is_file():
+                    shared[str(f.relative_to(self.root))] = f"scripts/{f.name}"

pyproject.toml

@@ -128,14 +128,6 @@ include = [
     "LICENSE",
     "README.md",
 ]
-exclude = [
-    "/.github",
-    "/scripts",
-    "/src",
-    "/.gitmodules",
-    "/.gitignore",
-    "/pyproject.toml",
-]
 
 [tool.hatch.build.targets.wheel.hooks.custom]
 
@@ -144,16 +136,11 @@ packages = [
     "verible",
 ]
 exclude = [
-    "/.github",
-    "/scripts",
     "/src",
-    "/.gitmodules",
-    "/.gitignore",
-    "/pyproject.toml",
 ]
 
 [tool.hatch.build.targets.wheel.shared-data]
-"verible/bin" = "verible/bin"
+"verible/bin" = "bin"
 
 [tool.pytest.ini_options]
 addopts = [

verible/cli.py

@@ -1,12 +1,10 @@
 from functools import lru_cache
-from os import name
 from pathlib import Path
 from shutil import which
 from subprocess import Popen
 from sys import exit, stderr, stdout
 from time import sleep
 
-
 VERIBLE_TOOLS = [
     "verible-verilog-syntax",
     "verible-verilog-format",
@@ -43,7 +41,7 @@ def main():
     from sys import argv as _argv
 
     if len(_argv) < 2:
-        print(f"Usage: verible-cli <tool> [args...]")
+        print("Usage: verible-cli <tool> [args...]")
         print(f"Available tools: {', '.join(VERIBLE_TOOLS)}")
         exit(1)
 

verible/tests/test_basic.py

@@ -1,8 +1,10 @@
 def test_import():
     import verible
+
     assert verible.__version__
 
 
 def test_cli_import():
-    from verible.cli import main, verible, VERIBLE_TOOLS
+    from verible.cli import VERIBLE_TOOLS
+
     assert len(VERIBLE_TOOLS) > 0