python-package-folder 4.3.0__tar.gz → 4.3.2__tar.gz

{python_package_folder-4.3.0 → python_package_folder-4.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 4.3.0
+Version: 4.3.2
 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.3.0 → python_package_folder-4.3.2}/pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
 
 # ---- Dev dependencies ----
 
-version = "4.3.0"
+version = "4.3.2"
 [dependency-groups]
 dev = [
     "pytest>=8.3.5",

{python_package_folder-4.3.0 → python_package_folder-4.3.2}/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,140 @@ async function queryRegistryVersion(packageName, repository, repositoryUrl) {
   return null;
 }
 
-// Main execution
-(async () => {
+/**
+ * Get global npm prefix for module resolution.
+ * This helps find globally installed npm packages.
+ * @returns {string[]} Array of possible global node_modules paths
+ */
+function getGlobalNpmPaths() {
+  const paths = [];
+  
   try {
-    // Try to require semantic-release
-    // First try resolving from project root (for devDependencies), then fall back to global
-    let semanticRelease;
+    // 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 (Linux/Mac)
+    const globalNodeModules = path.join(prefix, 'lib', 'node_modules');
+    if (fs.existsSync(globalNodeModules)) {
+      paths.push(globalNodeModules);
+    }
+    
+    // Alternative location on some systems
+    const altGlobalNodeModules = path.join(prefix, 'node_modules');
+    if (fs.existsSync(altGlobalNodeModules)) {
+      paths.push(altGlobalNodeModules);
+    }
+    
+    // Also try the prefix itself (some npm configurations)
+    if (fs.existsSync(prefix)) {
+      paths.push(prefix);
+    }
+  } catch (e) {
+    // If npm config fails, continue with other methods
+  }
+  
+  // Try npm root -g to get global node_modules directly
   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 npmRoot = execSync('npm root -g', { encoding: 'utf8' }).trim();
+    if (fs.existsSync(npmRoot) && !paths.includes(npmRoot)) {
+      paths.push(npmRoot);
+    }
+  } catch (e) {
+    // Ignore errors
+  }
+  
+  // Check NODE_PATH environment variable
+  if (process.env.NODE_PATH) {
+    const nodePaths = process.env.NODE_PATH.split(path.delimiter);
+    for (const nodePath of nodePaths) {
+      if (fs.existsSync(nodePath) && !paths.includes(nodePath)) {
+        paths.push(nodePath);
       }
-      process.exit(1);
     }
   }
+  
+  return paths;
+}
 
-  // 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) {
+// Main execution
+(async () => {
+  try {
+    // Get global npm paths for module resolution
+    const globalNpmPaths = getGlobalNpmPaths();
+    const resolvePaths = [projectRoot, ...globalNpmPaths];
+    
+    // Try to require semantic-release
+    // First try resolving from project root + global paths, then try global only, then fall back to default
+    let semanticRelease;
     try {
-      const commitFilterPath = require.resolve('semantic-release-commit-filter', { paths: [projectRoot] });
-      require(commitFilterPath);
+      const semanticReleasePath = require.resolve('semantic-release', { paths: resolvePaths });
+      semanticRelease = require(semanticReleasePath);
     } catch (resolveError) {
       try {
-        require('semantic-release-commit-filter');
-      } catch (e) {
+        // Try with just global paths
+        if (globalNpmPaths.length > 0) {
+          const semanticReleasePath = require.resolve('semantic-release', { paths: globalNpmPaths });
+          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);
+        }
+      }
+    }
+
+    // For subfolder builds, require semantic-release-commit-filter
+    // (required only to verify it's installed; the plugin is used via options.plugins)
+    if (isSubfolderBuild) {
+      let commitFilterFound = false;
+      let lastError = null;
+      
+      // Try resolving from all paths
+      for (const tryPath of resolvePaths) {
+        try {
+          const commitFilterPath = require.resolve('semantic-release-commit-filter', { paths: [tryPath] });
+          require(commitFilterPath);
+          commitFilterFound = true;
+          break;
+        } catch (e) {
+          lastError = e;
+          continue;
+        }
+      }
+      
+      // If not found in any path, try default require
+      if (!commitFilterFound) {
+        try {
+          require('semantic-release-commit-filter');
+          commitFilterFound = true;
+        } catch (e) {
+          lastError = e;
+        }
+      }
+      
+      if (!commitFilterFound) {
         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');
+        console.error(`Debug: Tried resolving from paths: ${resolvePaths.join(', ')}`);
+        if (lastError) {
+          console.error(`Debug: Last error: ${lastError.message}`);
+        }
         process.exit(1);
       }
     }
-  }
 
   // Query registry for latest version if repository info is provided
   let registryVersion = null;