fastws-cli 0.0.23__tar.gz → 0.0.25__tar.gz

{fastws_cli-0.0.23/fastws_cli.egg-info → fastws_cli-0.0.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.23
+Version: 0.0.25
 Summary: Fast workspace tools for multi-repo management
 Author: Jeremy Howard
 License-Expression: Apache-2.0
@@ -14,6 +14,7 @@ Requires-Dist: fastcore>=2.2.33
 Requires-Dist: fastgit>=0.1.2
 Requires-Dist: ghapi>=2.0.6
 Requires-Dist: packaging
+Requires-Dist: maturin<2.0,>=1.9.4
 Requires-Dist: tomli; python_version < "3.11"
 Provides-Extra: dev
 Requires-Dist: fastship; extra == "dev"
@@ -214,7 +215,11 @@ For reusable Rust libraries, keep the core crate Python-free and put PyO3 in an
 
 Set `native-binaries = true` under `[tool.fastws]` to build and install the binary targets of the workspace's default members into the active venv alongside the extension. A binary can live in its own member crate, such as a `cli/` crate beside `py/`, listed in `default-members`. maturin's sdist keeps only the members that the extension depends on, so a wheel built from the sdist lacks a binary from such a crate. Cargo reports the executable paths; there is no separate list of binary names.
 
-For wheels containing these binaries, use `fastws.build_backend` as the build backend and include `fastws-cli>=0.0.20` alongside maturin in `[build-system].requires`. Set `[tool.maturin].data` to a generated wheel-data directory. The backend replaces its `scripts/` subdirectory with the current Python-free binaries, then delegates packaging to maturin. Explicit profile and target arguments from maturin's build settings also apply to the binaries.
+`cargo develop` also copies the `data/` subdirectory of `[tool.maturin].data` into the active venv, as a wheel install does. For example, `data/share/jupyter/kernels/<name>/kernel.json` is installed as `share/jupyter/kernels/<name>/kernel.json`, where Jupyter finds the kernel. `cargo develop` installs the binaries it builds, not the staged copies in `scripts/`.
+
+Use `fastws.build_backend` as the build backend of a mixed project, and include `fastws-cli>=0.0.25` alongside maturin in `[build-system].requires`. Its editable builds install only Python metadata and the source path, and compile no Rust. `ws-sync` then runs `cargo develop` to build and install the extension, the binaries and the wheel data files. After standalone `uv sync`, run `cargo develop` yourself.
+
+For distribution wheels containing the binaries, also set `[tool.maturin].data` to a generated wheel-data directory. With `native-binaries = true`, wheel builds through the backend replace its `scripts/` subdirectory with the current Python-free binaries, then delegate packaging to maturin. Explicit profile and target arguments from maturin's build settings also apply to the binaries. Without `native-binaries`, wheel builds go straight to maturin, and `[tool.maturin].data` is optional.
 
 Direct maturin CLI builds bypass the Python build backend. Stage the binaries first with the shared command:
 
@@ -254,7 +259,7 @@ An optional tracked `package.json.shared` is merged into the root `package.json`
 
 Before `uv sync`, fastws regenerates `tool.uv.no-build-isolation-package` with the sorted package names of projects using `fastws.build_backend`, including external checkouts. These builds use the shared environment's `fastws-cli` and `maturin`. Leave global build isolation enabled for other projects.
 
-After `uv sync`, fastws runs `cargo develop` in each mixed Rust/Python project. Cargo skips unchanged compilation inputs. These projects should keep only packaging inputs in `tool.uv.cache-keys`; Rust source changes are handled by Cargo rather than triggering a separate maturin editable build. Maturin packages with `bindings = "bin"` keep their existing uv installation path.
+After `uv sync`, fastws runs `cargo develop` in each mixed Rust/Python project. Cargo skips unchanged compilation inputs. Projects using `fastws.build_backend` should keep only packaging inputs in `tool.uv.cache-keys`; Rust source changes are handled by Cargo. Maturin packages with `bindings = "bin"` keep their existing uv installation path.
 
 Fastws then runs `<tool> install` at the workspace root. It runs `<tool> run build` in each JavaScript package containing both `Cargo.toml` and a `build` script. Cargo handles incremental compilation. Other build steps still run.
 

{fastws_cli-0.0.23 → fastws_cli-0.0.25}/README.md

@@ -189,7 +189,11 @@ For reusable Rust libraries, keep the core crate Python-free and put PyO3 in an
 
 Set `native-binaries = true` under `[tool.fastws]` to build and install the binary targets of the workspace's default members into the active venv alongside the extension. A binary can live in its own member crate, such as a `cli/` crate beside `py/`, listed in `default-members`. maturin's sdist keeps only the members that the extension depends on, so a wheel built from the sdist lacks a binary from such a crate. Cargo reports the executable paths; there is no separate list of binary names.
 
-For wheels containing these binaries, use `fastws.build_backend` as the build backend and include `fastws-cli>=0.0.20` alongside maturin in `[build-system].requires`. Set `[tool.maturin].data` to a generated wheel-data directory. The backend replaces its `scripts/` subdirectory with the current Python-free binaries, then delegates packaging to maturin. Explicit profile and target arguments from maturin's build settings also apply to the binaries.
+`cargo develop` also copies the `data/` subdirectory of `[tool.maturin].data` into the active venv, as a wheel install does. For example, `data/share/jupyter/kernels/<name>/kernel.json` is installed as `share/jupyter/kernels/<name>/kernel.json`, where Jupyter finds the kernel. `cargo develop` installs the binaries it builds, not the staged copies in `scripts/`.
+
+Use `fastws.build_backend` as the build backend of a mixed project, and include `fastws-cli>=0.0.25` alongside maturin in `[build-system].requires`. Its editable builds install only Python metadata and the source path, and compile no Rust. `ws-sync` then runs `cargo develop` to build and install the extension, the binaries and the wheel data files. After standalone `uv sync`, run `cargo develop` yourself.
+
+For distribution wheels containing the binaries, also set `[tool.maturin].data` to a generated wheel-data directory. With `native-binaries = true`, wheel builds through the backend replace its `scripts/` subdirectory with the current Python-free binaries, then delegate packaging to maturin. Explicit profile and target arguments from maturin's build settings also apply to the binaries. Without `native-binaries`, wheel builds go straight to maturin, and `[tool.maturin].data` is optional.
 
 Direct maturin CLI builds bypass the Python build backend. Stage the binaries first with the shared command:
 
@@ -229,7 +233,7 @@ An optional tracked `package.json.shared` is merged into the root `package.json`
 
 Before `uv sync`, fastws regenerates `tool.uv.no-build-isolation-package` with the sorted package names of projects using `fastws.build_backend`, including external checkouts. These builds use the shared environment's `fastws-cli` and `maturin`. Leave global build isolation enabled for other projects.
 
-After `uv sync`, fastws runs `cargo develop` in each mixed Rust/Python project. Cargo skips unchanged compilation inputs. These projects should keep only packaging inputs in `tool.uv.cache-keys`; Rust source changes are handled by Cargo rather than triggering a separate maturin editable build. Maturin packages with `bindings = "bin"` keep their existing uv installation path.
+After `uv sync`, fastws runs `cargo develop` in each mixed Rust/Python project. Cargo skips unchanged compilation inputs. Projects using `fastws.build_backend` should keep only packaging inputs in `tool.uv.cache-keys`; Rust source changes are handled by Cargo. Maturin packages with `bindings = "bin"` keep their existing uv installation path.
 
 Fastws then runs `<tool> install` at the workspace root. It runs `<tool> run build` in each JavaScript package containing both `Cargo.toml` and a `build` script. Cargo handles incremental compilation. Other build steps still run.
 

{fastws_cli-0.0.23 → fastws_cli-0.0.25}/fastws/__init__.py

@@ -1,4 +1,6 @@
-__version__ = "0.0.23"
+__version__ = "0.0.25"
+
+
 
 
 

fastws_cli-0.0.25/fastws/build_backend.py

@@ -0,0 +1,59 @@
+r"Maturin build backend whose editable installs compile no Rust, and whose wheels can include Cargo binaries."
+import argparse, base64, csv, hashlib, io
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from zipfile import ZipFile, ZIP_DEFLATED
+import maturin
+from .cargo import settings, stage_binaries
+
+
+def _stage(config_settings):
+    root = Path.cwd()
+    tool = settings(root)
+    if not tool.get('fastws', {}).get('native-binaries'): return
+    parser = argparse.ArgumentParser(add_help=False)
+    parser.add_argument('--profile')
+    parser.add_argument('--release', action='store_true')
+    parser.add_argument('--target')
+    args, _ = parser.parse_known_args(maturin.get_maturin_pep517_args(config_settings))
+    profile = args.profile or ('release' if args.release else tool['maturin'].get('profile', 'release'))
+    stage_binaries(root, profile, args.target)
+
+
+def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
+    _stage(config_settings)
+    return maturin.build_wheel(wheel_directory, config_settings, metadata_directory)
+
+
+def build_editable(wheel_directory, config_settings=None, metadata_directory=None):
+    r"Build an editable wheel containing metadata and the Python source path, without compiling Rust."
+    with TemporaryDirectory() as tmp:
+        info = Path(metadata_directory) if metadata_directory else Path(tmp)/prepare_metadata_for_build_editable(tmp, config_settings)
+        name = info.name.removesuffix('.dist-info')
+        tag = next(line.removeprefix('Tag: ') for line in (info/'WHEEL').read_text().splitlines() if line.startswith('Tag: '))
+        files = {p.relative_to(info.parent).as_posix(): p.read_bytes() for p in info.rglob('*') if p.is_file() and p != info/'RECORD'}
+        root = Path.cwd()
+        source = (root/settings(root)['maturin']['python-source']).resolve()
+        files[f'{name}.pth'] = f'{source}\n'.encode()
+        record = f'{info.name}/RECORD'
+        rows = [(path, 'sha256=' + base64.urlsafe_b64encode(hashlib.sha256(data).digest()).rstrip(b'=').decode(), len(data))
+                for path, data in files.items()]
+        buffer = io.StringIO()
+        csv.writer(buffer).writerows([*rows, (record, '', '')])
+        files[record] = buffer.getvalue().encode()
+        filename = f'{name}-{tag}.whl'
+        with ZipFile(Path(wheel_directory)/filename, 'w', ZIP_DEFLATED) as wheel:
+            for path, data in files.items(): wheel.writestr(path, data)
+        return filename
+
+
+def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
+    if data := settings(Path.cwd())['maturin'].get('data'): (Path.cwd()/data).mkdir(parents=True, exist_ok=True)
+    return maturin.prepare_metadata_for_build_wheel(metadata_directory, config_settings)
+
+
+prepare_metadata_for_build_editable = prepare_metadata_for_build_wheel
+build_sdist = maturin.build_sdist
+get_requires_for_build_wheel = maturin.get_requires_for_build_wheel
+get_requires_for_build_editable = maturin.get_requires_for_build_editable
+get_requires_for_build_sdist = maturin.get_requires_for_build_sdist

{fastws_cli-0.0.23 → fastws_cli-0.0.25}/fastws/cargo.py

@@ -49,7 +49,7 @@ def replace(source, destination):
 
 
 def develop(root):
-    "Install a Python extension and opted-in binaries from one Cargo build."
+    "Install a Python extension, opted-in binaries and wheel data files from one Cargo build."
     tool = settings(root)
     cfg = tool['maturin']
     if 'python-source' not in cfg: raise SystemExit(r'cargo develop requires tool.maturin.python-source')
@@ -60,11 +60,16 @@ def develop(root):
     module = cfg.get('module-name', artifact['target']['name'])
     dest = root/cfg['python-source']/Path(*module.split('.'))
     replace(lib, dest.with_name(dest.name + sysconfig.get_config_var('EXT_SUFFIX')))
+    env = Path(os.environ.get('VIRTUAL_ENV', sys.prefix))
     if binaries:
-        env = Path(os.environ.get('VIRTUAL_ENV', sys.prefix))
         scripts = env/('Scripts' if os.name == 'nt' else 'bin')
         for m in artifacts:
             if m.get('executable'): replace(m['executable'], scripts/Path(m['executable']).name)
+    # Editable builds through `build_backend` don't install the wheel's data files, which a wheel install puts under the prefix.
+    if 'data' in cfg:
+        data = root/cfg['data']/'data'
+        for f in data.rglob('*'):
+            if f.is_file(): replace(f, env/f.relative_to(data))
 
 
 def stage_binaries(root, profile=None, target=None):

{fastws_cli-0.0.23 → fastws_cli-0.0.25/fastws_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.23
+Version: 0.0.25
 Summary: Fast workspace tools for multi-repo management
 Author: Jeremy Howard
 License-Expression: Apache-2.0
@@ -14,6 +14,7 @@ Requires-Dist: fastcore>=2.2.33
 Requires-Dist: fastgit>=0.1.2
 Requires-Dist: ghapi>=2.0.6
 Requires-Dist: packaging
+Requires-Dist: maturin<2.0,>=1.9.4
 Requires-Dist: tomli; python_version < "3.11"
 Provides-Extra: dev
 Requires-Dist: fastship; extra == "dev"
@@ -214,7 +215,11 @@ For reusable Rust libraries, keep the core crate Python-free and put PyO3 in an
 
 Set `native-binaries = true` under `[tool.fastws]` to build and install the binary targets of the workspace's default members into the active venv alongside the extension. A binary can live in its own member crate, such as a `cli/` crate beside `py/`, listed in `default-members`. maturin's sdist keeps only the members that the extension depends on, so a wheel built from the sdist lacks a binary from such a crate. Cargo reports the executable paths; there is no separate list of binary names.
 
-For wheels containing these binaries, use `fastws.build_backend` as the build backend and include `fastws-cli>=0.0.20` alongside maturin in `[build-system].requires`. Set `[tool.maturin].data` to a generated wheel-data directory. The backend replaces its `scripts/` subdirectory with the current Python-free binaries, then delegates packaging to maturin. Explicit profile and target arguments from maturin's build settings also apply to the binaries.
+`cargo develop` also copies the `data/` subdirectory of `[tool.maturin].data` into the active venv, as a wheel install does. For example, `data/share/jupyter/kernels/<name>/kernel.json` is installed as `share/jupyter/kernels/<name>/kernel.json`, where Jupyter finds the kernel. `cargo develop` installs the binaries it builds, not the staged copies in `scripts/`.
+
+Use `fastws.build_backend` as the build backend of a mixed project, and include `fastws-cli>=0.0.25` alongside maturin in `[build-system].requires`. Its editable builds install only Python metadata and the source path, and compile no Rust. `ws-sync` then runs `cargo develop` to build and install the extension, the binaries and the wheel data files. After standalone `uv sync`, run `cargo develop` yourself.
+
+For distribution wheels containing the binaries, also set `[tool.maturin].data` to a generated wheel-data directory. With `native-binaries = true`, wheel builds through the backend replace its `scripts/` subdirectory with the current Python-free binaries, then delegate packaging to maturin. Explicit profile and target arguments from maturin's build settings also apply to the binaries. Without `native-binaries`, wheel builds go straight to maturin, and `[tool.maturin].data` is optional.
 
 Direct maturin CLI builds bypass the Python build backend. Stage the binaries first with the shared command:
 
@@ -254,7 +259,7 @@ An optional tracked `package.json.shared` is merged into the root `package.json`
 
 Before `uv sync`, fastws regenerates `tool.uv.no-build-isolation-package` with the sorted package names of projects using `fastws.build_backend`, including external checkouts. These builds use the shared environment's `fastws-cli` and `maturin`. Leave global build isolation enabled for other projects.
 
-After `uv sync`, fastws runs `cargo develop` in each mixed Rust/Python project. Cargo skips unchanged compilation inputs. These projects should keep only packaging inputs in `tool.uv.cache-keys`; Rust source changes are handled by Cargo rather than triggering a separate maturin editable build. Maturin packages with `bindings = "bin"` keep their existing uv installation path.
+After `uv sync`, fastws runs `cargo develop` in each mixed Rust/Python project. Cargo skips unchanged compilation inputs. Projects using `fastws.build_backend` should keep only packaging inputs in `tool.uv.cache-keys`; Rust source changes are handled by Cargo. Maturin packages with `bindings = "bin"` keep their existing uv installation path.
 
 Fastws then runs `<tool> install` at the workspace root. It runs `<tool> run build` in each JavaScript package containing both `Cargo.toml` and a `build` script. Cargo handles incremental compilation. Other build steps still run.
 

{fastws_cli-0.0.23 → fastws_cli-0.0.25}/fastws_cli.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ fastws_cli.egg-info/entry_points.txt
 fastws_cli.egg-info/requires.txt
 fastws_cli.egg-info/top_level.txt
 tests/test_build.py
+tests/test_build_backend.py
 tests/test_releases.py
 tests/test_setup.py
 tests/test_sync.py

{fastws_cli-0.0.23 → fastws_cli-0.0.25}/fastws_cli.egg-info/requires.txt

@@ -2,6 +2,7 @@ fastcore>=2.2.33
 fastgit>=0.1.2
 ghapi>=2.0.6
 packaging
+maturin<2.0,>=1.9.4
 
 [:python_version < "3.11"]
 tomli

{fastws_cli-0.0.23 → fastws_cli-0.0.25}/pyproject.toml

@@ -20,6 +20,7 @@ dependencies = [
   "fastgit>=0.1.2",
   "ghapi>=2.0.6",
   "packaging",
+  "maturin>=1.9.4,<2.0",
   "tomli; python_version < '3.11'",
 ]
 

fastws_cli-0.0.25/tests/test_build_backend.py

@@ -0,0 +1,26 @@
+import base64, csv, hashlib, io
+from zipfile import ZipFile
+from fastws.build_backend import build_editable
+
+
+def test_editable_wheel(tmp_path, monkeypatch):
+    monkeypatch.chdir(tmp_path)
+    (tmp_path/'pyproject.toml').write_text(r'''[tool.maturin]
+python-source = "python"
+data = "wheel"
+''')
+    info = tmp_path/'demo-1.0.dist-info'
+    info.mkdir()
+    (info/'WHEEL').write_text('Wheel-Version: 1.0\nRoot-Is-Purelib: false\nTag: py3-none-any\n')
+    (info/'METADATA').write_text('Metadata-Version: 2.1\nName: demo\nVersion: 1.0\n')
+    (info/'entry_points.txt').write_text('[console_scripts]\ndemo = demo:main\n')
+    with ZipFile(tmp_path/build_editable(tmp_path, metadata_directory=info)) as wheel:
+        assert wheel.read('demo-1.0.pth').decode() == str(tmp_path/'python') + '\n'
+        assert wheel.read('demo-1.0.dist-info/entry_points.txt') == (info/'entry_points.txt').read_bytes()
+        record = list(csv.reader(io.StringIO(wheel.read('demo-1.0.dist-info/RECORD').decode())))
+        assert {row[0] for row in record} == set(wheel.namelist())
+        for path, digest, size in record[:-1]:
+            data = wheel.read(path)
+            assert digest == 'sha256=' + base64.urlsafe_b64encode(hashlib.sha256(data).digest()).rstrip(b'=').decode()
+            assert int(size) == len(data)
+        assert record[-1] == ['demo-1.0.dist-info/RECORD', '', '']

fastws_cli-0.0.23/fastws/build_backend.py

@@ -1,38 +0,0 @@
-r"Maturin build backend that includes Cargo binaries in Python wheels."
-import argparse
-from pathlib import Path
-import maturin
-from .cargo import settings, stage_binaries
-
-
-def _stage(config_settings):
-    parser = argparse.ArgumentParser(add_help=False)
-    parser.add_argument('--profile')
-    parser.add_argument('--release', action='store_true')
-    parser.add_argument('--target')
-    args, _ = parser.parse_known_args(maturin.get_maturin_pep517_args(config_settings))
-    root = Path.cwd()
-    profile = args.profile or ('release' if args.release else settings(root)['maturin'].get('profile', 'release'))
-    stage_binaries(root, profile, args.target)
-
-
-def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
-    _stage(config_settings)
-    return maturin.build_wheel(wheel_directory, config_settings, metadata_directory)
-
-
-def build_editable(wheel_directory, config_settings=None, metadata_directory=None):
-    _stage(config_settings)
-    return maturin.build_editable(wheel_directory, config_settings, metadata_directory)
-
-
-def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
-    (Path.cwd()/settings(Path.cwd())['maturin']['data']).mkdir(parents=True, exist_ok=True)
-    return maturin.prepare_metadata_for_build_wheel(metadata_directory, config_settings)
-
-
-prepare_metadata_for_build_editable = prepare_metadata_for_build_wheel
-build_sdist = maturin.build_sdist
-get_requires_for_build_wheel = maturin.get_requires_for_build_wheel
-get_requires_for_build_editable = maturin.get_requires_for_build_editable
-get_requires_for_build_sdist = maturin.get_requires_for_build_sdist