shipit-cli 0.6.1__py3-none-any.whl → 0.7.0__py3-none-any.whl

shipit/providers/python.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
+import json
 import re
 from pathlib import Path
 from typing import Dict, Optional, Set
 from enum import Enum
+from functools import cached_property
 
 from .base import (
     DetectResult,
@@ -12,6 +14,8 @@ from .base import (
     _exists,
     MountSpec,
     ServiceSpec,
+    VolumeSpec,
+    CustomCommands,
 )
 
 
@@ -47,10 +51,12 @@ class PythonProvider:
     uses_pandoc: bool = False
     only_build: bool = False
     install_requires_all_files: bool = False
+    custom_commands: CustomCommands
 
     def __init__(
         self,
         path: Path,
+        custom_commands: CustomCommands,
         only_build: bool = False,
         extra_dependencies: Optional[Set[str]] = None,
     ):
@@ -62,6 +68,7 @@ class PythonProvider:
         self.default_python_version = python_version
         self.extra_dependencies = set()
         self.only_build = only_build
+        self.custom_commands = custom_commands
         self.extra_dependencies = extra_dependencies or set()
 
         if self.only_build:
@@ -116,6 +123,11 @@ class PythonProvider:
         if "pandoc" in found_deps:
             self.uses_pandoc = True
 
+        if self.custom_commands.start and self.custom_commands.start.startswith("uvicorn "):
+            self.server = PythonServer.Uvicorn
+            self.custom_commands.start = self.custom_commands.start.replace("uvicorn ", "python -m uvicorn ")
+            self.extra_dependencies = {"uvicorn"}
+
         # Set framework
         if _exists(self.path, "manage.py") and ("django" in found_deps):
             framework = PythonFramework.Django
@@ -198,11 +210,14 @@ class PythonProvider:
         return "python"
 
     @classmethod
-    def detect(cls, path: Path) -> Optional[DetectResult]:
+    def detect(cls, path: Path, custom_commands: CustomCommands) -> Optional[DetectResult]:
         if _exists(path, "pyproject.toml", "requirements.txt"):
             if _exists(path, "manage.py"):
                 return DetectResult(cls.name(), 70)
             return DetectResult(cls.name(), 50)
+        if custom_commands.start:
+            if custom_commands.start.startswith("python ") or custom_commands.start.startswith("uv ") or custom_commands.start.startswith("uvicorn "):
+                return DetectResult(cls.name(), 80)
         return None
 
     def initialize(self) -> None:
@@ -261,7 +276,8 @@ class PythonProvider:
             'python_extra_index_url = getenv("SHIPIT_PYTHON_EXTRA_INDEX_URL")\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"\n'
-            'python_serve_path = "{}/lib/python{}/site-packages".format(venv["serve"], python_version)\n'
+            'python_serve_site_packages_path = "{}/lib/python{}/site-packages".format(venv["serve"], python_version)\n'
+            'app_serve_path = app["serve"]\n'
         )
 
     def build_steps(self) -> list[str]:
@@ -278,6 +294,17 @@ class PythonProvider:
             if _exists(self.path, "uv.lock"):
                 input_files.append("uv.lock")
                 extra_args = " --locked"
+
+            # Extra input files check, as glob pattern
+            globs = ["README*", "LICENSE*", "LICENCE*", "MAINTAINERS*", "AUTHORS*"]
+            # Glob check
+            for glob in globs:
+                for path in self.path.glob(glob):
+                    # make path relative to self.path
+                    path = str(path.relative_to(self.path))
+                    input_files.append(path)
+
+            # Join inputs
             inputs = ", ".join([f'"{input}"' for input in input_files])
             steps += [
                 'env(UV_PROJECT_ENVIRONMENT=local_venv["build"] if cross_platform else venv["build"])',
@@ -290,7 +317,7 @@ class PythonProvider:
             ]
             if not self.only_build:
                 steps += [
-                    '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", outputs=["cross-requirements.txt"]) if cross_platform else None',
+                    '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 -o cross-requirements.txt", outputs=["cross-requirements.txt"]) if cross_platform else None',
                     f'run(f"uvx pip install -r cross-requirements.txt {extra_deps} --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',
                 ]
@@ -310,7 +337,7 @@ class PythonProvider:
                 ]
             if not self.only_build:
                 steps += [
-                    'run(f"uv pip compile requirements.txt --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=["requirements.txt"], outputs=["cross-requirements.txt"]) if cross_platform else None',
+                    'run(f"uv pip compile requirements.txt --python-version={python_version} --universal --extra-index-url {python_extra_index_url} --index-url=https://pypi.org/simple --emit-index-url -o cross-requirements.txt", inputs=["requirements.txt"], outputs=["cross-requirements.txt"]) if cross_platform else None',
                     f'run(f"uvx pip install -r cross-requirements.txt {extra_deps} --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',
                 ]
@@ -331,12 +358,13 @@ class PythonProvider:
             return []
         return [
             'run("echo \\"Precompiling Python code...\\"") if precompile_python else None',
-            'run(f"python -m compileall -o 2 {python_serve_path}") if precompile_python else None',
+            'run(f"python -m compileall -o 2 {python_serve_site_packages_path}") if precompile_python else None',
             'run("echo \\"Precompiling package code...\\"") if precompile_python else None',
-            'run("python -m compileall -o 2 {}".format(app["serve"])) if precompile_python else None',
+            'run(f"python -m compileall -o 2 {app_serve_path}") if precompile_python else None',
         ]
 
-    def get_main_file(self) -> Optional[str]:
+    @cached_property
+    def main_file(self) -> Optional[str]:
         paths_to_try = ["main.py", "app.py", "streamlit_app.py", "Home.py", "*_app.py"]
         for path in paths_to_try:
             if "*" in path:
@@ -347,14 +375,20 @@ class PythonProvider:
                 return f"src/{path}"
         for path in paths_to_try:
             try:
-                found_path = next(self.path.glob(f"**/{path}.py"))
+                found_path = next(self.path.glob(f"**/{path}"))
             except StopIteration:
                 found_path = None
             if found_path:
-                return found_path.relative_to(self.path)
+                return str(found_path.relative_to(self.path))
         return None
 
     def commands(self) -> Dict[str, str]:
+        commands = self.base_commands()
+        if self.custom_commands.start:
+            commands["start"] = json.dumps(self.custom_commands.start)
+        return commands
+
+    def base_commands(self) -> Dict[str, str]:
         if self.only_build:
             return {}
         if self.framework == PythonFramework.Django:
@@ -379,7 +413,7 @@ class PythonProvider:
             migrate_cmd = '"python manage.py migrate"'
             return {"start": start_cmd, "after_deploy": migrate_cmd}
 
-        main_file = self.get_main_file()
+        main_file = self.main_file
 
         if not main_file:
             start_cmd = '"python -c \'print(\\"No start command detected, please provide a start command manually\\")\'"'
@@ -422,9 +456,6 @@ class PythonProvider:
 
         return {"start": start_cmd}
 
-    def assets(self) -> Optional[Dict[str, str]]:
-        return None
-
     def mounts(self) -> list[MountSpec]:
         if self.only_build:
             return [
@@ -436,12 +467,21 @@ class PythonProvider:
             MountSpec("local_venv", attach_to_serve=False),
         ]
 
+    def volumes(self) -> list[VolumeSpec]:
+        return []
+
     def env(self) -> Optional[Dict[str, str]]:
         if self.only_build:
             return {}
         # For Django projects, generate an empty env dict to surface the field
         # in the Shipit file. Other Python projects omit it by default.
-        env_vars = {"PYTHONPATH": "python_serve_path", "HOME": 'app["serve"]'}
+        python_path = "f\"{app_serve_path}:{python_serve_site_packages_path}\""
+        main_file = self.main_file
+        if main_file and main_file.startswith("src/"):
+            python_path = "f\"{app_serve_path}:{app_serve_path}/src:{python_serve_site_packages_path}\""
+        else:
+            python_path =  "f\"{app_serve_path}:{python_serve_site_packages_path}\""
+        env_vars = {"PYTHONPATH": python_path, "HOME": 'app["serve"]'}
         if self.framework == PythonFramework.Streamlit:
             env_vars["STREAMLIT_SERVER_HEADLESS"] = '"true"'
         elif self.framework == PythonFramework.MCP:

shipit/providers/registry.py

@@ -6,6 +6,7 @@ from .hugo import HugoProvider
 from .laravel import LaravelProvider
 from .mkdocs import MkdocsProvider
 from .node_static import NodeStaticProvider
+from .wordpress import WordPressProvider
 from .php import PhpProvider
 from .python import PythonProvider
 from .staticfile import StaticFileProvider
@@ -19,6 +20,7 @@ def providers() -> list[type[Provider]]:
         HugoProvider,
         MkdocsProvider,
         PythonProvider,
+        WordPressProvider,
         PhpProvider,
         NodeStaticProvider,
         StaticFileProvider,

shipit/providers/staticfile.py

@@ -3,25 +3,37 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec, ServiceSpec
+from .base import (
+    DetectResult,
+    DependencySpec,
+    Provider,
+    _exists,
+    MountSpec,
+    ServiceSpec,
+    VolumeSpec,
+    CustomCommands,
+)
 
 
 class StaticFileProvider:
-    def __init__(self, path: Path):
+    def __init__(self, path: Path, custom_commands: CustomCommands):
         self.path = path
+        self.custom_commands = custom_commands
 
     @classmethod
     def name(cls) -> str:
         return "staticfile"
 
     @classmethod
-    def detect(cls, path: Path) -> Optional[DetectResult]:
+    def detect(cls, path: Path, custom_commands: CustomCommands) -> Optional[DetectResult]:
         if _exists(path, "Staticfile"):
             return DetectResult(cls.name(), 50)
         if _exists(path, "index.html") and not _exists(
             path, "package.json", "pyproject.toml", "composer.json"
         ):
             return DetectResult(cls.name(), 10)
+        if custom_commands.start and custom_commands.start.startswith("static-web-server "):
+            return DetectResult(cls.name(), 70)
         return None
 
     def initialize(self) -> None:
@@ -60,12 +72,12 @@ class StaticFileProvider:
             "start": '"static-web-server --root={} --log-level=info".format(app["serve"])'
         }
 
-    def assets(self) -> Optional[Dict[str, str]]:
-        return None
-
     def mounts(self) -> list[MountSpec]:
         return [MountSpec("app")]
 
+    def volumes(self) -> list[VolumeSpec]:
+        return []
+
     def env(self) -> Optional[Dict[str, str]]:
         return None
     

shipit/providers/wordpress.py

@@ -0,0 +1,88 @@
+from __future__ import annotations
+from shipit.providers.php import PhpProvider
+
+from pathlib import Path
+from typing import Dict, Optional
+
+from .base import (
+    DetectResult,
+    DependencySpec,
+    Provider,
+    _exists,
+    MountSpec,
+    ServiceSpec,
+    VolumeSpec,
+    CustomCommands,
+)
+from .php import PhpProvider
+
+
+class WordPressProvider(PhpProvider):
+    def __init__(self, path: Path, custom_commands: CustomCommands):
+        self.path = path
+        self.custom_commands = custom_commands
+
+    @classmethod
+    def name(cls) -> str:
+        return "wordpress"
+
+    @classmethod
+    def detect(cls, path: Path, custom_commands: CustomCommands) -> Optional[DetectResult]:
+        if _exists(path, "wp-content") and _exists(path, "index.php") and _exists(path, "wp-load.php"):
+            return DetectResult(cls.name(), 80)
+        return None
+
+    def initialize(self) -> None:
+        pass
+
+    def serve_name(self) -> str:
+        return self.path.name
+
+    def provider_kind(self) -> str:
+        return "php"
+
+    def dependencies(self) -> list[DependencySpec]:
+        return [
+            *super().dependencies(),
+            DependencySpec("bash", use_in_build=False, use_in_serve=True),
+        ]
+
+    def declarations(self) -> Optional[str]:
+        return super().declarations() + (
+            "wp_cli_version = getenv(\"SHIPIT_WPCLI_VERSION\")\n"
+            "if wp_cli_version:\n"
+            "    wp_cli_download_url = f\"https://github.com/wp-cli/wp-cli/releases/download/v{wp_cli_version}/wp-cli-{wp_cli_version}.phar\"\n"
+            "else:\n"
+            "    wp_cli_download_url = \"https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar\"\n"
+        )
+
+    def build_steps(self) -> list[str]:
+        steps = [
+            'copy(wp_cli_download_url, "{}/wp-cli.phar".format(assets["build"]))',
+            'copy("wordpress/install.sh", "{}/wordpress-install.sh".format(assets["build"]), base="assets")',
+        ]
+        if not _exists(self.path, "wp-config.php"):
+            steps.append('copy("wordpress/wp-config.php", "{}/wp-config.php".format(app["build"]), base="assets")')
+        return steps + super().build_steps()
+
+    def prepare_steps(self) -> Optional[list[str]]:
+        return super().prepare_steps()
+
+    def commands(self) -> Dict[str, str]:
+        return {
+            "start": '"php -S localhost:8080 -t ."',
+            "wp": '"php {}/wp-cli.phar --allow-root --path={}".format(assets[\"serve\"], app[\"serve\"])',
+            "after_deploy": '"bash {}/wordpress-install.sh".format(assets["serve"])',
+        }
+
+    def mounts(self) -> list[MountSpec]:
+        return super().mounts()
+
+    def volumes(self) -> list[VolumeSpec]:
+        return [VolumeSpec(name="wp-content", serve_path="\"{}/wp-content/\".format(app[\"serve\"])", var_name="wp_content")]
+
+    def env(self) -> Optional[Dict[str, str]]:
+        return None
+    
+    def services(self) -> list[ServiceSpec]:
+        return [ServiceSpec(name="database", provider="mysql")]

shipit/version.py

@@ -1,5 +1,5 @@
 __all__ = ["version", "version_info"]
 
 
-version = "0.6.1"
-version_info = (0, 6, 1, "final", 0)
+version = "0.7.0"
+version_info = (0, 7, 0, "final", 0)

{shipit_cli-0.6.1.dist-info → shipit_cli-0.7.0.dist-info}/METADATA

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.6.1
+Version: 0.7.0
 Summary: Add your description here
 Project-URL: homepage, https://wasmer.io
 Project-URL: repository, https://github.com/wasmerio/shipit
 Project-URL: Changelog, https://github.com/wasmerio/shipit/changelog
 Requires-Python: >=3.10
 Requires-Dist: pyyaml>=6.0.2
+Requires-Dist: requests>=2.32.5
 Requires-Dist: rich>=14.1.0
 Requires-Dist: sh>=2.2.2
 Requires-Dist: starlark-pyo3>=2025.1

shipit_cli-0.7.0.dist-info/RECORD

@@ -0,0 +1,24 @@
+shipit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+shipit/cli.py,sha256=cLWFBrY24w--GQj_YtRo7U7jnGITEG_TWo4D9W6XH1Q,57549
+shipit/env.py,sha256=Bede00-iFI67RZ0bx92JyX49XL7Q91HK-QoKRpwPaGQ,725
+shipit/generator.py,sha256=GFsuqZG83gn7yxphE4GHwZjEB3sToJn24yNDE-zrTtM,6400
+shipit/procfile.py,sha256=GlfdwzFUr0GWGKaaiXlLKNFInWaRNMy_wN14UEyU_5Q,2974
+shipit/version.py,sha256=myhj6JcZUHlBRvAyfRYaJ_bv3PrzoXvUd5ppXAZh014,95
+shipit/assets/php/php.ini,sha256=f4irndAjB4GuuouEImRkNV22Q-yw1KqR-43jAMDw730,2531
+shipit/assets/wordpress/install.sh,sha256=GOIwJX3qPp7VuZXjkKVFFY6Mo9k7VFWfobS6aZYitPg,817
+shipit/assets/wordpress/wp-config.php,sha256=IdGQoeg8E89JiqwxO2i8WnGMzmhNWgRz80X6lbU5GXc,4134
+shipit/providers/base.py,sha256=-lraLhnXtc2SfYNIUiyry7xD2NL4q0n6voNjr6qfRis,2994
+shipit/providers/gatsby.py,sha256=kzfS-z040GaJ0a9u2_6S6K-ykGSX2yPG17VpjUWBOBA,2393
+shipit/providers/hugo.py,sha256=BvSYTDTVxHz6FW2mA4sqIsNayFRo5BK6Z4tWFRRimmY,1644
+shipit/providers/laravel.py,sha256=yhOnaaXZ2US8EO5ZD5pBTerSOBi9IWBBIqeQrbW7YoM,3028
+shipit/providers/mkdocs.py,sha256=pWTeIUEnSyB653s7Cw_OSllgiSGcDymRTEHgV5ChDLM,2070
+shipit/providers/node_static.py,sha256=QVUTTZbvUGtj2yT9WTbGmuM30rJzejnp76crIqSGA7o,2564
+shipit/providers/php.py,sha256=JIWl5CdVEdf9DAr9O9rR8NucucYCj_M5PbJRw_SnmYU,3541
+shipit/providers/python.py,sha256=n0748miZ5RpQyQUCmkq3_G2Nnub8SaogZoJTNNFalZc,20801
+shipit/providers/registry.py,sha256=lHUViVuPJf1OIZD8I_NTX4LP7E3Uo5-MmLfarmAA_cM,729
+shipit/providers/staticfile.py,sha256=O1D0cXa_cFZH4OXRFLjBG3e-LbjMDo7ZBC2D3CvrPo4,2218
+shipit/providers/wordpress.py,sha256=wMIcBpICqcEpbOgJCufrnM-r76AVI7_xC-NUlh9XMmE,3016
+shipit_cli-0.7.0.dist-info/METADATA,sha256=Ang6CnPqUUcKRovpIAMHMsnccw640bQUYlpPOZ3MNoA,494
+shipit_cli-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shipit_cli-0.7.0.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
+shipit_cli-0.7.0.dist-info/RECORD,,

shipit_cli-0.6.1.dist-info/RECORD

@@ -1,19 +0,0 @@
-shipit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shipit/cli.py,sha256=9L2BIxwZsRrOOR5hIw75NhQWlFqXchMlrbS7qslGWfs,53264
-shipit/generator.py,sha256=7kOUUDdibUM8-KRUJJugyVLAdu9UIAtWEe6aU6NVajU,6106
-shipit/version.py,sha256=Ct7YXXUESk4JUZghzhEdPrW4vt9J9zlnrxuYtQ5snpI,95
-shipit/assets/php/php.ini,sha256=f4irndAjB4GuuouEImRkNV22Q-yw1KqR-43jAMDw730,2531
-shipit/providers/base.py,sha256=WyVazgB1otGiTXOezYmvqPOm1Nt6mYdLvflSiZrXT7g,2593
-shipit/providers/gatsby.py,sha256=2m00AuiuacOgJpDMjp5v7WIG9kC9RGKFBG6-rzwbiW0,2219
-shipit/providers/hugo.py,sha256=YtOmPw4KaE3f8GnPjzLrO3IxlEATCvkc86HOlKDPfMc,1520
-shipit/providers/laravel.py,sha256=1RrwReqDU5OL2NDRKIJEITP3V_M1fC7jndsLN08zW4Y,2858
-shipit/providers/mkdocs.py,sha256=jkBMgkcIyGYBC56m9OzpgaqDy1rdQ0xLpo6nKdqOkZQ,1931
-shipit/providers/node_static.py,sha256=unjswalAp-KX1xnexzpPOyN5Qls00Cvi1MK7lBbYkKQ,2390
-shipit/providers/php.py,sha256=nvB4JHwCxyRbayj3waEHicjATE8C0KxtRnwJuZ7mvFY,2675
-shipit/providers/python.py,sha256=dPKOaxbzUaK1_2LiBpOPZlKfU4dlcac-rWDCew69JKE,18968
-shipit/providers/registry.py,sha256=UisII1dr24ZxmDD8GnpTsyNwPN9W8MnAHQ1Px1iJ-OQ,661
-shipit/providers/staticfile.py,sha256=m1rzbCRO7YWdUH6j0HSMp8OMBktdfwoY_PhFNYe71Xk,1908
-shipit_cli-0.6.1.dist-info/METADATA,sha256=Z9h1DnDBU-3cbqzZ2W0gCce6volmhcDoktd-Atp3C4I,462
-shipit_cli-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shipit_cli-0.6.1.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
-shipit_cli-0.6.1.dist-info/RECORD,,