py-app-dev 2.2.0__tar.gz → 2.3.1__tar.gz

{py_app_dev-2.2.0 → py_app_dev-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-app-dev
-Version: 2.2.0
+Version: 2.3.1
 Summary: My application development modules.
 Home-page: https://github.com/cuinixam/python-app-dev
 License: MIT
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: loguru (>=0.7.1,<0.8.0)
 Requires-Dist: mashumaro (>=3.9.1,<4.0.0)

{py_app_dev-2.2.0 → py_app_dev-2.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py-app-dev"
-version = "2.2.0"
+version = "2.3.1"
 description = "My application development modules."
 authors = ["cuinixam <me@cuinixam.com>"]
 license = "MIT"

py_app_dev-2.3.1/src/py_app_dev/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.3.1"

{py_app_dev-2.2.0 → py_app_dev-2.3.1}/src/py_app_dev/core/runnable.py

@@ -10,6 +10,9 @@ from .logging import logger
 
 
 class Runnable(ABC):
+    def __init__(self, needs_dependency_management: bool = True) -> None:
+        self.needs_dependency_management = needs_dependency_management
+
     @abstractmethod
     def run(self) -> int:
         """Run and return exit code."""
@@ -115,6 +118,12 @@ class Executor:
         return RunInfoStatus.MATCH
 
     def execute(self, runnable: Runnable) -> int:
+        if not runnable.needs_dependency_management:
+            logger.info(f"Runnable '{runnable.get_name()}' does not need dependency management. Executing directly.")
+            if self.dry_run:
+                return 0
+            return runnable.run()
+
         run_info_status = self.previous_run_info_matches(runnable)
         if run_info_status.should_run:
             logger.info(f"Runnable '{runnable.get_name()}' must run. {run_info_status.message}")

{py_app_dev-2.2.0 → py_app_dev-2.3.1}/src/py_app_dev/core/scoop_wrapper.py

@@ -1,4 +1,5 @@
 import json
+import os
 import re
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import dataclass, field
@@ -85,9 +86,9 @@ class InstalledScoopApp(InstalledApp):
 
 class ScoopWrapper:
     def __init__(self) -> None:
-        self.scoop_executable = self._find_scoop_executable()
-        self.scoop_root_dir = self._find_scoop_root_dir(self.scoop_executable)
         self.logger = logger.bind()
+        self.scoop_script = self._find_scoop_script()
+        self.scoop_root_dir = self._find_scoop_root_dir(self.scoop_script)
 
     @property
     def apps_directory(self) -> Path:
@@ -101,12 +102,16 @@ class ScoopWrapper:
         """
         return self.do_install(ScoopInstallConfigFile.from_file(scoop_file), self.get_installed_apps())
 
-    def _find_scoop_executable(self) -> Path:
+    def _find_scoop_script(self) -> Path:
         scoop_path = which("scoop")
         if not scoop_path:
-            scoop_path = Path().home().joinpath("scoop", "shims", "scoop.cmd")
-            if not scoop_path.is_file():
-                raise UserNotificationException("Scoop not found in PATH or user home directory." " Please install Scoop and run the build script again.")
+            scoop_path = Path().home().joinpath("scoop", "shims", "scoop.ps1")
+        else:
+            # Use the powershell script to make sure the powershell profile is loaded (maybe there are proxy settings)
+            scoop_path = scoop_path.with_suffix(".ps1")
+        self.logger.info(f"Scoop executable: {scoop_path}")
+        if not scoop_path.is_file():
+            raise UserNotificationException("Scoop not found in PATH or user home directory. Please install Scoop and run the build script again.")
         return scoop_path
 
     def _find_scoop_root_dir(self, scoop_executable_path: Path) -> Path:
@@ -204,7 +209,11 @@ class ScoopWrapper:
         with TemporaryDirectory() as tmp_dir:
             tmp_scoop_file = Path(tmp_dir).joinpath("scoopfile.json")
             ScoopInstallConfigFile(scoop_install_config.buckets, apps_to_install).to_file(tmp_scoop_file)
-            SubprocessExecutor([self.scoop_executable, "import", tmp_scoop_file]).execute()
+            # (!) Make sure powershell core module does not pollute the module path. Without this change scoop.ps1 fails because 'Get-FileHash' cannot be found.
+            # See more details here: https://github.com/PowerShell/PowerShell/issues/8635
+            env = os.environ.copy()
+            env["PSModulePath"] = f"{env.get('PSHOME', '')}/Modules"
+            SubprocessExecutor(["powershell.exe", self.scoop_script, "import", tmp_scoop_file], env=env).execute()
         return apps_to_install
 
     @staticmethod

py_app_dev-2.2.0/src/py_app_dev/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.2.0"