shipit-cli 0.15.1__tar.gz → 0.15.2__tar.gz

{shipit_cli-0.15.1 → shipit_cli-0.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.15.1
+Version: 0.15.2
 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.1 → shipit_cli-0.15.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.15.1"
+version = "0.15.2"
 description = "Shipit CLI is the best way to build, serve and deploy your projects anywhere."
 readme = "README.md"
 requires-python = ">=3.10"

{shipit_cli-0.15.1 → shipit_cli-0.15.2}/src/shipit/providers/base.py

@@ -2,8 +2,8 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Protocol, Literal
 from shipit.procfile import Procfile
-from pydantic import BaseModel, Field
-from pydantic_settings import SettingsConfigDict
+from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 @dataclass
@@ -12,7 +12,7 @@ class DetectResult:
     score: int  # Higher score wins when multiple providers match
 
 
-class CustomCommands(BaseModel):
+class CustomCommands(BaseSettings):
     model_config = SettingsConfigDict(extra="ignore")
 
     install: Optional[str] = None
@@ -46,7 +46,7 @@ class CustomCommands(BaseModel):
         return self
 
 
-class Config(BaseModel):
+class Config(BaseSettings):
     model_config = SettingsConfigDict(extra="ignore", env_prefix="SHIPIT_")
 
     port: Optional[int] = 8080

{shipit_cli-0.15.1 → shipit_cli-0.15.2}/src/shipit/providers/php.py

@@ -19,6 +19,7 @@ class PhpConfig(Config):
     model_config = SettingsConfigDict(extra="ignore", env_prefix="SHIPIT_")
 
     use_composer: bool = False
+    composer_build_script: Optional[str] = None
     php_version: Optional[str] = "8.3"
     php_architecture: Optional[Literal["64-bit", "32-bit"]] = "64-bit"
 
@@ -38,7 +39,16 @@ class PhpProvider:
             )
             or False
         )
-        return PhpConfig(use_composer=use_composer, **base_config.model_dump())
+        composer_build_script = None
+        if use_composer:
+            composer_config = json.load(open(path / "composer.json"))
+            if "scripts" in composer_config:
+                assert isinstance(composer_config["scripts"], dict), "Scripts must be a dictionary"
+                composer_build_script = "post-update-cmd" if "post-update-cmd" in composer_config["scripts"] else None
+                if not composer_build_script and "post-install-cmd" in composer_config["scripts"]:
+                    composer_build_script = "post-install-cmd"
+        config = PhpConfig(use_composer=use_composer, composer_build_script=composer_build_script, **base_config.model_dump())
+        return config
 
     @classmethod
     def name(cls) -> str:
@@ -97,10 +107,15 @@ class PhpProvider:
         if self.config.use_composer:
             steps.append('env(COMPOSER_HOME="/tmp", COMPOSER_FUND="0")')
             steps.append(
-                'run("composer install --optimize-autoloader --no-scripts --no-interaction", inputs=["composer.json", "composer.lock"], outputs=["."], group="install")'
+                'run("composer install --optimize-autoloader --ignore-platform-reqs --no-scripts --no-interaction", inputs=["composer.json", "composer.lock"], outputs=["."], group="install")'
             )
 
         steps.append('copy(".", ".", ignore=[".git"])')
+
+        # Since we don't run the scripts during the install step, we need to run them after the build step
+        if self.config.use_composer and self.config.composer_build_script:
+            steps.append(f'run("composer run-script {self.config.composer_build_script}", outputs=["."], group="build")')
+
         return steps
 
     def prepare_steps(self) -> Optional[list[str]]:

shipit_cli-0.15.2/src/shipit/version.py

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

shipit_cli-0.15.1/src/shipit/version.py

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