python-package-folder 5.1.4__tar.gz → 5.1.6__tar.gz

{python_package_folder-5.1.4 → python_package_folder-5.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 5.1.4
+Version: 5.1.6
 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.1.4 → python_package_folder-5.1.6}/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">66%</text>
-    <text x="81" y="14">66%</text>
+    <text x="81" y="15" fill="#010101" fill-opacity=".3">68%</text>
+    <text x="81" y="14">68%</text>
   </g>
 </svg>

{python_package_folder-5.1.4 → python_package_folder-5.1.6}/pyproject.toml

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

{python_package_folder-5.1.4 → python_package_folder-5.1.6}/src/python_package_folder/publisher.py

@@ -8,6 +8,7 @@ repositories including PyPI, PyPI Test, and Azure Artifacts.
 from __future__ import annotations
 
 import getpass
+import os
 import subprocess
 import sys
 from enum import Enum
@@ -19,6 +20,18 @@ except ImportError:
     keyring = None
 
 
+def _is_non_interactive() -> bool:
+    """Check if running in a non-interactive environment (CI/CD)."""
+    # Check for common CI environment variables
+    ci_vars = ["GITHUB_ACTIONS", "CI", "CONTINUOUS_INTEGRATION", "TF_BUILD"]
+    if any(os.getenv(var) for var in ci_vars):
+        return True
+    # Check if stdin is not a TTY (non-interactive)
+    if not sys.stdin.isatty():
+        return True
+    return False
+
+
 class Repository(Enum):
     """
     Supported package repositories.
@@ -112,9 +125,9 @@ class Publisher:
         """
         Get credentials for publishing.
 
-        Always prompts for username and password/token if not already provided.
-        Does not use keyring to store/retrieve credentials - credentials must be
-        provided via command-line arguments or will be prompted each time.
+        Prompts for username and password/token if not already provided.
+        In non-interactive environments (CI/CD), checks environment variables
+        or raises an error if credentials are missing.
 
         Returns:
             Tuple of (username, password/token)
@@ -122,21 +135,54 @@ class Publisher:
         username = self.username
         password = self.password
 
-        # Always prompt if not provided via command-line arguments
-        # We don't use keyring to avoid storing credentials
+        is_non_interactive_env = _is_non_interactive()
+
+        # Get username
         if not username:
-            username = input(f"Enter username for {self.repository.value}: ").strip()
-            if not username:
-                raise ValueError("Username is required")
+            if is_non_interactive_env:
+                # Check environment variables
+                username = os.getenv("TWINE_USERNAME") or os.getenv("PYPI_USERNAME")
+                if not username:
+                    raise ValueError(
+                        f"Username is required for publishing to {self.repository.value} in CI/CD. "
+                        "Please provide --username argument or set TWINE_USERNAME/PYPI_USERNAME environment variable."
+                    )
+            else:
+                username = input(f"Enter username for {self.repository.value}: ").strip()
+                if not username:
+                    raise ValueError("Username is required")
 
+        # Get password
         if not password:
-            if self.repository == Repository.AZURE:
-                prompt = f"Enter Azure Artifacts token for {username}: "
+            if is_non_interactive_env:
+                # Check environment variables (common names used by twine and CI/CD)
+                password = (
+                    os.getenv("TWINE_PASSWORD")
+                    or os.getenv("PYPI_PASSWORD")
+                    or os.getenv("AZURE_ARTIFACTS_TOKEN")  # For Azure
+                )
+                if not password:
+                    raise ValueError(
+                        f"Password/token is required for publishing to {self.repository.value} in CI/CD. "
+                        "Please provide --password argument or set one of: "
+                        "TWINE_PASSWORD, PYPI_PASSWORD, or AZURE_ARTIFACTS_TOKEN environment variable."
+                    )
             else:
-                prompt = f"Enter PyPI token for {username} (or __token__ for API token): "
-            password = getpass.getpass(prompt)
-            if not password:
-                raise ValueError("Password/token is required")
+                if self.repository == Repository.AZURE:
+                    prompt = f"Enter Azure Artifacts token for {username}: "
+                else:
+                    prompt = f"Enter PyPI token for {username} (or __token__ for API token): "
+                try:
+                    password = getpass.getpass(prompt)
+                except (EOFError, OSError):
+                    # Handle non-interactive environments gracefully
+                    raise ValueError(
+                        f"Password/token is required for publishing to {self.repository.value}. "
+                        "Cannot prompt for password in non-interactive environment. "
+                        "Please provide --password argument or set TWINE_PASSWORD/PYPI_PASSWORD environment variable."
+                    )
+                if not password:
+                    raise ValueError("Password/token is required")
 
         # Auto-detect if password is an API token and adjust username
         if password.startswith("pypi-") or password.startswith("pypi_Ag"):

{python_package_folder-5.1.4 → python_package_folder-5.1.6}/src/python_package_folder/subfolder_build.py

@@ -694,44 +694,55 @@ class SubfolderBuildConfig:
             # Usually after [dependency-groups] or at the end
             insert_index = len(result)
             tool_section_exists = False
+            tool_section_start = -1
+            tool_section_end = -1
+            
+            # First, search specifically for [tool.python-package-folder]
             for i, line in enumerate(result):
                 if line.strip() == "[tool.python-package-folder]":
                     tool_section_exists = True
-                    insert_index = i
-                    break
-                elif line.strip().startswith("[tool.") and i > 0:
-                    # Insert before other tool sections
-                    insert_index = i
+                    tool_section_start = i
+                    # Find end of section (next [section] or end of file)
+                    for j in range(i + 1, len(result)):
+                        if result[j].strip().startswith("["):
+                            tool_section_end = j
+                            break
+                    if tool_section_end == -1:
+                        tool_section_end = len(result)
                     break
+            
+            # If not found, find a good insertion point before other [tool.*] sections
+            if not tool_section_exists:
+                for i, line in enumerate(result):
+                    if line.strip().startswith("[tool.") and i > 0:
+                        # Insert before other tool sections
+                        insert_index = i
+                        break
 
             # Format exclude patterns
             patterns_str = ", ".join(f'"{p}"' for p in exclude_patterns)
-            exclude_lines = [
-                "",
-                "[tool.python-package-folder]",
-                f'exclude-patterns = [{patterns_str}]',
-            ]
 
             if tool_section_exists:
-                # Replace or update existing section
-                end_index = insert_index + 1
-                while end_index < len(result) and not result[end_index].strip().startswith("["):
-                    end_index += 1
-                # Check if exclude-patterns already exists
-                has_exclude_patterns = any(
-                    "exclude-patterns" in result[i] for i in range(insert_index, end_index)
-                )
-                if has_exclude_patterns:
-                    # Update existing exclude-patterns line
-                    for i in range(insert_index, end_index):
-                        if "exclude-patterns" in result[i]:
-                            result[i] = f'exclude-patterns = [{patterns_str}]'
-                            break
-                else:
-                    # Add exclude-patterns to existing section
-                    result.insert(end_index - 1, f'exclude-patterns = [{patterns_str}]')
+                # Update existing section
+                # Check if exclude-patterns already exists in the section
+                has_exclude_patterns = False
+                for i in range(tool_section_start + 1, tool_section_end):
+                    if "exclude-patterns" in result[i]:
+                        has_exclude_patterns = True
+                        # Update the existing line
+                        result[i] = f'exclude-patterns = [{patterns_str}]'
+                        break
+                
+                if not has_exclude_patterns:
+                    # Add exclude-patterns to existing section (before the next section)
+                    result.insert(tool_section_end, f'exclude-patterns = [{patterns_str}]')
             else:
                 # Insert new section
+                exclude_lines = [
+                    "",
+                    "[tool.python-package-folder]",
+                    f'exclude-patterns = [{patterns_str}]',
+                ]
                 result[insert_index:insert_index] = exclude_lines
 
         return "\n".join(result)

{python_package_folder-5.1.4 → python_package_folder-5.1.6}/tests/test_exclude_patterns.py

@@ -211,4 +211,60 @@ class TestExcludePatternsInBuild:
         assert ".*_test.*" in content
         assert "sandbox" in content
 
+        # Verify there's only ONE [tool.python-package-folder] section (no duplicates)
+        sections = [line for line in content.split("\n") if line.strip() == "[tool.python-package-folder]"]
+        assert len(sections) == 1, f"Found {len(sections)} duplicate [tool.python-package-folder] sections"
+
+        config.restore()
+
+    def test_exclude_patterns_no_duplicate_section(self, tmp_path: Path) -> None:
+        """Test that exclude patterns don't create duplicate sections when original already has it."""
+        project_root = tmp_path / "test_project"
+        project_root.mkdir()
+
+        # Create pyproject.toml with existing [tool.python-package-folder] section
+        pyproject_content = """[project]
+name = "test-package"
+version = "0.1.0"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/test_package"]
+
+[tool.python-package-folder]
+exclude-patterns = ["_SS", ".*_test.*"]
+
+[tool.pylint.'TYPECHECK']
+generated-members = ["networkx.*"]
+"""
+        (project_root / "pyproject.toml").write_text(pyproject_content)
+
+        # Create source directory
+        src_dir = project_root / "src" / "test_package"
+        src_dir.mkdir(parents=True)
+        (src_dir / "__init__.py").write_text("")
+
+        config = SubfolderBuildConfig(
+            project_root=project_root,
+            src_dir=src_dir,
+            package_name="test-package",
+            version="1.0.0",
+        )
+
+        # Create temporary pyproject.toml
+        temp_pyproject = config.create_temp_pyproject()
+        assert temp_pyproject is not None
+
+        # Check that there's only ONE [tool.python-package-folder] section
+        content = temp_pyproject.read_text()
+        sections = [line for line in content.split("\n") if line.strip() == "[tool.python-package-folder]"]
+        assert len(sections) == 1, f"Found {len(sections)} duplicate [tool.python-package-folder] sections: {sections}"
+
+        # Verify exclude-patterns is present
+        assert "exclude-patterns" in content
+        assert "_SS" in content
+
         config.restore()