shipit-cli 0.2.3__py3-none-any.whl → 0.3.0__py3-none-any.whl

shipit/cli.py

@@ -873,22 +873,16 @@ 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)
@@ -930,25 +924,27 @@ 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_dir_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,
             [
@@ -956,10 +952,6 @@ class WasmerBuilder:
                 "--publish-package",
                 "--dir",
                 self.wasmer_dir_path,
-                "--app-name",
-                app_name,
-                "--owner",
-                app_owner,
                 "--non-interactive",
                 *extra_args,
             ],

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/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/version.py

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

{shipit_cli-0.2.3.dist-info → shipit_cli-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.2.3
+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.3.dist-info → shipit_cli-0.3.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
 shipit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shipit/cli.py,sha256=J6EsxHjDgUVwgftiZYqz6GtkV2C_UOSSnxRni1ByOtU,48232
+shipit/cli.py,sha256=LYgKEGLuMa3fjdTXlVZRVb2mjrrxUruWb0KeGnPSK2c,48195
 shipit/generator.py,sha256=iBkVcs44dd_xYKitM_zNVLnpiZ3KrV__xVswPMCZ97Y,5570
-shipit/version.py,sha256=PNN0ywrz5joL0Hg0VsSUv1Z4nLOEF_6DBNJIPdeEuHA,95
+shipit/version.py,sha256=u34F4nSbND7SbkfxNWy4C1ryNf8iOdLnPWvIT6jenxQ,95
 shipit/assets/php/php.ini,sha256=f4irndAjB4GuuouEImRkNV22Q-yw1KqR-43jAMDw730,2531
 shipit/providers/base.py,sha256=bqh1k7TSPJo7hOnxgdI6PIJmrqzQkZhgUoV0bbYIWrw,2403
 shipit/providers/gatsby.py,sha256=VUGhE7xtQJHsYzEzdkXi3n5mbpgg868wbUVOU4MWN5s,2173
-shipit/providers/hugo.py,sha256=UDIM2KvPcgJsiLn0mZ5Dejtuf09X3cnEQYkn-2KpZKI,1465
+shipit/providers/hugo.py,sha256=H2yyht9oOjdjFHZiNhzz-WT3Ac-_vop1EPiJ0fGH740,1483
 shipit/providers/laravel.py,sha256=4wSa0ByLrq87WhrAf04mOGVKz_xn8xtCaSYHpx0l7-0,2812
 shipit/providers/mkdocs.py,sha256=YIbSAaL2jDQtr8YteZmKjIbRMDWdoQgy6G2D6dfH1ws,2842
 shipit/providers/node_static.py,sha256=Zpq4fRCMBzGkObdsfPVAoYUAnZSqE9C1D0aaJyI30Fc,2334
 shipit/providers/php.py,sha256=HxxgfXmA0U6PeTLyFMbyXWm05G_IQqdFz4Liq1d_VBM,2635
-shipit/providers/python.py,sha256=ep8qflY_9J-F_zei4Lt0zeDWFEHUf-lOr4F-LBgYPiE,4870
+shipit/providers/python.py,sha256=O186GDOC3nTX6z3MTx_gS2iBqZCEWm7-6Z3y7j9BvH8,6268
 shipit/providers/registry.py,sha256=V6CAOK5gEX0RhWhr-lcAkvlwRuMom7YY2ZeAyRy1Eck,672
 shipit/providers/staticfile.py,sha256=9Ksi9WO_52Dnj_hqNn_cYVjTniJ3tBjVr5kBvgCPF-0,1908
-shipit_cli-0.2.3.dist-info/METADATA,sha256=uPpUcVzeUp9ciSM-ctnVA6AfRdp0c3QpgGCSVGkTVKQ,462
-shipit_cli-0.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shipit_cli-0.2.3.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
-shipit_cli-0.2.3.dist-info/RECORD,,
+shipit_cli-0.3.0.dist-info/METADATA,sha256=xhzPFKpiWhtALiY8JQnUT6GclkaXJ580Zn7sH20v2u4,462
+shipit_cli-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shipit_cli-0.3.0.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
+shipit_cli-0.3.0.dist-info/RECORD,,