shipit-cli 0.15.0__py3-none-any.whl → 0.15.1__py3-none-any.whl

shipit/cli.py

@@ -153,9 +153,7 @@ class Ctx:
             commands=commands,
             prepare=prepare_steps,
             workers=workers,
-            mounts=self.get_refs([mount.ref for mount in mounts])
-            if mounts
-            else None,
+            mounts=self.get_refs([mount.ref for mount in mounts]) if mounts else None,
             volumes=self.get_refs([volume["ref"] for volume in volumes])
             if volumes
             else None,
@@ -206,8 +204,12 @@ class Ctx:
         serve_path = self.runner.get_serve_mount_path(name)
         mount = Mount(name, build_path, serve_path)
         ref = self.add_mount(mount)
-        
-        return CtxMount(ref=ref, path=str(build_path.absolute()), serve_path=str(serve_path.absolute()))
+
+        return CtxMount(
+            ref=ref,
+            path=str(build_path.absolute()),
+            serve_path=str(serve_path.absolute()),
+        )
 
     def add_volume(self, volume: Volume) -> Optional[str]:
         self.volumes.append(volume)
@@ -257,7 +259,7 @@ def evaluate_shipit(
         raise ValueError(f"No serve definition found in {shipit_file}")
     assert len(ctx.serves) <= 1, "Only one serve is allowed for now"
     serve = next(iter(ctx.serves.values()))
-    
+
     # Now we apply the custom commands (start, after_deploy, build, install)
     if provider_config.commands.start:
         serve.commands["start"] = provider_config.commands.start
@@ -271,11 +273,23 @@ def evaluate_shipit(
         has_done_install = False
         for step in serve.build:
             if isinstance(step, RunStep):
-                if step.group == "build" and not has_done_build and provider_config.commands.build:
-                    new_build.append(RunStep(provider_config.commands.build, group="build"))
+                if (
+                    step.group == "build"
+                    and not has_done_build
+                    and provider_config.commands.build
+                ):
+                    new_build.append(
+                        RunStep(provider_config.commands.build, group="build")
+                    )
                     has_done_build = True
-                elif step.group == "install" and not has_done_install and provider_config.commands.install:
-                    new_build.append(RunStep(provider_config.commands.install, group="install"))
+                elif (
+                    step.group == "install"
+                    and not has_done_install
+                    and provider_config.commands.install
+                ):
+                    new_build.append(
+                        RunStep(provider_config.commands.install, group="install")
+                    )
                     has_done_install = True
                 else:
                     new_build.append(step)
@@ -288,10 +302,14 @@ def evaluate_shipit(
         serve.build = new_build
 
     if serve.commands.get("start"):
-        serve.commands["start"] = serve.commands["start"].replace("$PORT", str(provider_config.port or "8080"))
-    
+        serve.commands["start"] = serve.commands["start"].replace(
+            "$PORT", str(provider_config.port or "8080")
+        )
+
     if serve.commands.get("after_deploy"):
-        serve.commands["after_deploy"] = serve.commands["after_deploy"].replace("$PORT", str(provider_config.port or "8080"))
+        serve.commands["after_deploy"] = serve.commands["after_deploy"].replace(
+            "$PORT", str(provider_config.port or "8080")
+        )
 
     return ctx, serve
 
@@ -406,6 +424,9 @@ def auto(
         help="The port to use (defaults to 8080).",
     ),
 ):
+    # We assume wasmer as an active flag if we pass wasmer deploy or wasmer deploy config
+    wasmer = wasmer or wasmer_deploy or (wasmer_deploy_config is not None)
+
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
 
@@ -440,7 +461,7 @@ def auto(
         install_command=install_command,
         build_command=build_command,
         start_command=start_command,
-        wasmer=(wasmer or wasmer_deploy),
+        wasmer=wasmer,
         docker=docker,
         docker_client=docker_client,
         skip_docker_if_safe_build=skip_docker_if_safe_build,
@@ -522,7 +543,9 @@ def generate(
     if build_command:
         base_config.commands.build = build_command
     provider_cls = load_provider(path, base_config, use_provider=provider)
-    provider_config = load_provider_config(provider_cls, path, base_config, config=config)
+    provider_config = load_provider_config(
+        provider_cls, path, base_config, config=config
+    )
     provider = provider_cls(path, provider_config)
     content = generate_shipit(path, provider)
     config_json = provider_config.model_dump_json(indent=2, exclude_defaults=True)
@@ -616,6 +639,9 @@ def serve(
         help="Save the output of the Wasmer build to a json file",
     ),
 ) -> None:
+    # We assume wasmer as an active flag if we pass wasmer deploy or wasmer deploy config
+    wasmer = wasmer or wasmer_deploy or (wasmer_deploy_config is not None)
+
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
 
@@ -626,8 +652,7 @@ def serve(
     else:
         build_backend = LocalBuildBackend(path, ASSETS_PATH)
 
-    needs_wasmer = wasmer or wasmer_deploy or wasmer_deploy_config
-    if needs_wasmer:
+    if wasmer:
         runner: Runner = WasmerRunner(
             build_backend,
             path,
@@ -783,7 +808,9 @@ def plan(
     if serve_port:
         base_config.port = serve_port
     provider_cls = load_provider(path, base_config, use_provider=provider)
-    provider_config = load_provider_config(provider_cls, path, base_config, config=config)
+    provider_config = load_provider_config(
+        provider_cls, path, base_config, config=config
+    )
     # provider_config = runner.prepare_config(provider_config)
     ctx, serve = evaluate_shipit(shipit_file, build_backend, runner, provider_config)
 
@@ -811,9 +838,7 @@ def plan(
         provider_config.commands.build = build_command
     plan_output = {
         "provider": provider_cls.name(),
-        "config": json.loads(
-            provider_config.model_dump_json(exclude_defaults=True)
-        ),
+        "config": json.loads(provider_config.model_dump_json(exclude_defaults=True)),
         "services": [
             {"name": svc.name, "provider": svc.provider}
             for svc in (serve.services or [])
@@ -936,11 +961,11 @@ def build(
         base_config.port = serve_port
 
     provider_cls = load_provider(path, base_config, use_provider=provider)
-    provider_config = load_provider_config(provider_cls, path, base_config, config=config)
-    provider_config = runner.prepare_config(provider_config)
-    ctx, serve = evaluate_shipit(
-        shipit_file, build_backend, runner, provider_config
+    provider_config = load_provider_config(
+        provider_cls, path, base_config, config=config
     )
+    provider_config = runner.prepare_config(provider_config)
+    ctx, serve = evaluate_shipit(shipit_file, build_backend, runner, provider_config)
     env = {
         "PATH": "",
         "COLORTERM": os.environ.get("COLORTERM", ""),
@@ -986,7 +1011,9 @@ def build(
         env_vars = dotenv_values(path / f".env.{env_name}")
         serve.env.update(env_vars)
 
-    assert serve.commands.get("start"), "No start command could be found, please provide a start command"
+    assert serve.commands.get("start"), (
+        "No start command could be found, please provide a start command"
+    )
 
     # Build and serve
     build_backend.build(serve.name, env, serve.mounts or [], serve.build)

shipit/version.py

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

{shipit_cli-0.15.0.dist-info → shipit_cli-0.15.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.15.0
+Version: 0.15.1
 Summary: Shipit CLI is the best way to build, serve and deploy your projects anywhere.
 Project-URL: homepage, https://wasmer.io
 Project-URL: repository, https://github.com/wasmerio/shipit

{shipit_cli-0.15.0.dist-info → shipit_cli-0.15.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 shipit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shipit/cli.py,sha256=YPEyl6yjk2CH2YnjB1wmF3m_ZbJ0_Ktr2mmpFFLrsS4,33825
+shipit/cli.py,sha256=vh1vjJ-RjS-fCYp4ErF7L0xALV9jA1mUW6eUe5o9OFM,34390
 shipit/generator.py,sha256=CyAwWmwcd0JrRSlcux9X1ZWuAnzJK3QBjN5yKgmKVqQ,7526
 shipit/procfile.py,sha256=bjsdG8aSbRhKvrN96OiSOh0xjJHnlZg42eadtlsLc0M,1129
 shipit/shipit_types.py,sha256=wQzuYOIJMlovOq56ropf2T3j_Ye6Y8BYYdAuXfEGHbM,2062
 shipit/ui.py,sha256=vqtuAYXwB_PqlcOchrPFTQ3yoCXRBqV_GnB5R2u-1-k,243
 shipit/utils.py,sha256=XaiuaT_5mnzlXD9i1PAkaVc162y5Y_wj_oo1z2gUQBI,248
-shipit/version.py,sha256=QJqEGC_YsFig0b6PsnwwJQh_zE-YL49JPlItpKrgL-U,97
+shipit/version.py,sha256=q8SlRWdsvng7MZpPYDKxyoGYK8uOMP4KzryloyqqOfc,97
 shipit/assets/php/php.ini,sha256=SaR3wvssSROtxTY_CQ5-BspM_47_I971V5X2dsqe8sU,2579
 shipit/assets/wordpress/install.sh,sha256=8sNe4w9F9y97JR-w5Q0ZHVgZvNm_vnd1CacY5fQjewI,3087
 shipit/assets/wordpress/wp-config.php,sha256=q7KHB_TyLrodXzbg8EEPm42XWDIevtwL6wk3L0kbVrs,4809
@@ -28,7 +28,7 @@ shipit/runners/__init__.py,sha256=s1kICs9W8Z5buF0dalgNNx2AzGAsiTw8OzCIgYiN_ps,15
 shipit/runners/base.py,sha256=edXGW_4lngQS_Q110yy_6UnyOSKLbxxJm5vDIu8ge7Y,582
 shipit/runners/local.py,sha256=OFWyI_IO_7q_QZrbEnXFRUVbNCwNYuxZTdA1PI2Icp4,4138
 shipit/runners/wasmer.py,sha256=d2oL7x74yU6_q1cMYuu3M19XyGzDKnJZHirf1SBuF_k,17202
-shipit_cli-0.15.0.dist-info/METADATA,sha256=RJ0Om2Z_PBlwYa7O6jG4F2aIFaEQK2xXPAs6NQ9hPkk,3773
-shipit_cli-0.15.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-shipit_cli-0.15.0.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
-shipit_cli-0.15.0.dist-info/RECORD,,
+shipit_cli-0.15.1.dist-info/METADATA,sha256=dQCRPs5oKZzgOzJrdG-Ji_gYNk7GXv7ojZm02ngQg1k,3773
+shipit_cli-0.15.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+shipit_cli-0.15.1.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
+shipit_cli-0.15.1.dist-info/RECORD,,