@fishawack/lab-env 4.45.0-beta.3 → 4.45.0-beta.5

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## Changelog
 
+### 4.45.0-beta.5 (2025-09-04)
+
+#### Features
+
+* addded more python compatible commands ([b4940ea](https://bitbucket.org/fishawackdigital/lab-env/commits/b4940eaa29c58138f6ff952773da0925e64fcab7))
+* better errors when mismatching versions found ([d3c0c75](https://bitbucket.org/fishawackdigital/lab-env/commits/d3c0c753d919f383d0262c4d3221d179b19f9fa3))
+
+### 4.45.0-beta.4 (2025-09-03)
+
+#### Features
+
+* added new clients ([872332e](https://bitbucket.org/fishawackdigital/lab-env/commits/872332e5303b22a6f44102c724b824422418710b))
+
+#### Bug Fixes
+
+* python now uses uv and implements test command ([b81b8d7](https://bitbucket.org/fishawackdigital/lab-env/commits/b81b8d7c47a6e2fe7437ed930f18e3f54e800fc7))
+
 ### 4.45.0-beta.3 (2025-09-02)
 
 #### Features

package/cli.js

@@ -39,6 +39,9 @@ const args = hideBin(process.argv);
             base: [
                 "start",
                 "setup",
+                "test",
+                "production",
+                "run",
                 "connect",
                 "execute",
                 "nuke",
@@ -49,11 +52,8 @@ const args = hideBin(process.argv);
             // Web development commands (for frameworks that build frontend assets)
             webDev: [
                 "watch",
-                "run",
                 "check",
                 "npm",
-                "production",
-                "test",
                 "reinstall",
                 "install",
                 "uninstall",
@@ -69,7 +69,7 @@ const args = hideBin(process.argv);
             wordpress: ["wp", "composer", "php"],
             adonis: ["ace", "node"],
             php: ["composer", "php"],
-            python: ["python", "pip"],
+            python: ["python", "uv"],
         };
 
         // Define which platforms get which command groups
@@ -86,7 +86,7 @@ const args = hideBin(process.argv);
 
         // Config-based command additions
         const configCommands = {
-            content: _.config.preset !== "external",
+            content: _.config.preset !== "external" && _.platform !== "python",
             deploy: _.config.preset === "permanent",
             origin: _.config.preset === "permanent",
         };

package/commands/create/services/aws/index.js

@@ -55,6 +55,9 @@ module.exports.clients = [
     "danone",
     "mtpa",
     "besins",
+    "dompe",
+    "test",
+    "bristolmyers",
 ];
 
 module.exports.static = async (

package/commands/deploy.js

@@ -12,7 +12,8 @@ module.exports = [
             _.platform === "wordpress" ||
             _.platform === "drupal" ||
             _.platform === "craftcms" ||
-            _.platform === "adonis"
+            _.platform === "adonis" ||
+            _.platform === "python"
         ) {
             _.up(() =>
                 execSync(

package/commands/production.js

@@ -4,9 +4,14 @@ module.exports = [
     ["production", "prod"],
     "builds for production",
     () => {},
-    () =>
-        _.command(
-            "core",
-            `${process.env.VERSION === "0" ? "xvfb-run " : ""}npm run production`,
-        ),
+    () => {
+        if (_.platform === "python") {
+            console.log("No production command currently available for Python");
+        } else {
+            _.command(
+                "core",
+                `${process.env.VERSION === "0" ? "xvfb-run " : ""}npm run production`,
+            );
+        }
+    },
 ];

package/commands/run.js

@@ -2,7 +2,7 @@ const _ = require("../globals.js");
 
 module.exports = [
     "run [command] [flags...]",
-    "run an npm script",
+    _.platform === "python" ? "run a uv script" : "run an npm script",
     (yargs) => {
         yargs.positional("command", {
             describe: "command to run",
@@ -22,9 +22,29 @@ module.exports = [
             });
         }
     },
-    (argv) =>
-        _.command(
-            "core",
-            `${argv.d ? "xvfb-run " : ""}npm run ${argv.command} -- -- ${argv.flags.join(" ")}`,
-        ),
+    (argv) => {
+        if (_.platform === "python") {
+            if (argv.command === "mail" || argv.command === "package") {
+                console.log(
+                    `${argv.command} is a built-in command and will be ignored`,
+                );
+                return;
+            }
+
+            const command = argv.command.endsWith(".py")
+                ? argv.command
+                : `${argv.command}.py`;
+
+            _.command(
+                "python",
+                `uv run ${command} -- -- ${argv.flags.join(" ")}`,
+                true,
+            );
+        } else {
+            _.command(
+                "core",
+                `${argv.d ? "xvfb-run " : ""}npm run ${argv.command} -- -- ${argv.flags.join(" ")}`,
+            );
+        }
+    },
 ];

package/commands/setup.js

@@ -21,10 +21,7 @@ module.exports = [
                 ),
             );
         } else if (_.platform === "python") {
-            _.command(
-                "python",
-                `python -m venv .venv && pip install -r src/requirements.txt`,
-            );
+            _.command("python", `uv sync --locked || uv sync`);
         } else {
             _.command("core", `npm run setup`);
         }

package/commands/start.js

@@ -26,7 +26,7 @@ module.exports = [
         } else if (_.platform === "python") {
             _.command(
                 "python",
-                `python src/main.py -- -- ${argv.flags.join(" ")}`,
+                `uv run ./src/main.py -- -- ${argv.flags.join(" ")}`,
                 true,
             );
         } else {

package/commands/test.js

@@ -6,17 +6,21 @@ module.exports = [
     () => {},
     () => {
         _.up(() => {
-            _.command(
-                "core",
-                `${process.env.VERSION === "0" ? "xvfb-run " : ""}npm run test`,
-            );
+            if (_.platform === "python") {
+                _.command("python", `uv run pytest`);
+            } else {
+                _.command(
+                    "core",
+                    `${process.env.VERSION === "0" ? "xvfb-run " : ""}npm run test`,
+                );
 
-            if (_.platform === "laravel") {
-                _.command("php", `php artisan test`);
-            }
+                if (_.platform === "laravel") {
+                    _.command("php", `php artisan test`);
+                }
 
-            if (_.platform === "adonis") {
-                _.command("node", `node ace test`);
+                if (_.platform === "adonis") {
+                    _.command("node", `node ace test`);
+                }
             }
         });
     },

package/commands/{pip.js → uv.js}

@@ -1,13 +1,13 @@
 const _ = require("../globals.js");
 
 module.exports = [
-    "pip [command...]",
-    "run pip command",
+    "uv [command...]",
+    "run uv command",
     (yargs) => {
         yargs.positional("command", {
             describe: "command to run",
             default: "",
         });
     },
-    (argv) => _.command("python", `pip ${argv.command.join(" ")}`),
+    (argv) => _.command("python", `uv ${argv.command.join(" ")}`),
 ];

package/globals.js

@@ -17,6 +17,8 @@ const utilities = require("./commands/create/libs/utilities");
 const os = require("os");
 const { hideBin } = require("yargs/helpers");
 const args = hideBin(process.argv);
+const forced = args.find((d) => d === "--force");
+const { version: labenvVersion } = require("./package.json");
 
 process.env.DIRNAME = __dirname;
 process.env.USER_UID = execSync("id -u", {
@@ -183,7 +185,7 @@ try {
 }
 
 try {
-    python = existsSync(path.join(cwd, "src/requirements.txt"));
+    python = existsSync(path.join(cwd, "pyproject.toml"));
 } catch {
     /* empty */
 }
@@ -197,7 +199,7 @@ if (composer && composer.require && composer.require["laravel/framework"]) {
         composer.require["laravel/framework"],
     )?.version;
 
-    if (process.env.FW_NEXT) {
+    if (process.env.FW_NEXT || forced) {
         process.env.VERSION_LARAVEL = versions[versions.length - 1];
     } else if (semver.satisfies(version, "<=8")) {
         process.env.VERSION_LARAVEL = "8";
@@ -218,12 +220,7 @@ if (composer && composer.require && composer.require["laravel/framework"]) {
             args[0] !== "lint" &&
             args[0] !== "workspace"
         ) {
-            if (!args.find((d) => d === "--force")) {
-                console.log(
-                    `${utilities.colorize(`laravel`, "title")} and ${utilities.colorize(`@fishawack/lab-env`, "title")} have mismatching versions.\n\nRun ${utilities.colorize(`npm i -g @fishawack/lab-env@latest`, "success")} or pass ${utilities.colorize(`--force`, "warning")} to continue.`,
-                );
-                process.exit(1);
-            }
+            unknownLabEnvConfig(platform, version);
         }
 
         // Default to latest image when outside of known core versions
@@ -249,7 +246,7 @@ if (composer && composer.require && composer.require["laravel/framework"]) {
         composer?.require["johnpbloch/wordpress"],
     )?.version;
 
-    if (process.env.FW_NEXT) {
+    if (process.env.FW_NEXT || forced) {
         process.env.VERSION_WORDPRESS = versions[versions.length - 1];
     } else if (!version) {
         process.env.VERSION_WORDPRESS = "0";
@@ -268,12 +265,7 @@ if (composer && composer.require && composer.require["laravel/framework"]) {
             args[0] !== "lint" &&
             args[0] !== "workspace"
         ) {
-            if (!args.find((d) => d === "--force")) {
-                console.log(
-                    `${utilities.colorize(`wordpress`, "title")} and ${utilities.colorize(`@fishawack/lab-env`, "title")} have mismatching versions.\n\nRun ${utilities.colorize(`npm i -g @fishawack/lab-env@latest`, "success")} or pass ${utilities.colorize(`--force`, "warning")} to continue.`,
-                );
-                process.exit(1);
-            }
+            unknownLabEnvConfig(platform, version);
         }
 
         // Default to latest image when outside of known core versions
@@ -321,7 +313,7 @@ const getCoreVersion = () => {
 
 const version = getCoreVersion();
 
-if (process.env.FW_NEXT) {
+if (process.env.FW_NEXT || forced) {
     process.env.VERSION = versions[versions.length - 1];
 } else if (semver.satisfies(semver.coerce(version), "<=7.24.0")) {
     process.env.VERSION = "0";
@@ -343,15 +335,10 @@ if (process.env.FW_NEXT) {
         args[0] !== "lint" &&
         args[0] !== "workspace"
     ) {
-        if (
-            !args.find((d) => d === "--force") &&
-            platform !== "php" &&
-            platform !== "python"
-        ) {
-            console.log(
-                `${utilities.colorize(`@fishawack/core`, "title")} and ${utilities.colorize(`@fishawack/lab-env`, "title")} have mismatching versions.\n\nRun ${utilities.colorize(`npm i -g @fishawack/lab-env@latest`, "success")} or pass ${utilities.colorize(`--force`, "warning")} to continue.`,
-            );
-            process.exit(1);
+        if (version) {
+            unknownLabEnvConfig("core", version);
+        } else if (platform !== "php" && platform !== "python") {
+            unknownLabEnvConfig();
         }
     }
 
@@ -573,6 +560,14 @@ if (!existsSync(path.join(cwd, "stylelint.config.js"))) {
     );
 }
 
+function unknownLabEnvConfig(platform, version) {
+    console.log(
+        `${utilities.colorize(`lab-env@${labenvVersion}`, "success")} doesn't recognize the current ${platform ? `${utilities.colorize(`${platform}@${version}`, "warning")} version` : `project platform`}.\n\nRun ${utilities.colorize(`npm i -g @fishawack/lab-env@latest`, "success")} to update to the latest build or pass ${utilities.colorize(`--force`, "warning")} to continue.`,
+    );
+
+    process.exit(1);
+}
+
 function copyAIInstructionsFile(source, projectDir = cwd) {
     // Create directory if it doesn't exist
     const destDir = path.join(projectDir, ".github/instructions");
@@ -673,7 +668,7 @@ if (
     args[0] !== "lint" &&
     args[0] !== "workspace"
 ) {
-    if (!args.find((d) => d === "--force")) {
+    if (!forced) {
         // Stop here if diagnosis either unset or outdated
         if (
             !config.diagnosis ||

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fishawack/lab-env",
-    "version": "4.45.0-beta.3",
+    "version": "4.45.0-beta.5",
     "description": "Docker manager for FW",
     "main": "cli.js",
     "scripts": {

package/python/0/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   python:
-    image: python:3.13
+    image: ghcr.io/astral-sh/uv:python3.13-bookworm
     working_dir: /workspace
     command: sleep infinity
     tty: true
@@ -8,7 +8,8 @@ services:
     user: "${USER_UID}:${USER_GID}"
     environment:
       - PATH=/workspace/.venv/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-      - PIP_NO_CACHE_DIR=off
+      - UV_NO_CACHE=1
+      - UV_LINK_MODE=copy
       - PYTHONDONTWRITEBYTECODE="1"
       - PYTHONUNBUFFERED="1"
       - REPO=${REPO:-}