shipit-cli 0.17.5__tar.gz → 0.17.7__tar.gz

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.17.5
+Version: 0.17.7
 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
@@ -133,3 +133,20 @@ The e2e tests will:
 * Build the project (locally, or with docker)
 * Run the project (locally or with Wasmer)
 * Test that the project output (via http requests) is the correct one
+
+### Automatic PyPI Publish
+
+Publishing to PyPI is automated with GitHub Actions on version tags.
+
+Requirements:
+
+* Add a repository secret named `PYPI_API_TOKEN` with a PyPI API token.
+* Push tags using the `vX.Y.Z` format (for example: `v0.17.5`).
+
+On each `v*` tag push, the workflow:
+
+* Runs regular test and e2e workflows.
+* Validates that the tag version without the leading `v` matches:
+  * `project.version` in `pyproject.toml`
+  * `version` in `src/shipit/version.py`
+* Builds the package and publishes to PyPI only if all checks pass.

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/README.md

@@ -110,3 +110,20 @@ The e2e tests will:
 * Build the project (locally, or with docker)
 * Run the project (locally or with Wasmer)
 * Test that the project output (via http requests) is the correct one
+
+### Automatic PyPI Publish
+
+Publishing to PyPI is automated with GitHub Actions on version tags.
+
+Requirements:
+
+* Add a repository secret named `PYPI_API_TOKEN` with a PyPI API token.
+* Push tags using the `vX.Y.Z` format (for example: `v0.17.5`).
+
+On each `v*` tag push, the workflow:
+
+* Runs regular test and e2e workflows.
+* Validates that the tag version without the leading `v` matches:
+  * `project.version` in `pyproject.toml`
+  * `version` in `src/shipit/version.py`
+* Builds the package and publishes to PyPI only if all checks pass.

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.17.5"
+version = "0.17.7"
 description = "Shipit CLI is the best way to build, serve and deploy your projects anywhere."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -38,17 +38,49 @@ packages = ["src/shipit"]
 [tool.hatch.build.targets.sdist]
 only-include = ["src/shipit", "tests"]
 
-[tool.uv]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "aiohttp>=3.12.15",
+    "mypy>=1.18.2",
     "pytest>=8.4.1",
     "pytest-asyncio>=1.2.0",
     "pytest-rerunfailures>=16.0.1",
     "pytest-xdist>=3.8.0",
+    "types-pyyaml>=6.0.12.20250915",
+    "types-requests>=2.32.4.20250913",
+    "types-toml>=0.10.8.20240310",
 ]
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
+markers = [
+    "e2e: end-to-end tests that require external runtimes and network access",
+]
+
+[tool.mypy]
+python_version = "3.13"
+files = ["src/shipit"]
+exclude = ["^examples/"]
+show_error_codes = true
+pretty = true
+ignore_missing_imports = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+module = [
+    "shipit.cli",
+    "shipit.generator",
+    "shipit.providers.go",
+    "shipit.providers.hugo",
+    "shipit.providers.jekyll",
+    "shipit.providers.node_static",
+    "shipit.providers.python",
+    "shipit.providers.staticfile",
+    "shipit.runners.wasmer",
+    "tests.test_e2e",
+]
+ignore_errors = true
 
 [tool.uv.workspace]
 exclude = ["examples/*"]

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/src/shipit/assets/php/php.ini

@@ -15,9 +15,9 @@ zend.enable_gc = On
 zend.exception_ignore_args = On
 zend.exception_string_param_max_len = 0
 expose_php = On
-max_execution_time = 30
-max_input_time = 60
-memory_limit = -1
+max_execution_time = 300
+max_input_time = 300
+memory_limit = 512M
 error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
 display_errors = Off
 display_startup_errors = Off
@@ -31,7 +31,7 @@ variables_order = "GPCS"
 request_order = "GP"
 register_argc_argv = Off
 auto_globals_jit = On
-post_max_size = 0
+post_max_size = 64M
 auto_prepend_file =
 auto_append_file =
 default_mimetype = "text/html"
@@ -40,7 +40,8 @@ doc_root =
 user_dir =
 enable_dl = Off
 file_uploads = On
-upload_max_filesize = 0
+upload_max_filesize = 2G
+max_input_vars = 6144
 max_file_uploads = 20
 allow_url_fopen = On
 allow_url_include = Off

shipit_cli-0.17.7/src/shipit/assets/wordpress/.htaccess

@@ -0,0 +1,15 @@
+# BEGIN WordPress
+# The directives (lines) between "BEGIN WordPress" and "END WordPress" are
+# dynamically generated, and should only be modified via WordPress filters.
+# Any changes to the directives between these markers will be overwritten.
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+RewriteBase /
+RewriteRule ^index\.php$ - [L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . /index.php [L]
+</IfModule>
+
+# END WordPress

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/src/shipit/assets/wordpress/install.sh

@@ -100,4 +100,11 @@ if [ -n "${WP_LOCALE:-}" ]; then
   wp site switch-language "$WP_LOCALE"
 fi
 
+cat > /app/wp-content/wp-config.php <<EOF
+<?php
+// If you need to set custom configuration, you can place it here.
+// This file will be included by the main wp-config.php after
+// loading environment variables.
+EOF
+
 echo "✅ WordPress Installation complete"

shipit_cli-0.17.7/src/shipit/assets/wordpress/start.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+ROOT_HTACCESS="/app/wp-content/root-htaccess"
+APP_HTACCESS="/app/.htaccess"
+
+if [[ -e "$APP_HTACCESS" ]]; then
+  if [[ ! -f "$ROOT_HTACCESS" ]]; then
+    echo "Coppying app's .htaccess file into wp-content"
+    # Note: doing cp fails, so we resort to this workaround.
+    cat "$APP_HTACCESS" > "$ROOT_HTACCESS"
+  fi
+  rm "$APP_HTACCESS"
+fi
+
+# If no base htaccess is found, then we create a symlink to the root htaccess
+if [[ ! -e "$APP_HTACCESS" ]]; then
+  if [[ -f "$ROOT_HTACCESS" ]]; then
+    echo "Using wp-content .htaccess file as app's htaccess"
+    ln -s "$ROOT_HTACCESS" "$APP_HTACCESS"
+  fi
+fi
+
+phpix "$@"

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/src/shipit/builders/docker.py

@@ -5,7 +5,7 @@ import shutil
 from pathlib import Path
 from typing import Dict, List, Optional
 
-import sh  # type: ignore[import-untyped]
+import sh
 from rich import box
 from rich.panel import Panel
 from rich.rule import Rule

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/src/shipit/builders/local.py

@@ -4,7 +4,7 @@ import shutil
 from pathlib import Path
 from typing import Dict, List, Optional
 
-import sh  # type: ignore[import-untyped]
+import sh
 from rich.rule import Rule
 from rich.syntax import Syntax
 

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/src/shipit/providers/php.py

@@ -29,6 +29,7 @@ class PhpConfig(Config):
     composer_build_script: Optional[str] = None
     php_version: Optional[str] = "8.3"
     php_architecture: Optional[Literal["64-bit", "32-bit"]] = None
+    phpix_worker_threads: Optional[int] = 4
 
 
 class PhpProvider:
@@ -141,7 +142,13 @@ class PhpProvider:
         return self.base_commands()
 
     def base_commands(self) -> Dict[str, str]:
-        php_script = "php" if not self.config.phpix else "phpix"
+        if self.config.phpix:
+            php_script = "phpix"
+            if self.config.phpix_worker_threads:
+                php_script += f" --php-threads={self.config.phpix_worker_threads}"
+        else:
+            php_script = "php"
+
         if _exists(self.path, "public/index.php"):
             return {
                 "start": f'"{php_script} -S localhost:{{}} -t {{}}/public".format(PORT, app.serve_path)'

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/src/shipit/providers/python.py

@@ -275,21 +275,21 @@ class PythonProvider:
 
     @classmethod
     def check_deps(cls, path: Path, *deps: str) -> Set[str]:
-        deps = set([dep.lower() for dep in deps])
-        initial_deps = set(deps)
+        pending_deps = {dep.lower() for dep in deps}
+        initial_deps = set(pending_deps)
         for file in ["requirements.txt", "pyproject.toml"]:
             if _exists(path, file):
                 for line in (path / file).read_text().splitlines():
-                    for dep in set(deps):
+                    for dep in set(pending_deps):
                         if dep in line.lower():
-                            deps.remove(dep)
-                            if not deps:
+                            pending_deps.remove(dep)
+                            if not pending_deps:
                                 break
-                    if not deps:
+                    if not pending_deps:
                         break
-            if not deps:
+            if not pending_deps:
                 break
-        return initial_deps - deps
+        return initial_deps - pending_deps
 
     @classmethod
     def name(cls) -> str:

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/src/shipit/providers/wordpress.py

@@ -65,10 +65,20 @@ class WordPressProvider(PhpProvider):
             'copy(wp_cli_download_url, "{}/wp-cli.phar".format(assets.path))',
             'copy("wordpress/install.sh", "{}/setup-wp.sh".format(assets.path), base="assets")',
         ]
+        if self.config.phpix:
+            # We create the start script that creates the .htaccess symlink
+            # since phpix now supports .htaccess files.
+            steps.append(
+                'copy("wordpress/start.sh", "{}/start-wp.sh".format(assets.path), base="assets")'
+            )
         if not _exists(self.path, "wp-config.php"):
             steps.append(
                 'copy("wordpress/wp-config.php", "{}/wp-config.php".format(app.path), base="assets")'
             )
+        if not _exists(self.path, ".htaccess"):
+            steps.append(
+                'copy("wordpress/.htaccess", "{}/.htaccess".format(app.path), base="assets")'
+            )
         return steps + super().build_steps()
 
     def prepare_steps(self) -> Optional[list[str]]:
@@ -76,6 +86,12 @@ class WordPressProvider(PhpProvider):
 
     def commands(self) -> Dict[str, str]:
         commands = super().commands()
+        if self.config.phpix:
+            if "start" in commands:
+                if self.config.phpix_worker_threads:
+                    commands["start"] = f'"bash {{}}/start-wp.sh --php-threads={self.config.phpix_worker_threads} -S localhost:{{}} -t {{}}".format(assets.serve_path, PORT, app.serve_path)'
+                else:
+                    commands["start"] = '"bash {}/start-wp.sh -S localhost:{} -t {}".format(assets.serve_path, PORT, app.serve_path)'
         return {
             # "wp": '"php {}/wp-cli.phar --allow-root --path={}".format(assets.serve_path, app.serve_path)',
             "after_deploy": '"bash {}/setup-wp.sh".format(assets.serve_path)',

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/src/shipit/runners/local.py

@@ -2,7 +2,7 @@ import shutil
 from pathlib import Path
 from typing import Dict, List, TYPE_CHECKING
 
-import sh  # type: ignore[import-untyped]
+import sh
 from rich import box
 from rich.panel import Panel
 from rich.syntax import Syntax

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/src/shipit/runners/wasmer.py

@@ -105,26 +105,26 @@ class WasmerRunner:
         },
         "phpix": {
             "dependencies": {
-                "latest": "wasmer/phpix-32@=0.1.1080321-alpha.4",
-                "8.3": "wasmer/phpix-32@=0.1.1080321-alpha.4",
-                "8.2": "wasmer/phpix-32@=0.1.1080321-alpha.4",
-                "8.1": "wasmer/phpix-32@=0.1.1080321-alpha.4",
-                "7.4": "wasmer/phpix-32@=0.1.1080321-alpha.4",
+                "latest": "wasmer/phpix-32@=0.1.1080321-alpha.6",
+                "8.3": "wasmer/phpix-32@=0.1.1080321-alpha.6",
+                "8.2": "wasmer/phpix-32@=0.1.1080321-alpha.6",
+                "8.1": "wasmer/phpix-32@=0.1.1080321-alpha.6",
+                "7.4": "wasmer/phpix-32@=0.1.1080321-alpha.6",
             },
             "architecture_dependencies": {
                 "64-bit": {
-                    "latest": "wasmer/phpix-64@=0.1.1080321-alpha.4",
-                    "8.3": "wasmer/phpix-64@=0.1.1080321-alpha.4",
-                    "8.2": "wasmer/phpix-64@=0.1.1080321-alpha.4",
-                    "8.1": "wasmer/phpix-64@=0.1.1080321-alpha.4",
-                    "7.4": "wasmer/phpix-64@=0.1.1080321-alpha.4",
+                    "latest": "wasmer/phpix-64@=0.1.1080321-alpha.6",
+                    "8.3": "wasmer/phpix-64@=0.1.1080321-alpha.6",
+                    "8.2": "wasmer/phpix-64@=0.1.1080321-alpha.6",
+                    "8.1": "wasmer/phpix-64@=0.1.1080321-alpha.6",
+                    "7.4": "wasmer/phpix-64@=0.1.1080321-alpha.6",
                 },
                 "32-bit": {
-                    "latest": "wasmer/phpix-32@=0.1.1080321-alpha.4",
-                    "8.3": "wasmer/phpix-32@=0.1.1080321-alpha.4",
-                    "8.2": "wasmer/phpix-32@=0.1.1080321-alpha.4",
-                    "8.1": "wasmer/phpix-32@=0.1.1080321-alpha.4",
-                    "7.4": "wasmer/phpix-32@=0.1.1080321-alpha.4",
+                    "latest": "wasmer/phpix-32@=0.1.1080321-alpha.6",
+                    "8.3": "wasmer/phpix-32@=0.1.1080321-alpha.6",
+                    "8.2": "wasmer/phpix-32@=0.1.1080321-alpha.6",
+                    "8.1": "wasmer/phpix-32@=0.1.1080321-alpha.6",
+                    "7.4": "wasmer/phpix-32@=0.1.1080321-alpha.6",
                 },
             },
             "scripts": {"php", "phpix"},
@@ -276,7 +276,7 @@ class WasmerRunner:
 
     def find_file_in_mounts(self, serve: Serve, program: str) -> Optional[Path]:
         program_path = Path(program)
-        for mount in serve.mounts:
+        for mount in serve.mounts or []:
             if program.startswith(str(mount.serve_path.absolute())):
                 module_path = program_path.relative_to(mount.serve_path).as_posix()
                 full_module_path = (
@@ -456,6 +456,7 @@ class WasmerRunner:
         yaml_config["package"] = "."
         if serve.services:
             capabilities = yaml_config.get("capabilities", {})
+            assert isinstance(capabilities, dict), "capabilities must be a dictionary"
             has_mysql = any(service.provider == "mysql" for service in serve.services)
             if has_mysql:
                 capabilities["database"] = {"engine": "mysql"}
@@ -463,6 +464,7 @@ class WasmerRunner:
 
         if serve.volumes:
             volumes_yaml = yaml_config.get("volumes", [])
+            assert isinstance(volumes_yaml, list), "volumes must be a list"
             for vol in serve.volumes:
                 volumes_yaml.append(
                     {
@@ -473,6 +475,7 @@ class WasmerRunner:
             yaml_config["volumes"] = volumes_yaml
 
         has_php = any(dep.name == "php" for dep in serve.deps)
+        has_phpix = any(dep.name == "phpix" for dep in serve.deps)
         build_deps = reduce(
             lambda acc, dep: acc + dep.dependencies,
             [step for step in serve.build if isinstance(step, UseStep)],
@@ -481,11 +484,20 @@ class WasmerRunner:
         is_built_with_go = any(dep.name in ["go", "go-wasix"] for dep in build_deps)
 
         # Note: phpix is multi-threaded, so this is only needed for raw php server and go.
-        if has_php or is_built_with_go:
+        if (has_php and not has_phpix) or is_built_with_go:
             scaling = yaml_config.get("scaling", {})
+            assert isinstance(scaling, dict), "scaling must be a dictionary"
             scaling["mode"] = "single_concurrency"
             yaml_config["scaling"] = scaling
 
+        if has_phpix:
+            capabilities = yaml_config.get("capabilities", {})
+            assert isinstance(capabilities, dict), "capabilities must be a dictionary"
+            memory = capabilities.get("memory", {})
+            assert isinstance(memory, dict), "memory must be a dictionary"
+            memory["limit"] = "2Gb"
+            yaml_config["capabilities"] = capabilities
+
         if "after_deploy" in serve.commands:
             jobs = yaml_config.get("jobs", [])
             # Filter out any existing after_deploy job

shipit_cli-0.17.7/src/shipit/version.py

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

{shipit_cli-0.17.5 → shipit_cli-0.17.7}/tests/test_generate_shipit_examples.py

@@ -2,9 +2,8 @@ from pathlib import Path
 
 import pytest
 
-from shipit.generator import generate_shipit
-from shipit.procfile import Procfile
-from shipit.providers.base import CustomCommands
+from shipit.generator import generate_shipit, load_provider, load_provider_config
+from shipit.providers.base import Config
 
 
 def _example_dirs_with_shipit() -> list[Path]:
@@ -25,12 +24,14 @@ def test_generate_shipit_matches_example(example_dir: Path) -> None:
     This validates provider detection and the Shipit generator formatting for
     each example that includes a `Shipit` file.
     """
-    custom_commands = CustomCommands()
-    if (example_dir / "Procfile").exists():
-        procfile = Procfile.loads((example_dir / "Procfile").read_text())
-        custom_commands.start = procfile.get_start_command()
+    base_config = Config()
+    base_config.commands.enrich_from_path(example_dir)
 
-    generated, config = generate_shipit(example_dir, custom_commands=custom_commands)
+    provider_cls = load_provider(example_dir, base_config)
+    provider_config = load_provider_config(provider_cls, example_dir, base_config)
+    provider = provider_cls(example_dir, provider_config)
+
+    generated = generate_shipit(example_dir, provider)
     expected = (example_dir / "Shipit").read_text()
     # Use raw assert to let pytest show a unified diff on mismatch
     assert generated == expected

shipit_cli-0.17.5/src/shipit/version.py

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