shipit-cli 0.2.2__tar.gz → 0.3.0__tar.gz

{shipit_cli-0.2.2 → shipit_cli-0.3.0}/PKG-INFO

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

{shipit_cli-0.2.2 → shipit_cli-0.3.0}/pyproject.toml

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

{shipit_cli-0.2.2 → shipit_cli-0.3.0}/src/shipit/cli.py

@@ -696,7 +696,7 @@ class WasmerBuilder:
         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")
+        self.wasmer_dir_path = self.src_dir / ".shipit" / "wasmer"
         self.wasmer_registry = registry
         self.wasmer_token = token
         self.bin = bin.absolute() if bin else "wasmer"
@@ -873,32 +873,22 @@ class WasmerBuilder:
         console.print(manifest_panel, markup=False, highlight=True)
         (self.wasmer_dir_path / "wasmer.toml").write_text(manifest)
 
-        # Crete app.yaml
-        yaml_config = {
-            "kind": "wasmer.io/App.v0",
-            "package": ".",
-            # "capabilities": {
-            #     "database": {
-            #         "engine": "mysql"
-            #     }
-            # },
-            # "volumes": [
-            #     {
-            #         "name": "wp-content",
-            #         "mount": "/app/wp-content"
-            #     }
-            # ]
-        }
+        original_app_yaml_path = self.src_dir / "app.yaml"
+        if original_app_yaml_path.exists():
+            console.print(f"[bold]Using original app.yaml found in source directory[/bold]")
+            yaml_config = yaml.safe_load(original_app_yaml_path.read_text())
+        else:
+            yaml_config = {
+                "kind": "wasmer.io/App.v0",
+            }
+        # Update the app to use the new package
+        yaml_config["package"] = "."
 
         app_yaml = yaml.dump(yaml_config)
         (self.wasmer_dir_path / "app.yaml").write_text(app_yaml)
 
         # self.inner_builder.build_serve(serve)
 
-    @property
-    def wasmer_path(self) -> Path:
-        return self.wasmer_dir_path.read_text()
-
     def run_serve_command(
         self, command: str, extra_args: Optional[List[str]] = None
     ) -> None:
@@ -934,36 +924,34 @@ class WasmerBuilder:
     def deploy(
         self, app_owner: Optional[str] = None, app_name: Optional[str] = None
     ) -> str:
-        if not app_owner or not app_name:
-            raise Exception("app_owner and app_name must be set")
         extra_args = []
         if self.wasmer_registry:
             extra_args += ["--registry", self.wasmer_registry]
         if self.wasmer_token:
             extra_args += ["--token", self.wasmer_token]
-        self.run_command(
-            self.bin,
-            [
-                "package",
-                "push",
-                self.wasmer_path,
-                "--namespace",
-                app_owner,
-                "--non-interactive",
-                *extra_args,
-            ],
-        )
+        if app_owner:
+            extra_args += ["--owner", app_owner]
+        if app_name:
+            extra_args += ["--app-name", app_name]
+        # self.run_command(
+        #     self.bin,
+        #     [
+        #         "package",
+        #         "push",
+        #         self.wasmer_dir_path,
+        #         "--namespace",
+        #         app_owner,
+        #         "--non-interactive",
+        #         *extra_args,
+        #     ],
+        # )
         return self.run_command(
             self.bin,
             [
                 "deploy",
                 "--publish-package",
                 "--dir",
-                self.wasmer_path,
-                "--app-name",
-                app_name,
-                "--owner",
-                app_owner,
+                self.wasmer_dir_path,
                 "--non-interactive",
                 *extra_args,
             ],

{shipit_cli-0.2.2 → shipit_cli-0.3.0}/src/shipit/providers/hugo.py

@@ -43,5 +43,5 @@ class HugoProvider(StaticFileProvider):
     def build_steps(self, path: Path) -> list[str]:
         return [
             'copy(".", ".", ignore=[".git"])',
-            'run("hugo build", outputs=["public"], group="build")',
+            'run("hugo build --destination={}".format(app["build"]), group="build")',
         ]

{shipit_cli-0.2.2 → shipit_cli-0.3.0}/src/shipit/providers/python.py

@@ -63,16 +63,37 @@ class PythonProvider:
         )
 
     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",
+        steps = [
+            "workdir(app[\"build\"])"
+        ]
+
+        if _exists(path, "pyproject.toml"):
+            input_files = ["pyproject.toml"]
+            if _exists(path, "uv.lock"):
+                input_files.append("uv.lock")
+            inputs = ", ".join([f"\"{input}\"" for input in input_files])
+            steps += [
+                "env(UV_PROJECT_ENVIRONMENT=local_venv[\"build\"] if cross_platform else venv[\"build\"])",
+                f"run(f\"uv sync --compile --python python{{python_version}} --locked --no-managed-python\", inputs=[{inputs}], 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\") if cross_platform else None",
+                "run(\"rm cross-requirements.txt\") if cross_platform else None",
+            ]
+        if _exists(path, "requirements.txt"):
+            steps += [
+                "env(UV_PROJECT_ENVIRONMENT=local_venv[\"build\"] if cross_platform else venv[\"build\"])",
+                "run(\"uv init --no-managed-python --python python{{python_version}}\", inputs=[], outputs=[\"uv.lock\"], group=\"install\")",
+                "run(f\"uv add -r requirements.txt\", inputs=[\"requirements.txt\"], 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\") if cross_platform else None",
+                "run(\"rm cross-requirements.txt\") if cross_platform else None",
+            ]
+
+        steps += [
             "path((local_venv[\"build\"] if cross_platform else venv[\"build\"]) + \"/bin\")",
             "copy(\".\", \".\", ignore=[\".venv\", \".git\", \"__pycache__\"])",
         ]
+        return steps
 
     def prepare_steps(self, path: Path) -> Optional[list[str]]:
         return [

shipit_cli-0.3.0/src/shipit/version.py

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

shipit_cli-0.2.2/src/shipit/version.py

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