python-package-folder 4.2.0__tar.gz → 4.3.1__tar.gz

python_package_folder-4.3.1/MANIFEST.in

@@ -0,0 +1,2 @@
+include src/python_package_folder/scripts/get-next-version.cjs
+recursive-include src/python_package_folder/scripts *.cjs

{python_package_folder-4.2.0 → python_package_folder-4.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 4.2.0
+Version: 4.3.1
 Summary: Python package to automatically package and build a folder, fetching all relevant dependencies.
 Project-URL: Repository, https://github.com/alelom/python-package-folder
 Author-email: Alessio Lombardi <work@alelom.com>

{python_package_folder-4.2.0 → python_package_folder-4.3.1}/pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
 
 # ---- Dev dependencies ----
 
-version = "4.2.0"
+version = "4.3.1"
 [dependency-groups]
 dev = [
     "pytest>=8.3.5",
@@ -75,6 +75,7 @@ build-backend = "hatchling.build"
 path = "src/python_package_folder/_hatch_build.py"
 
 
+
 # ---- Settings ----
 
 [tool.ruff]

{python_package_folder-4.2.0 → python_package_folder-4.3.1}/python_package_folder/scripts/get-next-version.cjs

@@ -26,6 +26,7 @@ const path = require('path');
 const fs = require('fs');
 const https = require('https');
 const http = require('http');
+const { execSync } = require('child_process');
 
 // Parse command line arguments
 const args = process.argv.slice(2);
@@ -310,48 +311,102 @@ async function queryRegistryVersion(packageName, repository, repositoryUrl) {
   return null;
 }
 
+/**
+ * Get global npm prefix for module resolution.
+ * This helps find globally installed npm packages.
+ * @returns {string|null} Path to global node_modules or null if not found
+ */
+function getGlobalNpmPrefix() {
+  try {
+    // Get npm's global prefix (where global packages are installed)
+    const prefix = execSync('npm config get prefix', { encoding: 'utf8' }).trim();
+    // Global node_modules is typically at <prefix>/lib/node_modules
+    const globalNodeModules = path.join(prefix, 'lib', 'node_modules');
+    if (fs.existsSync(globalNodeModules)) {
+      return globalNodeModules;
+    }
+    // Alternative location on some systems
+    const altGlobalNodeModules = path.join(prefix, 'node_modules');
+    if (fs.existsSync(altGlobalNodeModules)) {
+      return altGlobalNodeModules;
+    }
+    return null;
+  } catch (e) {
+    // If npm config fails, try to find it via NODE_PATH or common locations
+    return null;
+  }
+}
+
 // Main execution
 (async () => {
   try {
+    // Get global npm path for module resolution
+    const globalNpmPath = getGlobalNpmPrefix();
+    const resolvePaths = [projectRoot];
+    if (globalNpmPath) {
+      resolvePaths.push(globalNpmPath);
+    }
+    
     // Try to require semantic-release
-    // First try resolving from project root (for devDependencies), then fall back to global
+    // First try resolving from project root (for devDependencies), then try global, then fall back to default
     let semanticRelease;
-  try {
-    const semanticReleasePath = require.resolve('semantic-release', { paths: [projectRoot] });
-    semanticRelease = require(semanticReleasePath);
-  } catch (resolveError) {
     try {
-      semanticRelease = require('semantic-release');
-    } catch (e) {
-      console.error('Error: semantic-release is not installed.');
-      console.error('Please install it with: npm install -g semantic-release');
-      console.error('Or install it as a devDependency: npm install --save-dev semantic-release');
-      if (isSubfolderBuild) {
-        console.error('For subfolder builds, also install: npm install -g semantic-release-commit-filter');
-        console.error('Or as devDependency: npm install --save-dev semantic-release-commit-filter');
+      const semanticReleasePath = require.resolve('semantic-release', { paths: resolvePaths });
+      semanticRelease = require(semanticReleasePath);
+    } catch (resolveError) {
+      try {
+        // Try with just global path
+        if (globalNpmPath) {
+          const semanticReleasePath = require.resolve('semantic-release', { paths: [globalNpmPath] });
+          semanticRelease = require(semanticReleasePath);
+        } else {
+          throw resolveError;
+        }
+      } catch (globalError) {
+        try {
+          // Final fallback: default require (should work if in NODE_PATH or default locations)
+          semanticRelease = require('semantic-release');
+        } catch (e) {
+          console.error('Error: semantic-release is not installed.');
+          console.error('Please install it with: npm install -g semantic-release');
+          console.error('Or install it as a devDependency: npm install --save-dev semantic-release');
+          if (isSubfolderBuild) {
+            console.error('For subfolder builds, also install: npm install -g semantic-release-commit-filter');
+            console.error('Or as devDependency: npm install --save-dev semantic-release-commit-filter');
+          }
+          process.exit(1);
+        }
       }
-      process.exit(1);
     }
-  }
 
-  // For subfolder builds, require semantic-release-commit-filter
-  // (required only to verify it's installed; the plugin is used via options.plugins)
-  // First try resolving from project root (for devDependencies), then fall back to global
-  if (isSubfolderBuild) {
-    try {
-      const commitFilterPath = require.resolve('semantic-release-commit-filter', { paths: [projectRoot] });
-      require(commitFilterPath);
-    } catch (resolveError) {
+    // For subfolder builds, require semantic-release-commit-filter
+    // (required only to verify it's installed; the plugin is used via options.plugins)
+    if (isSubfolderBuild) {
       try {
-        require('semantic-release-commit-filter');
-      } catch (e) {
-        console.error('Error: semantic-release-commit-filter is not installed.');
-        console.error('Please install it with: npm install -g semantic-release-commit-filter');
-        console.error('Or install it as a devDependency: npm install --save-dev semantic-release-commit-filter');
-        process.exit(1);
+        const commitFilterPath = require.resolve('semantic-release-commit-filter', { paths: resolvePaths });
+        require(commitFilterPath);
+      } catch (resolveError) {
+        try {
+          // Try with just global path
+          if (globalNpmPath) {
+            const commitFilterPath = require.resolve('semantic-release-commit-filter', { paths: [globalNpmPath] });
+            require(commitFilterPath);
+          } else {
+            throw resolveError;
+          }
+        } catch (globalError) {
+          try {
+            // Final fallback: default require
+            require('semantic-release-commit-filter');
+          } catch (e) {
+            console.error('Error: semantic-release-commit-filter is not installed.');
+            console.error('Please install it with: npm install -g semantic-release-commit-filter');
+            console.error('Or install it as a devDependency: npm install --save-dev semantic-release-commit-filter');
+            process.exit(1);
+          }
+        }
       }
     }
-  }
 
   // Query registry for latest version if repository info is provided
   let registryVersion = null;

python_package_folder-4.3.1/src/python_package_folder/_hatch_build.py

@@ -0,0 +1,84 @@
+"""
+Hatch build hook to automatically include all files from the scripts directory.
+
+This hook ensures all non-Python files in the scripts directory are included
+in the wheel without creating duplicates, and automatically includes any new
+files added to the directory without requiring manual configuration updates.
+"""
+
+import sys
+from pathlib import Path
+from typing import Any
+
+from hatchling.builders.hooks.plugin.interface import BuildHookInterface
+
+
+class CustomBuildHook(BuildHookInterface):
+    """Build hook to include all files from the scripts directory."""
+
+    def initialize(self, version: str, build_data: dict[str, Any]) -> None:
+        """Initialize the build hook and add scripts directory files."""
+        # Debug: Print to stderr so it shows in build output
+        print(f"[DEBUG] Build hook called. Root: {self.root}", file=sys.stderr)
+        
+        # Try multiple possible locations for the scripts directory
+        # 1. Source layout: src/python_package_folder/scripts
+        # 2. Sdist layout: python_package_folder/scripts (after extraction)
+        # 3. Alternative sdist layout: scripts/ (if extracted differently)
+        possible_scripts_dirs = [
+            Path(self.root) / "src" / "python_package_folder" / "scripts",
+            Path(self.root) / "python_package_folder" / "scripts",
+            Path(self.root) / "scripts",
+        ]
+        
+        scripts_dir = None
+        for possible_dir in possible_scripts_dirs:
+            if possible_dir.exists() and possible_dir.is_dir():
+                scripts_dir = possible_dir
+                print(f"[DEBUG] Found scripts dir at: {scripts_dir}", file=sys.stderr)
+                break
+        
+        if scripts_dir is None:
+            print(f"[DEBUG] Scripts directory not found. Tried: {[str(d) for d in possible_scripts_dirs]}", file=sys.stderr)
+            return
+
+        # If scripts directory exists, include all files from it
+        if scripts_dir.exists() and scripts_dir.is_dir():
+            # Add all files from scripts directory to force-include
+            # This ensures they're included in the wheel at the correct location
+            for script_file in scripts_dir.iterdir():
+                if script_file.is_file():
+                    # Calculate relative paths from project root
+                    try:
+                        source_path = script_file.relative_to(self.root)
+                    except ValueError:
+                        # If relative_to fails, try to construct path manually
+                        # This can happen with sdist layouts
+                        if "python_package_folder" in str(script_file):
+                            # Extract the part after python_package_folder
+                            parts = script_file.parts
+                            try:
+                                idx = parts.index("python_package_folder")
+                                source_path = Path(*parts[idx:])
+                            except (ValueError, IndexError):
+                                # Fallback: use the filename
+                                source_path = Path("python_package_folder") / "scripts" / script_file.name
+                        else:
+                            source_path = Path("python_package_folder") / "scripts" / script_file.name
+                    
+                    # Target path inside the wheel package (always the same)
+                    target_path = f"python_package_folder/scripts/{script_file.name}"
+
+                    print(f"[DEBUG] Adding {source_path} -> {target_path}", file=sys.stderr)
+
+                    # Add to force-include (hatchling will handle this)
+                    # We need to add it to build_data['force_include']
+                    if "force_include" not in build_data:
+                        build_data["force_include"] = {}
+                    build_data["force_include"][str(source_path)] = target_path
+            
+            print(f"[DEBUG] force_include now has {len(build_data.get('force_include', {}))} entries", file=sys.stderr)
+
+
+# Export the hook class (hatchling might need this)
+__all__ = ["CustomBuildHook"]

python_package_folder-4.2.0/src/python_package_folder/_hatch_build.py

@@ -1,54 +0,0 @@
-"""
-Hatch build hook to automatically include all files from the scripts directory.
-
-This hook ensures all non-Python files in the scripts directory are included
-in the wheel without creating duplicates, and automatically includes any new
-files added to the directory without requiring manual configuration updates.
-"""
-
-import sys
-from pathlib import Path
-from typing import Any
-
-from hatchling.builders.hooks.plugin.interface import BuildHookInterface
-
-
-class CustomBuildHook(BuildHookInterface):
-    """Build hook to include all files from the scripts directory."""
-
-    def initialize(self, version: str, build_data: dict[str, Any]) -> None:
-        """Initialize the build hook and add scripts directory files."""
-        # Get the source directory for the package
-        source_dir = Path(self.root) / "src" / "python_package_folder"
-        scripts_dir = source_dir / "scripts"
-
-        # Debug: Print to stderr so it shows in build output
-        print(f"[DEBUG] Build hook called. Root: {self.root}", file=sys.stderr)
-        print(f"[DEBUG] Scripts dir exists: {scripts_dir.exists()}", file=sys.stderr)
-
-        # If scripts directory exists, include all files from it
-        if scripts_dir.exists() and scripts_dir.is_dir():
-            # Add all files from scripts directory to force-include
-            # This ensures they're included in the wheel at the correct location
-            for script_file in scripts_dir.iterdir():
-                if script_file.is_file():
-                    # Calculate relative paths
-                    source_path = script_file.relative_to(self.root)
-                    # Target path inside the wheel package
-                    target_path = f"python_package_folder/scripts/{script_file.name}"
-
-                    print(f"[DEBUG] Adding {source_path} -> {target_path}", file=sys.stderr)
-
-                    # Add to force-include (hatchling will handle this)
-                    # We need to add it to build_data['force_include']
-                    if "force_include" not in build_data:
-                        build_data["force_include"] = {}
-                    build_data["force_include"][str(source_path)] = target_path
-            
-            print(f"[DEBUG] force_include now has {len(build_data.get('force_include', {}))} entries", file=sys.stderr)
-        else:
-            print(f"[DEBUG] Scripts directory not found at {scripts_dir}", file=sys.stderr)
-
-
-# Export the hook class (hatchling might need this)
-__all__ = ["CustomBuildHook"]