python-package-folder 5.2.1__tar.gz → 5.2.3__tar.gz

{python_package_folder-5.2.1 → python_package_folder-5.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 5.2.1
+Version: 5.2.3
 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-5.2.1 → python_package_folder-5.2.3}/coverage.svg

@@ -14,7 +14,7 @@
   <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
     <text x="31.5" y="15" fill="#010101" fill-opacity=".3">coverage</text>
     <text x="31.5" y="14">coverage</text>
-    <text x="81" y="15" fill="#010101" fill-opacity=".3">68%</text>
-    <text x="81" y="14">68%</text>
+    <text x="81" y="15" fill="#010101" fill-opacity=".3">67%</text>
+    <text x="81" y="14">67%</text>
   </g>
 </svg>

{python_package_folder-5.2.1 → python_package_folder-5.2.3}/pyproject.toml

@@ -43,7 +43,7 @@ dependencies = [
 
 # ---- Dev dependencies ----
 
-version = "5.2.1"
+version = "5.2.3"
 [dependency-groups]
 dev = [
     "pytest>=8.3.5",

{python_package_folder-5.2.1 → python_package_folder-5.2.3}/src/python_package_folder/manager.py

@@ -1227,6 +1227,14 @@ class BuildManager:
                         publish_package_name = (
                             self.src_dir.name.replace("_", "-").replace(" ", "-").lower().strip("-")
                         )
+                    
+                    # Log the package name being used for publishing
+                    import logging
+                    logger = logging.getLogger(__name__)
+                    logger.info(
+                        f"Publishing package with name: '{publish_package_name}' "
+                        f"(captured: {captured_package_name}, param: {package_name}, src_dir: '{self.src_dir.name}')"
+                    )
                 else:
                     # For regular builds, get package name from pyproject.toml
                     try:

{python_package_folder-5.2.1 → python_package_folder-5.2.3}/src/python_package_folder/publisher.py

@@ -346,12 +346,24 @@ class Publisher:
             # Provide helpful hints based on common errors
             if e.returncode == 1:
                 if e.stderr and ("already exists" in e.stderr.lower() or "409" in e.stderr or "conflict" in e.stderr.lower()):
-                    print(
-                        "\nHint: This version may already exist on the repository. "
-                        "Use --skip-existing to skip files that already exist, "
-                        "or publish a new version.",
-                        file=sys.stderr,
-                    )
+                    if self.repository == Repository.AZURE:
+                        print(
+                            "\nHint for Azure Artifacts: If the version query returned 404 (not found) "
+                            "with authentication but the upload returns 409 Conflict, this could indicate:\n"
+                            "  - Different authentication requirements between simple index (read) and upload (write) endpoints\n"
+                            "  - The simple index endpoint may require different permissions or authentication method\n"
+                            "  - The package already exists with this version\n"
+                            "  - Use --skip-existing to skip files that already exist\n"
+                            "  - Check if your token has 'Packaging (read)' scope in addition to 'Packaging (read & write)'",
+                            file=sys.stderr,
+                        )
+                    else:
+                        print(
+                            "\nHint: This version may already exist on the repository. "
+                            "Use --skip-existing to skip files that already exist, "
+                            "or publish a new version.",
+                            file=sys.stderr,
+                        )
                 elif e.stderr and ("401" in e.stderr or "unauthorized" in e.stderr.lower()):
                     print(
                         "\nHint: Authentication failed. Check your credentials.",

{python_package_folder-5.2.1 → python_package_folder-5.2.3}/src/python_package_folder/python_package_folder.py

@@ -186,6 +186,21 @@ def main() -> int:
                 repository = args.publish if args.publish else None
                 repository_url = args.repository_url if args.publish else None
                 
+                # Get credentials for authenticated registry queries (especially Azure Artifacts)
+                # Try to get them from args or environment variables
+                query_username = args.username
+                query_password = args.password
+                
+                # If not provided via args, check environment variables (for Azure Artifacts)
+                if repository == "azure" and not query_username:
+                    query_username = os.getenv("TWINE_USERNAME") or os.getenv("PYPI_USERNAME")
+                if repository == "azure" and not query_password:
+                    query_password = (
+                        os.getenv("TWINE_PASSWORD")
+                        or os.getenv("PYPI_PASSWORD")
+                        or os.getenv("AZURE_ARTIFACTS_TOKEN")
+                    )
+                
                 if is_subfolder:
                     # Workflow 1: subfolder build
                     # src_dir is guaranteed to be relative to project_root due to is_subfolder check
@@ -193,12 +208,22 @@ def main() -> int:
                         " ", "-"
                     ).lower().strip("-")
                     subfolder_rel_path = src_dir.relative_to(project_root)
+                    
+                    # Log the package name being used for version query
+                    logger = logging.getLogger(__name__)
+                    logger.info(
+                        f"Querying registry for package name: '{package_name}' "
+                        f"(derived from src_dir: '{src_dir.name}', args.package_name: {args.package_name})"
+                    )
+                    
                     resolved_version, error_details = resolve_version(
                         project_root,
                         package_name=package_name,
                         subfolder_path=subfolder_rel_path,
                         repository=repository,
                         repository_url=repository_url,
+                        username=query_username,
+                        password=query_password,
                     )
                 else:
                     # Workflow 2: main package
@@ -221,6 +246,8 @@ def main() -> int:
                         subfolder_path=None,
                         repository=repository,
                         repository_url=repository_url,
+                        username=query_username,
+                        password=query_password,
                     )
 
                 if resolved_version:

{python_package_folder-5.2.1 → python_package_folder-5.2.3}/src/python_package_folder/subfolder_build.py

@@ -402,6 +402,10 @@ class SubfolderBuildConfig:
             # Modify using parsed data
             if "project" in data:
                 data["project"]["name"] = self.package_name
+                # Log the package name being set
+                import logging
+                logger = logging.getLogger(__name__)
+                logger.info(f"Setting package name in temporary pyproject.toml: '{self.package_name}'")
                 if "version" in data["project"]:
                     data["project"]["version"] = self.version
                 elif "dynamic" in data["project"]:
@@ -475,6 +479,11 @@ class SubfolderBuildConfig:
         if not package_dirs:
             package_dirs = []
 
+        # Log the package name being set via string manipulation
+        import logging
+        logger = logging.getLogger(__name__)
+        logger.info(f"Setting package name in temporary pyproject.toml (string manipulation): '{self.package_name}'")
+
         for _i, line in enumerate(lines):
             # Skip build-system section - we'll add our own for subfolder builds
             if line.strip().startswith("[build-system]"):

{python_package_folder-5.2.1 → python_package_folder-5.2.3}/src/python_package_folder/version_calculator.py

@@ -25,6 +25,8 @@ def query_registry_version(
     package_name: str,
     repository: str,
     repository_url: str | None = None,
+    username: str | None = None,
+    password: str | None = None,
 ) -> str | None:
     """
     Query package registry for the latest published version.
@@ -33,6 +35,8 @@ def query_registry_version(
         package_name: Package name to query
         repository: Repository type ('pypi', 'testpypi', or 'azure')
         repository_url: Repository URL (required for Azure Artifacts)
+        username: Optional username for authenticated queries (Azure Artifacts)
+        password: Optional password/token for authenticated queries (Azure Artifacts)
 
     Returns:
         Latest version string or None if not found/unsupported
@@ -54,7 +58,7 @@ def query_registry_version(
                 logger.warning("Azure Artifacts repository URL not provided")
                 return None
             logger.info(f"Querying Azure Artifacts for package '{package_name}' at {repository_url}")
-            version = _query_azure_artifacts_version(package_name, repository_url)
+            version = _query_azure_artifacts_version(package_name, repository_url, username, password)
             if version:
                 logger.info(f"Found version {version} on Azure Artifacts")
             else:
@@ -184,6 +188,8 @@ class SimpleIndexParser(HTMLParser):
 def _query_azure_artifacts_version(
     package_name: str,
     repository_url: str,
+    username: str | None = None,
+    password: str | None = None,
 ) -> str | None:
     """
     Query Azure Artifacts for the latest version.
@@ -194,6 +200,8 @@ def _query_azure_artifacts_version(
     Args:
         package_name: Package name to query
         repository_url: Azure Artifacts repository URL
+        username: Optional username for authentication
+        password: Optional password/token for authentication
 
     Returns:
         Latest version string or None if not found/unsupported
@@ -212,8 +220,15 @@ def _query_azure_artifacts_version(
         return None
 
     try:
-        logger.info(f"Fetching Azure Artifacts simple index for '{package_name}'...")
-        response = requests.get(simple_index_url, timeout=10)
+        # Prepare authentication if credentials are provided
+        auth = None
+        if username and password:
+            auth = (username, password)
+            logger.info(f"Fetching Azure Artifacts simple index for '{package_name}' with authentication...")
+        else:
+            logger.info(f"Fetching Azure Artifacts simple index for '{package_name}' (no authentication)...")
+        
+        response = requests.get(simple_index_url, auth=auth, timeout=10)
         logger.info(f"Azure Artifacts response: status={response.status_code}, content_length={len(response.text)} bytes")
         
         if response.status_code == 401:
@@ -231,10 +246,27 @@ def _query_azure_artifacts_version(
             )
             return None
         elif response.status_code == 404:
-            logger.info(
-                f"Package '{package_name}' not found on Azure Artifacts (404) - this appears to be the first release. "
-                f"URL: {simple_index_url}"
-            )
+            if auth:
+                # If we're using authentication and still get 404, it could be various issues
+                logger.warning(
+                    f"Package '{package_name}' not found on Azure Artifacts (404) with authentication. "
+                    f"This could indicate:\n"
+                    f"  (1) Different authentication requirements between simple index (read) and upload (write) endpoints\n"
+                    f"  (2) The simple index endpoint may require different permissions or authentication method\n"
+                    f"  (3) This is the first release (package doesn't exist yet)\n"
+                    f"  (4) Package name mismatch between query and publish\n"
+                    f"URL: {simple_index_url}\n"
+                    f"Note: If publishing succeeds but querying fails with 404, check:\n"
+                    f"  - Whether the simple index endpoint requires different authentication\n"
+                    f"  - Whether your token has 'Packaging (read)' scope in addition to 'Packaging (read & write)'\n"
+                    f"  - Whether the package name used for querying matches the published package name"
+                )
+            else:
+                logger.info(
+                    f"Package '{package_name}' not found on Azure Artifacts (404) - this appears to be the first release. "
+                    f"Note: If authentication is required, provide credentials via --username/--password or environment variables. "
+                    f"URL: {simple_index_url}"
+                )
             return None
         elif response.status_code != 200:
             logger.warning(
@@ -628,6 +660,8 @@ def resolve_version(
     subfolder_path: Path | None = None,
     repository: str | None = None,
     repository_url: str | None = None,
+    username: str | None = None,
+    password: str | None = None,
 ) -> tuple[str | None, str | None]:
     """
     Resolve the next version using conventional commits.
@@ -640,6 +674,8 @@ def resolve_version(
         subfolder_path: Optional path to subfolder (relative to project_root)
         repository: Optional target repository ('pypi', 'testpypi', or 'azure')
         repository_url: Optional repository URL (required for Azure Artifacts)
+        username: Optional username for authenticated registry queries (Azure Artifacts)
+        password: Optional password/token for authenticated registry queries (Azure Artifacts)
 
     Returns:
         Tuple of (version string if a release is determined, error message if any)
@@ -651,7 +687,7 @@ def resolve_version(
     baseline_version = None
     if repository and package_name:
         logger.info(f"Attempting to query {repository} for baseline version of '{package_name}'")
-        baseline_version = query_registry_version(package_name, repository, repository_url)
+        baseline_version = query_registry_version(package_name, repository, repository_url, username, password)
 
     # Step 2: Fallback to git tags if registry query failed
     if not baseline_version:

{python_package_folder-5.2.1 → python_package_folder-5.2.3}/tests/test_version_calculator.py

@@ -151,6 +151,39 @@ class TestQueryRegistryVersion:
         # Should return None when no versions found in HTML
         assert version is None
 
+    @patch("python_package_folder.version_calculator.requests.get")
+    def test_query_azure_artifacts_version_with_auth(self, mock_get: MagicMock) -> None:
+        """Test querying Azure Artifacts with authentication."""
+        mock_response = Mock()
+        mock_response.status_code = 200
+        mock_response.text = """<!DOCTYPE html>
+<html>
+  <head>
+    <title>Links for test-package</title>
+  </head>
+  <body>
+    <h1>Links for test-package</h1>
+    <a href="test-package-1.0.0-py3-none-any.whl">test-package-1.0.0-py3-none-any.whl</a>
+    <a href="test-package-1.1.0-py3-none-any.whl">test-package-1.1.0-py3-none-any.whl</a>
+  </body>
+</html>"""
+        mock_get.return_value = mock_response
+
+        version = query_registry_version(
+            "test-package",
+            "azure",
+            repository_url="https://pkgs.dev.azure.com/ORG/PROJECT/_packaging/FEED/pypi/upload",
+            username="testuser",
+            password="testtoken",
+        )
+        # Should parse HTML and return the latest version
+        assert version == "1.1.0"
+        
+        # Verify authentication was used
+        mock_get.assert_called_once()
+        call_args = mock_get.call_args
+        assert call_args[1]["auth"] == ("testuser", "testtoken")
+
     @patch("python_package_folder.version_calculator.requests.get")
     def test_query_registry_version_error_handling(self, mock_get: MagicMock) -> None:
         """Test that registry query errors are handled gracefully."""