fastws-cli 0.0.28__tar.gz → 0.0.30__tar.gz

{fastws_cli-0.0.28/fastws_cli.egg-info → fastws_cli-0.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.28
+Version: 0.0.30
 Summary: Fast workspace tools for multi-repo management
 Author: Jeremy Howard
 License-Expression: Apache-2.0
@@ -14,12 +14,12 @@ Requires-Dist: fastcore>=2.2.33
 Requires-Dist: fastgit>=0.1.2
 Requires-Dist: ghapi>=2.0.6
 Requires-Dist: packaging
-Requires-Dist: python-fastllm
 Requires-Dist: rich
-Requires-Dist: maturin<2.0,>=1.9.4
+Requires-Dist: maturin<2.0,>=1.13
 Requires-Dist: tomli; python_version < "3.11"
 Provides-Extra: dev
 Requires-Dist: fastship; extra == "dev"
+Requires-Dist: python-fastllm; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -221,9 +221,9 @@ Set `native-binaries = true` under `[tool.fastws]` to build and install the bina
 
 Each Cargo build that fastws runs holds a shared `flock` on `/tmp/aai-ws-timing.lock`. A speed test that takes that lock exclusively then never times code while a build runs. A build waits up to 5 minutes for such a timing to finish, then goes ahead without the lock. Python code takes the same lock with `fastws.cargo.timing_lock`: `with timing_lock(exclusive=True):` around a timing, and `with timing_lock():` around a test run. An exclusive hold that has waited 30 seconds prints the processes that have the lock's file open. It raises `TimeoutError` after 5 minutes.
 
-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.
+Use `fastws.build_backend` as the build backend of a mixed project, and include `fastws-cli>=0.0.29` alongside `maturin>=1.13,<2.0` 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.
+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, target and feature 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:
 
@@ -232,6 +232,8 @@ cargo stage --profile dist
 maturin build --profile dist
 ```
 
+Pass the same target and feature flags to both commands, including `--no-default-features` when needed. Staging builds binaries only. On macOS it matches Maturin's linker flags through `build.rustflags` or existing `RUSTFLAGS`/`CARGO_ENCODED_RUSTFLAGS`. A macOS target with its own `rustflags` must include `-C link-arg=-undefined -C link-arg=dynamic_lookup` there. Shared crates are reused when the two builds resolve the same dependency features. Adding `--lib` to staging can select a different compilation profile under LTO.
+
 ### `cargo wait`
 
 Wait until a Cargo workspace compiles:

{fastws_cli-0.0.28 → fastws_cli-0.0.30}/README.md

@@ -193,9 +193,9 @@ Set `native-binaries = true` under `[tool.fastws]` to build and install the bina
 
 Each Cargo build that fastws runs holds a shared `flock` on `/tmp/aai-ws-timing.lock`. A speed test that takes that lock exclusively then never times code while a build runs. A build waits up to 5 minutes for such a timing to finish, then goes ahead without the lock. Python code takes the same lock with `fastws.cargo.timing_lock`: `with timing_lock(exclusive=True):` around a timing, and `with timing_lock():` around a test run. An exclusive hold that has waited 30 seconds prints the processes that have the lock's file open. It raises `TimeoutError` after 5 minutes.
 
-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.
+Use `fastws.build_backend` as the build backend of a mixed project, and include `fastws-cli>=0.0.29` alongside `maturin>=1.13,<2.0` 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.
+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, target and feature 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:
 
@@ -204,6 +204,8 @@ cargo stage --profile dist
 maturin build --profile dist
 ```
 
+Pass the same target and feature flags to both commands, including `--no-default-features` when needed. Staging builds binaries only. On macOS it matches Maturin's linker flags through `build.rustflags` or existing `RUSTFLAGS`/`CARGO_ENCODED_RUSTFLAGS`. A macOS target with its own `rustflags` must include `-C link-arg=-undefined -C link-arg=dynamic_lookup` there. Shared crates are reused when the two builds resolve the same dependency features. Adding `--lib` to staging can select a different compilation profile under LTO.
+
 ### `cargo wait`
 
 Wait until a Cargo workspace compiles:

{fastws_cli-0.0.28 → fastws_cli-0.0.30}/fastws/__init__.py

@@ -1,4 +1,6 @@
-__version__ = "0.0.28"
+__version__ = "0.0.30"
+
+
 
 
 

{fastws_cli-0.0.28 → fastws_cli-0.0.30}/fastws/build_backend.py

@@ -13,11 +13,14 @@ def _stage(config_settings):
     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('--release', '-r', action='store_true')
     parser.add_argument('--target')
+    parser.add_argument('--features', '-F', action='append')
+    parser.add_argument('--all-features', action='store_true')
+    parser.add_argument('--no-default-features', action='store_true')
     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)
+    stage_binaries(root, profile, args.target, args.features, args.all_features, args.no_default_features)
 
 
 def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):

{fastws_cli-0.0.28 → fastws_cli-0.0.30}/fastws/cargo.py

@@ -191,7 +191,34 @@ def sources(root):
     return res
 
 
-def build(root, *, library=True, binaries=False, profile=None, target=None, no_default_features=False):
+def _maturin_flags(target, env):
+    "Maturin's macOS linker flags without replacing existing compiler flags."
+    target = target or env.get('CARGO_BUILD_TARGET')
+    if not (target.endswith('-apple-darwin') if target else sys.platform == 'darwin'): return [], None
+    link_args = ['link-arg=-undefined', 'link-arg=dynamic_lookup']
+    if 'CARGO_ENCODED_RUSTFLAGS' in env:
+        flags = env['CARGO_ENCODED_RUSTFLAGS'].split('\x1f') if env['CARGO_ENCODED_RUSTFLAGS'] else []
+    elif 'RUSTFLAGS' in env: flags = env['RUSTFLAGS'].split()
+    else:
+        flags = [arg for flag in link_args for arg in ('-C', flag)]
+        return ['--config', 'build.rustflags=' + json.dumps(flags)], None
+    for flag in link_args:
+        if flag not in flags and '-C'+flag not in flags: flags += ['-C', flag]
+    return [], dict(env, CARGO_ENCODED_RUSTFLAGS='\x1f'.join(flags))
+
+
+def build(
+    root, # The project directory, whose `tool.maturin` gives the defaults (expands `~`)
+    *,
+    library=True, # Build the library target?
+    binaries=False, # Build the binary targets?
+    profile=None, # Cargo profile; None: `tool.maturin.profile`, or Cargo's default
+    target=None, # Target triple; None: the host
+    features=None, # Features to enable, as a list or a string; None: `tool.maturin.features`
+    all_features=False, # Enable every feature? `tool.maturin`'s `all-features` also turns this on
+    no_default_features=False, # Leave out the default features? `tool.maturin`'s `no-default-features` also turns this on
+    for_maturin=False, # Use the macOS linker flags that maturin's own wheel build uses?
+):
     "Build with Cargo and return the compiler artifacts of the workspace's packages."
     root = Path(root).expanduser()
     cfg = settings(root)['maturin']
@@ -200,12 +227,12 @@ def build(root, *, library=True, binaries=False, profile=None, target=None, no_d
     if binaries: cmd.append('--bins')
     if profile := profile or cfg.get('profile'): cmd += ['--profile', profile]
     if target: cmd += ['--target', target]
-    if no_default_features: cmd.append('--no-default-features')
-    else:
-        if features := cfg.get('features'): cmd += ['--features', ','.join(features)]
-        for flag in ('all-features', 'no-default-features'):
-            if cfg.get(flag): cmd.append('--' + flag)
-    with timing_lock(): result = subprocess.run(['cargo', *cmd], cwd=root, stdout=subprocess.PIPE, text=True)
+    if features := features or cfg.get('features'):
+        cmd += ['--features', features if isinstance(features, str) else ','.join(features)]
+    for flag, active in [('all-features', all_features), ('no-default-features', no_default_features)]:
+        if active or cfg.get(flag): cmd.append('--' + flag)
+    extra, env = _maturin_flags(target, os.environ) if for_maturin else ([], None)
+    with timing_lock(): result = subprocess.run(['cargo', *cmd, *extra], cwd=root, stdout=subprocess.PIPE, text=True, env=env)
     messages = [json.loads(line) for line in result.stdout.splitlines()]
     for m in messages:
         if m.get('reason') != 'compiler-message': continue
@@ -250,12 +277,13 @@ def develop(root):
             if f.is_file(): replace(f, env/f.relative_to(data))
 
 
-def stage_binaries(root, profile=None, target=None):
-    "Stage Python-free Cargo binaries in maturin's wheel-data directory."
+def stage_binaries(root, profile=None, target=None, features=None, all_features=False, no_default_features=False):
+    "Stage Python-free Cargo binaries for a maturin wheel build."
     root = Path(root).expanduser()
     cfg = settings(root)['maturin']
     if 'data' not in cfg: raise ConfigError(r'staging native binaries requires tool.maturin.data')
     dest = root/cfg['data']/'scripts'
-    artifacts = build(root, library=False, binaries=True, profile=profile, target=target, no_default_features=True)
+    artifacts = build(root, library=False, binaries=True, profile=profile, target=target, features=features,
+        all_features=all_features, no_default_features=no_default_features, for_maturin=True)
     if dest.exists(): shutil.rmtree(dest)
     return [replace(m['executable'], dest/Path(m['executable']).name) for m in artifacts if m.get('executable')]

{fastws_cli-0.0.28 → fastws_cli-0.0.30}/fastws/core.py

@@ -582,11 +582,15 @@ def cargo_stage(
     path: str = '.', # Rust/Python project directory
     profile: str = '', # Cargo profile; defaults to the maturin profile or dev
     target: str = '', # Cargo target triple
+    features: str = '', # Space or comma separated Cargo features
+    all_features: bool = False, # Enable all Cargo features
+    no_default_features: bool = False, # Disable default Cargo features
 ):
     r"Stage Python-free native binaries for maturin wheel builds."
     from .cargo import stage_binaries
     with _cli_errors():
-        for dest in stage_binaries(Path(path).resolve(), profile or None, target or None): print(f'Staged {dest}')
+        for dest in stage_binaries(Path(path).resolve(), profile or None, target or None, features,
+            all_features, no_default_features): print(f'Staged {dest}')
 
 def _newest(paths):
     "Newest file mtime among `paths`, walking each directory as `_src_mtime` does"

{fastws_cli-0.0.28 → fastws_cli-0.0.30/fastws_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.28
+Version: 0.0.30
 Summary: Fast workspace tools for multi-repo management
 Author: Jeremy Howard
 License-Expression: Apache-2.0
@@ -14,12 +14,12 @@ Requires-Dist: fastcore>=2.2.33
 Requires-Dist: fastgit>=0.1.2
 Requires-Dist: ghapi>=2.0.6
 Requires-Dist: packaging
-Requires-Dist: python-fastllm
 Requires-Dist: rich
-Requires-Dist: maturin<2.0,>=1.9.4
+Requires-Dist: maturin<2.0,>=1.13
 Requires-Dist: tomli; python_version < "3.11"
 Provides-Extra: dev
 Requires-Dist: fastship; extra == "dev"
+Requires-Dist: python-fastllm; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -221,9 +221,9 @@ Set `native-binaries = true` under `[tool.fastws]` to build and install the bina
 
 Each Cargo build that fastws runs holds a shared `flock` on `/tmp/aai-ws-timing.lock`. A speed test that takes that lock exclusively then never times code while a build runs. A build waits up to 5 minutes for such a timing to finish, then goes ahead without the lock. Python code takes the same lock with `fastws.cargo.timing_lock`: `with timing_lock(exclusive=True):` around a timing, and `with timing_lock():` around a test run. An exclusive hold that has waited 30 seconds prints the processes that have the lock's file open. It raises `TimeoutError` after 5 minutes.
 
-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.
+Use `fastws.build_backend` as the build backend of a mixed project, and include `fastws-cli>=0.0.29` alongside `maturin>=1.13,<2.0` 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.
+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, target and feature 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:
 
@@ -232,6 +232,8 @@ cargo stage --profile dist
 maturin build --profile dist
 ```
 
+Pass the same target and feature flags to both commands, including `--no-default-features` when needed. Staging builds binaries only. On macOS it matches Maturin's linker flags through `build.rustflags` or existing `RUSTFLAGS`/`CARGO_ENCODED_RUSTFLAGS`. A macOS target with its own `rustflags` must include `-C link-arg=-undefined -C link-arg=dynamic_lookup` there. Shared crates are reused when the two builds resolve the same dependency features. Adding `--lib` to staging can select a different compilation profile under LTO.
+
 ### `cargo wait`
 
 Wait until a Cargo workspace compiles:

{fastws_cli-0.0.28 → fastws_cli-0.0.30}/fastws_cli.egg-info/requires.txt

@@ -2,15 +2,15 @@ fastcore>=2.2.33
 fastgit>=0.1.2
 ghapi>=2.0.6
 packaging
-python-fastllm
 rich
-maturin<2.0,>=1.9.4
+maturin<2.0,>=1.13
 
 [:python_version < "3.11"]
 tomli
 
 [dev]
 fastship
+python-fastllm
 build
 twine
 pytest

{fastws_cli-0.0.28 → fastws_cli-0.0.30}/pyproject.toml

@@ -20,15 +20,15 @@ dependencies = [
   "fastgit>=0.1.2",
   "ghapi>=2.0.6",
   "packaging",
-  "python-fastllm",
   "rich",
-  "maturin>=1.9.4,<2.0",
+  "maturin>=1.13,<2.0",
   "tomli; python_version < '3.11'",
 ]
 
 [project.optional-dependencies]
 dev = [
   "fastship",
+  "python-fastllm",
   "build",
   "twine",
   "pytest",

{fastws_cli-0.0.28 → fastws_cli-0.0.30}/tests/test_build.py

@@ -1,6 +1,4 @@
-import subprocess
-import pytest
-import fastws.core as core
+import subprocess, pytest, fastws.core as core
 from fastws.cargo import build, run_tests, diagnostics