Skip to content

Commit 73b6e6c

Browse files
committed
DRAFT: Use uv no-build-isolation-package setting
1 parent 79170c8 commit 73b6e6c

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

noxfile.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,10 @@ def uv_install(
8787
groups: tuple[str, ...] = (),
8888
extras: tuple[str, ...] = (),
8989
editable: bool = False,
90-
no_isolation: bool = False,
9190
) -> None:
9291
args = ['sync', '--locked']
9392
if not editable:
9493
args.append('--no-editable')
95-
if no_isolation:
96-
args.extend(['--no-build-isolation', '--no-install-project'])
9794
for group in groups:
9895
if group:
9996
args.extend(['--group', group])
@@ -333,17 +330,15 @@ def bundle(session: nox.Session):
333330
"""Bundle the distribution."""
334331

335332
# We're running dump_license in another session because:
336-
# 1. `b2 license --dump` dumps the licence where the module is installed.
333+
# 1. `b2 license --dump` dumps the license where the module is installed.
337334
# 2. We don't want to install b2 as editable module in the current session
338335
# because that would make `b2 versions` show the versions as editable.
339336
session.run('nox', '-s', 'dump_license', '-fb', 'venv', external=True)
340337

341-
# We need no isolated mode to be able to compile staticx, particularly on ARM machines.
342338
uv_install(
343339
session,
344340
groups=('bundle',),
345341
extras=('full',),
346-
no_isolation=not is_x86_64_architecture(),
347342
)
348343

349344
template_spec = string.Template(pathlib.Path('b2.spec.template').read_text())

pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,12 @@ bundle = [
8585
"pyinstaller-hooks-contrib>=2023.6",
8686
"patchelf-wrapper==1.2.0; platform_system == \"Linux\"",
8787
"staticx~=0.14.1; platform_system == \"Linux\"",
88-
"setuptools>=60,<80; platform_system == \"Linux\"", # required for building staticx on ARM
88+
"setuptools>=60,<80; platform_system == \"Linux\"", # required by non-isolated Linux bundle builds
8989
]
9090

91+
[tool.uv]
92+
no-build-isolation-package = ["patchelf-wrapper", "staticx"]
93+
9194
[project.urls]
9295
Homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"
9396

0 commit comments

Comments
 (0)