shipit-cli 0.1.3__tar.gz → 0.2.1__tar.gz

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.1.3
+Version: 0.2.1
 Summary: Add your description here
 Project-URL: homepage, https://wasmer.io
 Project-URL: repository, https://github.com/wasmerio/shipit

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.1.3"
+version = "0.2.1"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/src/shipit/cli.py

@@ -40,6 +40,12 @@ app = typer.Typer(invoke_without_command=True)
 DIR_PATH = Path(__file__).resolve().parent
 ASSETS_PATH = DIR_PATH / "assets"
 
+@dataclass
+class Mount:
+    name: str
+    build_path: Path
+    serve_path: Path
+
 
 @dataclass
 class Serve:
@@ -51,7 +57,8 @@ class Serve:
     assets: Optional[Dict[str, str]] = None
     prepare: Optional[List["PrepareStep"]] = None
     workers: Optional[List[str]] = None
-    mounts: Optional[Dict[str, str]] = None
+    mounts: Optional[List[Mount]] = None
+    env: Optional[Dict[str, str]] = None
 
 
 @dataclass
@@ -71,6 +78,11 @@ class RunStep:
     group: Optional[str] = None
 
 
+@dataclass
+class WorkdirStep:
+    path: Path
+
+
 @dataclass
 class CopyStep:
     source: str
@@ -96,7 +108,7 @@ class PathStep:
     path: str
 
 
-Step = Union[RunStep, CopyStep, EnvStep, PathStep, UseStep]
+Step = Union[RunStep, CopyStep, EnvStep, PathStep, UseStep, WorkdirStep]
 PrepareStep = Union[RunStep]
 
 
@@ -122,7 +134,7 @@ class MapperItem(TypedDict):
 
 
 class Builder(Protocol):
-    def build(self, env: Dict[str, str], steps: List[Step]) -> None: ...
+    def build(self, env: Dict[str, str], mounts: List[Mount], steps: List[Step]) -> None: ...
     def build_assets(self, assets: Dict[str, str]) -> None: ...
     def build_prepare(self, serve: Serve) -> None: ...
     def build_serve(self, serve: Serve) -> None: ...
@@ -135,6 +147,8 @@ class Builder(Protocol):
     ) -> Any: ...
     def serve_mount(self, name: str) -> str: ...
     def get_asset(self, name: str) -> str: ...
+    def get_build_mount_path(self, name: str) -> Path: ...
+    def get_serve_mount_path(self, name: str) -> Path: ...
 
 
 class DockerBuilder:
@@ -142,6 +156,7 @@ class DockerBuilder:
         self.src_dir = src_dir
         self.docker_file_contents = ""
         self.docker_path = self.src_dir / ".shipit" / "docker"
+        self.docker_out_path = self.docker_path / "out"
         self.depot_metadata = self.docker_path / "depot-build.json"
         self.docker_file_path = self.docker_path / "Dockerfile"
         self.docker_name_path = self.docker_path / "name"
@@ -151,7 +166,20 @@ class DockerBuilder:
         self.env = {
             "HOME": "/root",
         }
-    
+
+    def get_mount_path(self, name: str) -> Path:
+        if name == "app":
+            return Path("app")
+        else:
+            return Path("opt") / name
+
+    def get_build_mount_path(self, name: str) -> Path:
+        path = Path("/") / self.get_mount_path(name)
+        return path
+
+    def get_serve_mount_path(self, name: str) -> Path:
+        return self.docker_out_path / self.get_mount_path(name)
+
     @property
     def is_depot(self) -> bool:
         return self.docker_client == "depot"
@@ -169,10 +197,10 @@ class DockerBuilder:
         self.docker_name_path.write_text(image_name)
         self.print_dockerfile()
         extra_args = []
-        if self.is_depot:
-            # We load the docker image back into the local docker daemon
-            # extra_args += ["--load"]
-            extra_args += ["--save", f"--metadata-file={self.depot_metadata.absolute()}"]
+        # if self.is_depot:
+        #     # We load the docker image back into the local docker daemon
+        #     # extra_args += ["--load"]
+        #     extra_args += ["--save", f"--metadata-file={self.depot_metadata.absolute()}"]
         sh.Command(self.docker_client)(
             "build",
             "-f",
@@ -181,6 +209,8 @@ class DockerBuilder:
             image_name,
             "--platform",
             "linux/amd64",
+            "--output",
+            self.docker_out_path.absolute(),
             ".",
             *extra_args,
             _cwd=self.src_dir.absolute(),
@@ -188,25 +218,25 @@ class DockerBuilder:
             _out=write_stdout,
             _err=write_stderr,
         )
-        if self.is_depot:
-            json_text = self.depot_metadata.read_text()
-            json_data = json.loads(json_text)
-            build_data = json_data["depot.build"]
-            image_id = build_data["buildID"]
-            project = build_data["projectID"]
-            sh.Command("depot")(
-                "pull",
-                "--platform",
-                "linux/amd64",
-                "--project",
-                project,
-                image_id,
-                _cwd=self.src_dir.absolute(),
-                _env=os.environ,  # Pass the current environment variables to the Docker client
-                _out=write_stdout,
-                _err=write_stderr,
-            )
-            # console.print(f"[bold]Image ID:[/bold] {image_id}")
+        # if self.is_depot:
+        #     json_text = self.depot_metadata.read_text()
+        #     json_data = json.loads(json_text)
+        #     build_data = json_data["depot.build"]
+        #     image_id = build_data["buildID"]
+        #     project = build_data["projectID"]
+        #     sh.Command("depot")(
+        #         "pull",
+        #         "--platform",
+        #         "linux/amd64",
+        #         "--project",
+        #         project,
+        #         image_id,
+        #         _cwd=self.src_dir.absolute(),
+        #         _env=os.environ,  # Pass the current environment variables to the Docker client
+        #         _out=write_stdout,
+        #         _err=write_stderr,
+        #     )
+        #     # console.print(f"[bold]Image ID:[/bold] {image_id}")
 
     def finalize_build(self, serve: Serve) -> None:
         console.print(f"\n[bold]Building Docker file[/bold]")
@@ -280,11 +310,11 @@ RUN chmod {oct(mode)[2:]} {path.absolute()}
         else:
             self.docker_file_contents += f"RUN pkgm install {dependency.name}\n"
 
-    def build(self, env: Dict[str, str], steps: List[Step]) -> None:
+    def build(self, env: Dict[str, str], mounts: List[Mount], steps: List[Step]) -> None:
         base_path = self.docker_path
         shutil.rmtree(base_path, ignore_errors=True)
         base_path.mkdir(parents=True, exist_ok=True)
-        self.docker_file_contents = "FROM debian:bookworm-slim\n"
+        self.docker_file_contents = "FROM debian:bookworm-slim AS build\n"
         self.docker_file_contents += """
 RUN apt-get update \\
     && apt-get -y --no-install-recommends install sudo curl ca-certificates locate git zip unzip \\
@@ -295,13 +325,17 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl https://pkgx.sh | sh
 """
         # docker_file_contents += "RUN curl https://mise.run | sh\n"
-        self.docker_file_contents += """
-RUN curl https://get.wasmer.io -sSfL | sh -s "v6.1.0-rc.3"
-ENV PATH="/root/.wasmer/bin:${PATH}"
-"""
-        self.docker_file_contents += "WORKDIR /app\n"
+#         self.docker_file_contents += """
+# RUN curl https://get.wasmer.io -sSfL | sh -s "v6.1.0-rc.3"
+# ENV PATH="/root/.wasmer/bin:${PATH}"
+# """
+        for mount in mounts:
+            self.docker_file_contents += f"RUN mkdir -p {mount.build_path.absolute()}\n"
+
         for step in steps:
-            if isinstance(step, RunStep):
+            if isinstance(step, WorkdirStep):
+                self.docker_file_contents += f"WORKDIR {step.path.absolute()}\n"
+            elif isinstance(step, RunStep):
                 if step.inputs:
                     pre = "\\\n  " + "".join(
                         [
@@ -325,6 +359,12 @@ ENV PATH="/root/.wasmer/bin:${PATH}"
                 for dependency in step.dependencies:
                     self.add_dependency(dependency)
 
+        self.docker_file_contents += """
+FROM scratch
+"""
+        for mount in mounts:
+            self.docker_file_contents += f"COPY --from=build {mount.build_path} {mount.build_path}\n"
+
         self.docker_ignore_path.write_text("""
 .shipit
 Shipit
@@ -384,14 +424,33 @@ class LocalBuilder:
         self.src_dir = src_dir
         self.local_path = self.src_dir / ".shipit" / "local"
         self.prepare_bash_script = self.local_path / "prepare" / "prepare.sh"
+        self.build_path = self.local_path / "build"
+        self.workdir = self.build_path
+
+    def get_mount_path(self, name: str) -> Path:
+        if name == "app":
+            return self.build_path / "app"
+        else:
+            return self.build_path / "opt" / name
+
+    def get_build_mount_path(self, name: str) -> Path:
+        return self.get_mount_path(name)
 
-    def execute_step(self, step: Step, env: Dict[str, str], build_path: Path) -> None:
+    def get_serve_mount_path(self, name: str) -> Path:
+        return self.get_mount_path(name)
+
+    def execute_step(self, step: Step, env: Dict[str, str]) -> None:
+        build_path = self.workdir
         if isinstance(step, UseStep):
             console.print(f"[bold]Using dependencies:[/bold] {step.dependencies}")
+        elif isinstance(step, WorkdirStep):
+            console.print(f"[bold]Working in {step.path}[/bold]")
+            self.workdir = step.path
         elif isinstance(step, RunStep):
             extra = ""
             if step.inputs:
                 for input in step.inputs:
+                    print(f"Copying {input} to {build_path / input}")
                     copy((self.src_dir / input), (build_path / input))
                 all_inputs = ", ".join(step.inputs)
                 extra = f" [bright_black]# using {all_inputs}[/bright_black]"
@@ -448,17 +507,17 @@ class LocalBuilder:
         else:
             raise Exception(f"Unknown step type: {type(step)}")
 
-    def build(self, env: Dict[str, str], steps: List[Step]) -> None:
+    def build(self, env: Dict[str, str], mounts: List[Mount], steps: List[Step]) -> None:
         console.print(f"\n[bold]Building package[/bold]")
         base_path = self.local_path
         shutil.rmtree(base_path, ignore_errors=True)
         base_path.mkdir(parents=True, exist_ok=True)
-        temp_path = base_path / "build"
-        temp_path.mkdir(exist_ok=False)
-        logging.info(f"Initialized temporary build path: {temp_path}")
+        self.build_path.mkdir(exist_ok=True)
+        for mount in mounts:
+            mount.build_path.mkdir(parents=True, exist_ok=True)
         for step in steps:
             console.print(Rule(characters="-", style="bright_black"))
-            self.execute_step(step, env, temp_path)
+            self.execute_step(step, env)
 
         if "PATH" in env:
             path = base_path / ".path"
@@ -565,6 +624,15 @@ class LocalBuilder:
 
 
 class WasmerBuilder:
+    def get_build_mount_path(self, name: str) -> Path:
+        return self.inner_builder.get_build_mount_path(name)
+
+    def get_serve_mount_path(self, name: str) -> Path:
+        if name == "app":
+            return Path("/app")
+        else:
+            return Path("/opt") / name
+
     mapper: Dict[str, MapperItem] = {
         "python": {
             "dependencies": {
@@ -576,8 +644,6 @@ class WasmerBuilder:
             "env": {
                 "PYTHONEXECUTABLE": "/bin/python",
                 "PYTHONHOME": "/cpython",
-                "PYTHONPATH": "/.venv/lib/python3.13/site-packages",
-                "HOME": "/app",
             },
         },
         "php": {
@@ -616,24 +682,26 @@ class WasmerBuilder:
         src_dir: Path,
         registry: Optional[str] = None,
         token: Optional[str] = None,
+        bin: Optional[Path] = None,
     ) -> None:
         self.src_dir = src_dir
         self.inner_builder = inner_builder
         # The path where we store the directory of the wasmer app in the inner builder
-        self.wasmer_dir_path = Path(self.src_dir / ".shipit" / "wasmer_dir")
+        self.wasmer_dir_path = Path(self.src_dir / ".shipit" / "wasmer")
         self.wasmer_registry = registry
         self.wasmer_token = token
+        self.bin = bin.absolute() if bin else "wasmer"
         self.default_env = {
             "SHIPIT_PYTHON_EXTRA_INDEX_URL": "https://pythonindex.wasix.org/simple",
             "SHIPIT_PYTHON_CROSS_PLATFORM": "wasix_wasm32",
-            # "SHIPIT_PYTHON_PRECOMPILE": "true",
+            "SHIPIT_PYTHON_PRECOMPILE": "true",
         }
 
     def getenv(self, name: str) -> Optional[str]:
         return self.inner_builder.getenv(name) or self.default_env.get(name)
 
-    def build(self, env: Dict[str, str], build: List[Step]) -> None:
-        return self.inner_builder.build(env, build)
+    def build(self, env: Dict[str, str], mounts: List[Mount], build: List[Step]) -> None:
+        return self.inner_builder.build(env, mounts, build)
 
     def build_assets(self, assets: Dict[str, str]) -> None:
         return self.inner_builder.build_assets(assets)
@@ -643,9 +711,9 @@ class WasmerBuilder:
 
     def build_prepare(self, serve: Serve) -> None:
         print("Building prepare")
-        inner = cast(Any, self.inner_builder)
-        prepare_dir = inner.mkdir(Path("wasmer") / "prepare")
-        env = {}
+        prepare_dir = (self.wasmer_dir_path / "prepare")
+        prepare_dir.mkdir(parents=True, exist_ok=True)
+        env = serve.env or {}
         for dep in serve.deps:
             if dep.name in self.mapper:
                 dep_env = self.mapper[dep.name].get("env")
@@ -663,19 +731,17 @@ class WasmerBuilder:
                 if isinstance(step, RunStep):
                     commands.append(step.command)
         body = "\n".join(filter(None, [env_lines, *commands]))
-        inner.create_file(
-            Path(prepare_dir) / "prepare.sh",
+        (prepare_dir / "prepare.sh").write_text(
             f"#!/bin/bash\ncd /app\n{body}",
-            mode=0o755,
         )
+        (prepare_dir / "prepare.sh").chmod(0o755)
 
     def finalize_build(self, serve: Serve) -> None:
         inner = cast(Any, self.inner_builder)
         inner.finalize_build(serve)
 
     def prepare(self, env: Dict[str, str], prepare: List[PrepareStep]) -> None:
-        inner = cast(Any, self.inner_builder)
-        prepare_dir = inner.mkdir(Path("wasmer") / "prepare")
+        prepare_dir = (self.wasmer_dir_path / "prepare")
         self.run_serve_command(
             "bash",
             extra_args=[
@@ -739,10 +805,10 @@ class WasmerBuilder:
         inner = cast(Any, self.inner_builder)
         if serve.assets:
             fs.add("/assets", str((inner.get_path() / "assets").absolute()))
-        fs.add("/app", str(inner.get_build_path().absolute()))
+        # fs.add("/app", str(inner.get_build_path().absolute()))
         if serve.mounts:
             for mount in serve.mounts:
-                fs.add(mount, serve.mounts[mount])
+                fs.add(str(mount.serve_path.absolute()), str(self.inner_builder.get_serve_mount_path(mount.name).absolute()))
 
         doc.add(nl())
         if serve.commands:
@@ -760,8 +826,10 @@ class WasmerBuilder:
                 wasi_args = table()
                 wasi_args.add("cwd", "/app")
                 wasi_args.add("main-args", parts[1:])
-                env = program_binary.get("env")
-                if env is not None:
+                env = program_binary.get("env") or {}
+                if serve.env:
+                    env.update(serve.env)
+                if env:
                     wasi_args.add(
                         "env",
                         [f"{k}={v}" for k, v in env.items()],
@@ -770,9 +838,7 @@ class WasmerBuilder:
                 command.add(title, wasi_args)
 
         inner = cast(Any, self.inner_builder)
-        wasmer_dir = inner.mkdir(Path("wasmer"))
-        # Dump the wasmer_dir path to a file
-        self.wasmer_dir_path.write_text(str(wasmer_dir))
+        self.wasmer_dir_path.mkdir(parents=True, exist_ok=True)
 
         manifest = doc.as_string().replace(
             '[command."annotations.wasi"]', "[command.annotations.wasi]"
@@ -791,7 +857,7 @@ class WasmerBuilder:
             expand=False,
         )
         console.print(manifest_panel, markup=False, highlight=True)
-        inner.create_file(Path(wasmer_dir) / "wasmer.toml", manifest)
+        (self.wasmer_dir_path / "wasmer.toml").write_text(manifest)
 
         # Crete app.yaml
         yaml_config = {
@@ -811,7 +877,7 @@ class WasmerBuilder:
         }
 
         app_yaml = yaml.dump(yaml_config)
-        inner.create_file(Path(wasmer_dir) / "app.yaml", app_yaml)
+        (self.wasmer_dir_path / "app.yaml").write_text(app_yaml)
 
         # self.inner_builder.build_serve(serve)
 
@@ -823,14 +889,13 @@ class WasmerBuilder:
         self, command: str, extra_args: Optional[List[str]] = None
     ) -> None:
         console.print(f"\n[bold]Serving site[/bold]: running {command} command")
-        wasmer_path = self.wasmer_dir_path.read_text()
         extra_args = extra_args or []
 
         if self.wasmer_registry:
             extra_args = [f"--registry={self.wasmer_registry}"] + extra_args
-        self.inner_builder.run_command(
-            "wasmer",
-            ["run", str(wasmer_path), "--net", f"--command={command}", *extra_args],
+        self.run_command(
+            self.bin,
+            ["run", str(self.wasmer_dir_path.absolute()), "--net", f"--command={command}", *extra_args],
         )
 
     def serve_mount(self, name: str) -> str:
@@ -842,7 +907,7 @@ class WasmerBuilder:
     def run_command(
         self, command: str, extra_args: Optional[List[str]] | None = None
     ) -> Any:
-        return self.inner_builder.run_command(command, extra_args or [])
+        sh.Command(command)(*(extra_args or []), _out=write_stdout, _err=write_stderr, _env=os.environ)
 
     def deploy(
         self, app_owner: Optional[str] = None, app_name: Optional[str] = None
@@ -854,8 +919,8 @@ class WasmerBuilder:
             extra_args += ["--registry", self.wasmer_registry]
         if self.wasmer_token:
             extra_args += ["--token", self.wasmer_token]
-        self.inner_builder.run_command(
-            "wasmer",
+        self.run_command(
+            self.bin,
             [
                 "package",
                 "push",
@@ -866,8 +931,8 @@ class WasmerBuilder:
                 *extra_args,
             ],
         )
-        return self.inner_builder.run_command(
-            "wasmer",
+        return self.run_command(
+            self.bin,
             [
                 "deploy",
                 "--publish-package",
@@ -890,6 +955,7 @@ class Ctx:
         self.builds: List[Build] = []
         self.steps: List[Step] = []
         self.serves: Dict[str, Serve] = {}
+        self.mounts: List[Mount] = []
 
     def add_package(self, package: Package) -> str:
         index = f"{package.name}@{package.version}" if package.version else package.name
@@ -905,6 +971,8 @@ class Ctx:
             return self.serves[index[len("ref:serve:") :]]
         elif index.startswith("ref:step:"):
             return self.steps[int(index[len("ref:step:") :])]
+        elif index.startswith("ref:mount:"):
+            return self.mounts[int(index[len("ref:mount:") :])]
         else:
             raise Exception(f"Invalid reference: {index}")
 
@@ -945,7 +1013,8 @@ class Ctx:
         assets: Optional[Dict[str, str]] = None,
         prepare: Optional[List[str]] = None,
         workers: Optional[List[str]] = None,
-        mounts: Optional[Dict[str, str]] = None,
+        mounts: Optional[List[Mount]] = None,
+        env: Optional[Dict[str, str]] = None,
     ) -> str:
         build_refs = [cast(Step, r) for r in self.get_refs(build)]
         prepare_steps: Optional[List[PrepareStep]] = None
@@ -965,7 +1034,8 @@ class Ctx:
             commands=commands,
             prepare=prepare_steps,
             workers=workers,
-            mounts=mounts,
+            mounts=self.get_refs([mount["ref"] for mount in mounts]) if mounts else None,
+            env=env,
         )
         return self.add_serve(serve)
 
@@ -982,6 +1052,10 @@ class Ctx:
         step = RunStep(*args, **kwargs)
         return self.add_step(step)
 
+    def workdir(self, path: str) -> Optional[str]:
+        step = WorkdirStep(Path(path))
+        return self.add_step(step)
+
     def copy(
         self, source: str, target: str, ignore: Optional[List[str]] = None
     ) -> Optional[str]:
@@ -995,6 +1069,21 @@ class Ctx:
         step = EnvStep(env_vars)
         return self.add_step(step)
 
+    def add_mount(self, mount: Mount) -> Optional[str]:
+        self.mounts.append(mount)
+        return f"ref:mount:{len(self.mounts) - 1}"
+
+    def mount(self, name: str) -> Optional[str]:
+        build_path = self.builder.get_build_mount_path(name)
+        serve_path = self.builder.get_serve_mount_path(name)
+        mount = Mount(name, build_path, serve_path)
+        ref = self.add_mount(mount)
+        return {
+            "ref": ref,
+            "build": str(build_path.absolute()),
+            "serve": str(serve_path.absolute()),
+        }
+
     def serve_mount(self, name: str) -> Optional[str]:
         return self.builder.serve_mount(name)
 
@@ -1020,6 +1109,10 @@ def auto(
         False,
         help="Use Wasmer to build and serve the project.",
     ),
+    wasmer_bin: Optional[Path] = typer.Option(
+        None,
+        help="The path to the Wasmer binary.",
+    ),
     docker: bool = typer.Option(
         False,
         help="Use Docker to build the project.",
@@ -1064,11 +1157,12 @@ def auto(
     if not (path / "Shipit").exists() or regenerate or regenerate_path is not None:
         generate(path, out=regenerate_path)
 
-    build(path, wasmer=(wasmer or wasmer_deploy), docker=docker, docker_client=docker_client,)
+    build(path, wasmer=(wasmer or wasmer_deploy), docker=docker, docker_client=docker_client, wasmer_registry=wasmer_registry, wasmer_token=wasmer_token, wasmer_bin=wasmer_bin)
     if start or wasmer_deploy:
         serve(
             path,
             wasmer=wasmer,
+            wasmer_bin=wasmer_bin,
             docker=docker,
             docker_client=docker_client,
             start=start,
@@ -1130,6 +1224,10 @@ def serve(
         False,
         help="Use Wasmer to build and serve the project.",
     ),
+    wasmer_bin: Optional[Path] = typer.Option(
+        None,
+        help="The path to the Wasmer binary.",
+    ),
     docker: bool = typer.Option(
         False,
         help="Use Docker to build the project.",
@@ -1170,7 +1268,7 @@ def serve(
         builder = LocalBuilder(path)
     if wasmer or wasmer_deploy:
         builder = WasmerBuilder(
-            builder, path, registry=wasmer_registry, token=wasmer_token
+            builder, path, registry=wasmer_registry, token=wasmer_token, bin=wasmer_bin
         )
     if start:
         builder.run_serve_command("start")
@@ -1193,6 +1291,18 @@ def build(
         False,
         help="Use Wasmer to build and serve the project.",
     ),
+    wasmer_bin: Optional[Path] = typer.Option(
+        None,
+        help="The path to the Wasmer binary.",
+    ),
+    wasmer_registry: Optional[str] = typer.Option(
+        None,
+        help="Wasmer registry.",
+    ),
+    wasmer_token: Optional[str] = typer.Option(
+        None,
+        help="Wasmer token.",
+    ),
     docker: bool = typer.Option(
         False,
         help="Use Docker to build the project.",
@@ -1214,7 +1324,7 @@ def build(
     else:
         builder = LocalBuilder(path)
     if wasmer:
-        builder = WasmerBuilder(builder, path)
+        builder = WasmerBuilder(builder, path, registry=wasmer_registry, token=wasmer_token, bin=wasmer_bin)
 
     ctx = Ctx(builder)
     glb = sl.Globals.standard()
@@ -1224,13 +1334,15 @@ def build(
     mod.add_callable("dep", ctx.dep)
     mod.add_callable("serve", ctx.serve)
     mod.add_callable("run", ctx.run)
-    mod.add_callable("use", ctx.run)
+    mod.add_callable("mount", ctx.mount)
+    mod.add_callable("workdir", ctx.workdir)
     mod.add_callable("copy", ctx.copy)
     mod.add_callable("path", ctx.path)
     mod.add_callable("buildpath", ctx.buildpath)
     mod.add_callable("get_asset", ctx.get_asset)
     mod.add_callable("env", ctx.env)
     mod.add_callable("use", ctx.use)
+    # REMOVE ME
     mod.add_callable("serve_mount", ctx.serve_mount)
 
     dialect = sl.Dialect.extended()
@@ -1252,7 +1364,7 @@ def build(
     serve = next(iter(ctx.serves.values()))
 
     # Build and serve
-    builder.build(env, serve.build)
+    builder.build(env, serve.mounts, serve.build)
     if serve.prepare:
         builder.build_prepare(serve)
     if serve.assets:

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/src/shipit/generator.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, List, Optional
 
-from shipit.providers.base import DependencySpec, Provider, ProviderPlan, DetectResult
+from shipit.providers.base import DependencySpec, Provider, ProviderPlan, DetectResult, MountSpec
 from shipit.providers.registry import providers as registry_providers
 
 
@@ -87,13 +87,13 @@ def generate_shipit(path: Path) -> str:
     plan = ProviderPlan(
         serve_name=provider.serve_name(path),
         provider=provider.provider_kind(path),
+        mounts=provider.mounts(path),
         declarations=provider.declarations(path),
         dependencies=provider.dependencies(path),
         build_steps=provider.build_steps(path),
         prepare=provider.prepare_steps(path),
         commands=provider.commands(path),
-        assets=provider.assets(path),
-        mounts=provider.mounts(path),
+        env=provider.env(path),
     )
 
     # Declare dependency variables (combined) and collect serve deps
@@ -110,15 +110,24 @@ def generate_shipit(path: Path) -> str:
     build_steps_block = ",\n".join([f"    {s}" for s in build_steps])
     deps_array = ", ".join(serve_dep_vars)
     commands_lines = ",\n".join([f'    "{k}": {v}' for k, v in plan.commands.items()])
+    env_lines = None
+    if plan.env is not None:
+        if len(plan.env) == 0:
+            env_lines = "{}"
+        else:
+            env_lines = ",\n".join([f'    "{k}": {v}' for k, v in plan.env.items()])
     assets_block = _render_assets(plan.assets)
     mounts_block = None
     if plan.mounts:
-        mounts_block = ",\n".join([f"    {k}: {v}" for k, v in plan.mounts.items()])
+        mounts = filter(lambda m: m.attach_to_serve, plan.mounts)
+        mounts_block = ",\n".join([f"    {m.name}" for m in mounts])
 
     out: List[str] = []
     if dep_block:
         out.append(dep_block)
         out.append("")
+    for m in plan.mounts:
+        out.append(f"{m.name} = mount(\"{m.name}\")")
     if plan.declarations:
         out.append(plan.declarations)
         out.append("")
@@ -136,13 +145,20 @@ def generate_shipit(path: Path) -> str:
         out.append("  prepare=[")
         out.append(prepare_steps_block)
         out.append("  ],")
+    if env_lines is not None:
+        if env_lines == "{}":
+            out.append("  env = {},")
+        else:
+            out.append("  env = {")
+            out.append(env_lines)
+            out.append("  },")
     out.append("  commands = {")
     out.append(commands_lines)
     out.append("  },")
     if mounts_block:
-        out.append("  mounts={")
+        out.append("  mounts=[")
         out.append(mounts_block)
-        out.append("  },")
+        out.append("  ],")
     out.append(")")
     out.append("")
     return "\n".join(out)

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/src/shipit/providers/base.py

@@ -25,7 +25,8 @@ class Provider(Protocol):
     def prepare_steps(self, path: Path) -> Optional[List[str]]: ...
     def commands(self, path: Path) -> Dict[str, str]: ...
     def assets(self, path: Path) -> Optional[Dict[str, str]]: ...
-    def mounts(self, path: Path) -> Optional[Dict[str, str]]: ...
+    def mounts(self, path: Path) -> List["MountSpec"]: ...
+    def env(self, path: Path) -> Optional[Dict[str, str]]: ...
 
 
 @dataclass
@@ -38,17 +39,25 @@ class DependencySpec:
     use_in_serve: bool = False
 
 
+@dataclass
+class MountSpec:
+    name: str
+    attach_to_build: bool = True
+    attach_to_serve: bool = True
+
+
 @dataclass
 class ProviderPlan:
     serve_name: str
     provider: str
+    mounts: List[MountSpec]
     declarations: Optional[str] = None
     dependencies: List[DependencySpec] = field(default_factory=list)
     build_steps: List[str] = field(default_factory=list)
     prepare: Optional[List[str]] = None
     commands: Dict[str, str] = field(default_factory=dict)
     assets: Optional[Dict[str, str]] = None
-    mounts: Optional[Dict[str, str]] = None
+    env: Optional[Dict[str, str]] = None
 
 
 def _exists(path: Path, *candidates: str) -> bool:

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/src/shipit/providers/gatsby.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists, _has_dependency
+from .base import DetectResult, DependencySpec, Provider, _exists, _has_dependency, MountSpec
 
 
 class GatsbyProvider:
@@ -49,16 +49,20 @@ class GatsbyProvider:
             "run(\"npm install\", inputs=[\"package.json\", \"package-lock.json\"], group=\"install\")",
             "copy(\".\", \".\", ignore=[\"node_modules\", \".git\"])",
             "run(\"npm run build\", outputs=[\"public\"], group=\"build\")",
+            "run(\"cp -R public/* {}/\".format(app[\"build\"]))",
         ]
 
     def prepare_steps(self, path: Path) -> Optional[list[str]]:
         return None
 
     def commands(self, path: Path) -> Dict[str, str]:
-        return {"start": '"static-web-server --root /app/public"'}
+        return {"start": '"static-web-server --root /app"'}
 
     def assets(self, path: Path) -> Optional[Dict[str, str]]:
         return None
 
-    def mounts(self, path: Path) -> Optional[Dict[str, str]]:
+    def mounts(self, path: Path) -> list[MountSpec]:
+        return [MountSpec("app")]
+
+    def env(self, path: Path) -> Optional[Dict[str, str]]:
         return None

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/src/shipit/providers/laravel.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists
+from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec
 
 
 class LaravelProvider:
@@ -45,6 +45,7 @@ class LaravelProvider:
     def build_steps(self, path: Path) -> list[str]:
         return [
             "env(HOME=HOME, COMPOSER_FUND=\"0\")",
+            "workdir(app[\"build\"])",
             "run(\"pie install php/pdo_pgsql\")",
             "run(\"composer install --optimize-autoloader --no-scripts --no-interaction\", inputs=[\"composer.json\", \"composer.lock\", \"artisan\"], outputs=[\".\"], group=\"install\")",
             "run(\"pnpm install\", inputs=[\"package.json\", \"package-lock.json\"], outputs=[\".\"], group=\"install\")",
@@ -54,6 +55,7 @@ class LaravelProvider:
 
     def prepare_steps(self, path: Path) -> Optional[list[str]]:
         return [
+            'workdir(app["serve"])',
             'run("mkdir -p storage/framework/{sessions,views,cache,testing} storage/logs bootstrap/cache")',
             'run("php artisan config:cache")',
             'run("php artisan event:cache")',
@@ -70,5 +72,8 @@ class LaravelProvider:
     def assets(self, path: Path) -> Optional[Dict[str, str]]:
         return None
 
-    def mounts(self, path: Path) -> Optional[Dict[str, str]]:
+    def mounts(self, path: Path) -> list[MountSpec]:
+        return [MountSpec("app")]
+
+    def env(self, path: Path) -> Optional[Dict[str, str]]:
         return None

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/src/shipit/providers/mkdocs.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists
+from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec
 
 
 class MkdocsProvider:
@@ -65,17 +65,20 @@ class MkdocsProvider:
         return [
             *install_lines,
             "copy(\".\", \".\", ignore=[\".venv\", \".git\", \"__pycache__\"])",
-            "run(\"uv run mkdocs build\", outputs=[\".\"], group=\"build\")",
+            "run(\"uv run mkdocs build --site-dir={}\".format(app[\"build\"]), outputs=[\".\"], group=\"build\")",
         ]
 
     def prepare_steps(self, path: Path) -> Optional[list[str]]:
         return None
 
     def commands(self, path: Path) -> Dict[str, str]:
-        return {"start": '"static-web-server --root {}".format(buildpath("site"))'}
+        return {"start": '"static-web-server --root /app"'}
 
     def assets(self, path: Path) -> Optional[Dict[str, str]]:
         return None
 
-    def mounts(self, path: Path) -> Optional[Dict[str, str]]:
+    def mounts(self, path: Path) -> list[MountSpec]:
+        return [MountSpec("app")]
+
+    def env(self, path: Path) -> Optional[Dict[str, str]]:
         return None

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/src/shipit/providers/node_static.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists, _has_dependency
+from .base import DetectResult, DependencySpec, Provider, _exists, _has_dependency, MountSpec
 
 
 class NodeStaticProvider:
@@ -49,6 +49,7 @@ class NodeStaticProvider:
             "run(\"npm install\", inputs=[\"package.json\", \"package-lock.json\"], group=\"install\")",
             "copy(\".\", \".\", ignore=[\"node_modules\", \".git\"])",
             f"run(\"npm run build\", outputs=[\"{output_dir}\"], group=\"build\")",
+            f"run(\"cp -R {output_dir}/* {{}}/\".format(app[\"build\"]))",
         ]
 
     def prepare_steps(self, path: Path) -> Optional[list[str]]:
@@ -61,5 +62,8 @@ class NodeStaticProvider:
     def assets(self, path: Path) -> Optional[Dict[str, str]]:
         return None
 
-    def mounts(self, path: Path) -> Optional[Dict[str, str]]:
+    def mounts(self, path: Path) -> list[MountSpec]:
+        return [MountSpec("app")]
+
+    def env(self, path: Path) -> Optional[Dict[str, str]]:
         return None

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/src/shipit/providers/php.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists
+from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec
 
 
 class PhpProvider:
@@ -48,7 +48,9 @@ class PhpProvider:
         return "HOME = getenv(\"HOME\")"
 
     def build_steps(self, path: Path) -> list[str]:
-        steps = []
+        steps = [
+            "workdir(app[\"build\"])",
+        ]
 
         if self.has_composer(path):
             steps.append("env(HOME=HOME, COMPOSER_FUND=\"0\")")
@@ -69,5 +71,8 @@ class PhpProvider:
     def assets(self, path: Path) -> Optional[Dict[str, str]]:
         return {"php.ini": "get_asset(\"php/php.ini\")"}
 
-    def mounts(self, path: Path) -> Optional[Dict[str, str]]:
+    def mounts(self, path: Path) -> list[MountSpec]:
+        return [MountSpec("app")]
+
+    def env(self, path: Path) -> Optional[Dict[str, str]]:
         return None

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/src/shipit/providers/python.py

@@ -8,6 +8,7 @@ from .base import (
     DependencySpec,
     Provider,
     _exists,
+    MountSpec,
 )
 
 
@@ -57,29 +58,26 @@ class PythonProvider:
         return (
             "cross_platform = getenv(\"SHIPIT_PYTHON_CROSS_PLATFORM\")\n"
             "python_extra_index_url = getenv(\"SHIPIT_PYTHON_EXTRA_INDEX_URL\")\n"
-            "python_cross_packages_serve_path = None\n"
-            "python_cross_packages_path = None\n"
-            "if cross_platform:\n"
-            "  python_cross_packages_path = serve_mount(\"python-cross-packages\")\n"
-            "  python_cross_packages_serve_path = f\"/.venv/lib/python{python_version}/site-packages\"\n"
             "precompile_python = getenv(\"SHIPIT_PYTHON_PRECOMPILE\") in [\"true\", \"True\", \"TRUE\", \"1\", \"on\", \"yes\", \"y\", \"Y\", \"YES\", \"On\", \"ON\"]\n"
+            "python_cross_packages_path = venv[\"build\"] + f\"/lib/python{python_version}/site-packages\""
         )
 
     def build_steps(self, path: Path) -> list[str]:
         return [
+            "workdir(app[\"build\"])",
+            "env(UV_PROJECT_ENVIRONMENT=local_venv[\"build\"] if cross_platform else venv[\"build\"])",
             "run(f\"uv sync --compile --python python{python_version} --locked --no-managed-python\", inputs=[\"pyproject.toml\", \"uv.lock\"], outputs=[\".\"], group=\"install\")",
             "run(f\"uv pip compile pyproject.toml --python-version={python_version} --universal --extra-index-url {python_extra_index_url} --index-url=https://pypi.org/simple --emit-index-url --only-binary :all: -o cross-requirements.txt\", inputs=[\"pyproject.toml\"], outputs=[\"cross-requirements.txt\"]) if cross_platform else None",
             "run(f\"uvx pip install -r cross-requirements.txt --target {python_cross_packages_path} --platform {cross_platform} --only-binary=:all: --python-version={python_version} --compile\", outputs=[\".\"]) if cross_platform else None",
             "run(\"rm cross-requirements.txt\") if cross_platform else None",
-            "path(\".venv/bin\")",
+            "path((local_venv[\"build\"] if cross_platform else venv[\"build\"]) + \"/bin\")",
             "copy(\".\", \".\", ignore=[\".venv\", \".git\", \"__pycache__\"])",
-            "run(\"rm -rf .venv\") if cross_platform else None",
         ]
 
     def prepare_steps(self, path: Path) -> Optional[list[str]]:
         return [
-            'run("echo \\\"Precompiling Python code...\\\"") if precompile_python and python_cross_packages_serve_path else None',
-            'run(f"python -m compileall -o 2 {python_cross_packages_serve_path}") if precompile_python and python_cross_packages_serve_path else None',
+            'run("echo \\\"Precompiling Python code...\\\"") if precompile_python else None',
+            'run("python -m compileall -o 2 $PYTHONPATH") if precompile_python else None',
             'run("echo \\\"Precompiling package code...\\\"") if precompile_python else None',
             'run("python -m compileall -o 2 .") if precompile_python else None',
         ]
@@ -100,5 +98,16 @@ class PythonProvider:
     def assets(self, path: Path) -> Optional[Dict[str, str]]:
         return None
 
-    def mounts(self, path: Path) -> Optional[Dict[str, str]]:
-        return {"python_cross_packages_serve_path": "python_cross_packages_path"}
+    def mounts(self, path: Path) -> list[MountSpec]:
+        return [
+            MountSpec("app"),
+            MountSpec("venv"),
+            MountSpec("local_venv", attach_to_serve=False),
+        ]
+
+    def env(self, path: Path) -> Optional[Dict[str, str]]:
+        # For Django projects, generate an empty env dict to surface the field
+        # in the Shipit file. Other Python projects omit it by default.
+        return {
+            "PYTHONPATH": "\"{}/lib/python{}/site-packages\".format(venv[\"serve\"], python_version)"
+        }

{shipit_cli-0.1.3 → shipit_cli-0.2.1}/src/shipit/providers/staticfile.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists
+from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec
 
 
 class StaticFileProvider:
@@ -41,7 +41,10 @@ class StaticFileProvider:
         ]
 
     def build_steps(self, path: Path) -> list[str]:
-        return ['copy(".", ".", ignore=[".git"])']
+        return [
+            'workdir(app["build"])',
+            'copy(".", ".", ignore=[".git"])'
+        ]
 
     def prepare_steps(self, path: Path) -> Optional[list[str]]:
         return None
@@ -57,5 +60,8 @@ class StaticFileProvider:
     def assets(self, path: Path) -> Optional[Dict[str, str]]:
         return None
 
-    def mounts(self, path: Path) -> Optional[Dict[str, str]]:
+    def mounts(self, path: Path) -> list[MountSpec]:
+        return [MountSpec("app")]
+
+    def env(self, path: Path) -> Optional[Dict[str, str]]:
         return None

shipit_cli-0.2.1/src/shipit/version.py

@@ -0,0 +1,5 @@
+__all__ = ["version", "version_info"]
+
+
+version = "0.2.1"
+version_info = (0, 2, 1, "final", 0)

shipit_cli-0.2.1/tests/test_version.py

@@ -0,0 +1,15 @@
+from pathlib import Path
+
+import tomlkit
+
+from shipit.version import version as module_version
+
+
+def test_module_version_matches_pyproject() -> None:
+    pyproject_path = Path(__file__).resolve().parents[1] / "pyproject.toml"
+    data = tomlkit.parse(pyproject_path.read_text())
+    project_version = data["project"]["version"]
+    assert (
+        module_version == project_version
+    ), f"module version {module_version} != pyproject version {project_version}"
+

shipit_cli-0.1.3/src/shipit/version.py

@@ -1,5 +0,0 @@
-__all__ = ["version", "version_info"]
-
-
-version = "0.1.0"
-version_info = (0, 1, 0, "final", 0)