Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nanvix/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ venv
cache
sysroot
buildroot
out
.yamllint.yml
black.toml
env.json
Expand Down
1 change: 0 additions & 1 deletion .nanvix/src/benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ def benchmark(self) -> None:
if deployment == "standalone":
self._cleanup_ramfs()
self._cleanup_initrd()
self._cleanup_python_in_repo_root()

if "hello" not in output:
print(output)
Expand Down
5 changes: 2 additions & 3 deletions .nanvix/src/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,12 +489,11 @@ def _ensure_initrd(self, sysroot: Path) -> Path:
if self._initrd and self._initrd.is_file():
return self._initrd

self._ensure_python_in_repo_root(sysroot)
initrd: Path = make_initrd(
self,
"python3.12",
sysroot / "bin" / "python3.12",
# Output goes to test_out() so the bundle's bin/ stays clean.
test=True,
test_out(),
args=InitRdArgs(
app_args=[
"-S",
Expand Down
3 changes: 0 additions & 3 deletions .nanvix/src/clean.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,4 @@ def clean(self) -> None:
if snapshots_dir.is_dir():
shutil.rmtree(snapshots_dir)

# Clean python3.12 copy used by make_initrd
self._cleanup_python_in_repo_root()

log.success("clean complete")
10 changes: 0 additions & 10 deletions .nanvix/src/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

from nanvix_zutil import CFG_SYSROOT, TOOLCHAIN_CONTAINER_PATH, ZScript, log
from nanvix_zutil.exitcodes import EXIT_MISSING_DEP
from nanvix_zutil.paths import repo_root

__all__ = (
"DEFAULT_TIMEOUT",
Expand Down Expand Up @@ -75,15 +74,6 @@ def _host_python(self) -> str | None:
return name
return None

def _ensure_python_in_repo_root(self, sysroot: Path) -> None:
repo_python = repo_root() / "python3.12"
if repo_python.exists():
return
shutil.copy2(sysroot / "bin" / "python3.12", repo_python)

def _cleanup_python_in_repo_root(self) -> None:
(repo_root() / "python3.12").unlink(missing_ok=True)

def _nanvix_run(
self,
sysroot: Path,
Expand Down
1 change: 0 additions & 1 deletion .nanvix/src/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ def test(self) -> None:
finally:
self._cleanup_ramfs()
self._cleanup_initrd()
self._cleanup_python_in_repo_root()

def _run_smoke_test(self, sysroot: Path) -> None:
"""Run the layer-2 smoke test."""
Expand Down
2 changes: 1 addition & 1 deletion .zutils-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.13.0
v0.14.0
Loading