pipu-cli 0.1.dev4__py3-none-any.whl → 0.1.dev6__py3-none-any.whl

pipu_cli/__init__.py

@@ -1,7 +1,7 @@
 import logging
 from .config import LOG_LEVEL
 
-__version__ = '0.1.dev4'
+__version__ = '0.1.dev6'
 
 
 # Configure logging

pipu_cli/cli.py

@@ -7,16 +7,63 @@ from .common import console
 from pip._internal.commands.install import InstallCommand
 
 
-def _install_packages(package_specs: List[str]) -> int:
+def _install_packages(package_names: List[str], packages_being_updated: List[str] = None) -> int:
     """
-    Install packages using pip API.
+    Install packages using pip API with filtered constraints.
 
-    :param package_specs: List of package specifications to install
+    :param package_names: List of package names to install
+    :param packages_being_updated: List of package names being updated (to exclude from constraints)
     :returns: Exit code (0 for success, non-zero for failure)
     """
-    install_cmd = InstallCommand("install", "Install packages")
-    install_args = ["--upgrade"] + package_specs
-    return install_cmd.main(install_args)
+    import tempfile
+    import os
+    from packaging.utils import canonicalize_name
+
+    # If packages_being_updated not provided, use package_names
+    if packages_being_updated is None:
+        packages_being_updated = package_names
+
+    # Get all current constraints and filter out packages being updated
+    from .package_constraints import read_constraints
+    all_constraints = read_constraints()
+
+    # Get canonical names of packages being updated
+    packages_being_updated_canonical = {canonicalize_name(pkg) for pkg in packages_being_updated}
+
+    # Filter out constraints for packages being updated to avoid conflicts
+    filtered_constraints = {
+        pkg: constraint
+        for pkg, constraint in all_constraints.items()
+        if pkg not in packages_being_updated_canonical
+    }
+
+    # Create a temporary constraints file if there are any constraints to apply
+    constraint_file_path = None
+    try:
+        if filtered_constraints:
+            with tempfile.NamedTemporaryFile(mode='w', suffix='.txt', delete=False) as f:
+                constraint_file_path = f.name
+                for pkg, constraint in filtered_constraints.items():
+                    f.write(f"{pkg}{constraint}\n")
+
+            # Set environment variable for pip to use the filtered constraints
+            os.environ['PIP_CONSTRAINT'] = constraint_file_path
+            console.print(f"[dim]Using filtered constraints (excluding {len(packages_being_updated_canonical)} package(s) being updated)[/dim]")
+
+        install_cmd = InstallCommand("install", "Install packages")
+        install_args = ["--upgrade"] + package_names
+        return install_cmd.main(install_args)
+
+    finally:
+        # Clean up: remove the constraint file and unset environment variable
+        if constraint_file_path:
+            if 'PIP_CONSTRAINT' in os.environ:
+                del os.environ['PIP_CONSTRAINT']
+            if os.path.exists(constraint_file_path):
+                try:
+                    os.unlink(constraint_file_path)
+                except Exception:
+                    pass  # Best effort cleanup
 
 
 def launch_tui() -> None:
@@ -202,21 +249,13 @@ def update(pre, yes):
         console.print()
         console.print("[bold green]Installing updates...[/bold green]")
 
-        # Create list of package specs to install
-        package_specs = []
-        for package in packages_to_update:
-            # Check if package has a constraint that should be applied instead of latest version
-            constraint = package.get('constraint')
-            if constraint:
-                # Apply the constraint instead of pinning to latest version
-                spec = f"{package['name']}{constraint}"
-            else:
-                # No constraint, use latest version
-                spec = f"{package['name']}=={package['latest_version']}"
-            package_specs.append(spec)
+        # Create list of package names to install
+        # Use --upgrade without version pinning to allow pip's dependency resolver
+        # to handle interdependent packages (e.g., pydantic and pydantic-core)
+        package_names = [package['name'] for package in packages_to_update]
 
-        # Install packages using pip API
-        exit_code = _install_packages(package_specs)
+        # Install packages using pip API with filtered constraints
+        exit_code = _install_packages(package_names, packages_being_updated=package_names)
 
         if exit_code == 0:
             console.print("[bold green]✓ All packages updated successfully![/bold green]")

pipu_cli/internals.py

@@ -787,10 +787,10 @@ def update_packages_preserving_editable(
 
                 if not is_editable:
                     # Regular package update
-                    if latest_version:
-                        install_cmd = [sys.executable, "-m", "pip", "install", f"{package_name}=={latest_version}"]
-                    else:
-                        install_cmd = [sys.executable, "-m", "pip", "install", "--upgrade", package_name]
+                    # Use --upgrade instead of pinning to specific versions to allow pip's
+                    # dependency resolver to handle interdependent packages correctly
+                    # (e.g., pydantic and pydantic-core, boto3 and botocore)
+                    install_cmd = [sys.executable, "-m", "pip", "install", "--upgrade", package_name]
 
                     returncode, stdout, stderr = run_with_cancel(install_cmd, timeout=timeout)
 

pipu_cli/ui/modal_dialogs.py

@@ -1020,20 +1020,12 @@ class PackageUpdateScreen(ModalScreen[None]):
                         constraint_file.close()
                         self.app.call_from_thread(self._log_message, f"[dim]Using filtered constraints (excluding {len(packages_being_updated)} package(s) being updated)[/dim]")
 
-                    # Build list of package specs to update, respecting constraints
-                    package_specs = []
+                    # Build list of package names to update
+                    # Use --upgrade instead of pinning versions to avoid dependency conflicts
+                    # when updating interdependent packages (e.g., pydantic and pydantic-core)
                     package_names = []
                     for pkg in self.selected_packages:
                         package_names.append(pkg["name"])
-                        # Check if package has a constraint that should be applied instead of latest version
-                        constraint = pkg.get('constraint')
-                        if constraint:
-                            # Apply the constraint instead of pinning to latest version
-                            spec = f"{pkg['name']}{constraint}"
-                        else:
-                            # No constraint, use latest version
-                            spec = f"{pkg['name']}=={pkg['latest_version']}"
-                        package_specs.append(spec)
 
                     self.app.call_from_thread(self._update_status, f"Updating {total_packages} packages...")
                     self.app.call_from_thread(self._log_message, f"{'='*70}")
@@ -1042,8 +1034,10 @@ class PackageUpdateScreen(ModalScreen[None]):
                         self.app.call_from_thread(self._log_message, f"   ... and {len(package_names) - 5} more")
                     self.app.call_from_thread(self._log_message, f"{'='*70}\n")
 
-                    # Prepare pip command to install all packages at once with proper version specs
-                    pip_cmd = [sys.executable, "-m", "pip", "install"] + package_specs
+                    # Prepare pip command to install all packages with --upgrade
+                    # This allows pip's dependency resolver to find compatible versions
+                    # for interdependent packages (e.g., pydantic requires specific pydantic-core)
+                    pip_cmd = [sys.executable, "-m", "pip", "install", "--upgrade"] + package_names
 
                     # Set up environment with constraint file if available
                     env = os.environ.copy()

{pipu_cli-0.1.dev4.dist-info → pipu_cli-0.1.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pipu-cli
-Version: 0.1.dev4
+Version: 0.1.dev6
 Summary: A cute Python package updater
 Author-email: Scott Arne Johnson <scott.arne.johnson@gmail.com>
 License-Expression: MIT

{pipu_cli-0.1.dev4.dist-info → pipu_cli-0.1.dev6.dist-info}/RECORD

@@ -1,19 +1,19 @@
-pipu_cli/__init__.py,sha256=ftE6SwRQUnMZwrCU25nvb-X0ASkV_TPiqhURZfbbaPU,1190
-pipu_cli/cli.py,sha256=aCN2Fz1bWhXs8MC7kqy5GdzJggNtTdumW4PQkxKOBpg,39993
+pipu_cli/__init__.py,sha256=6tnAKZMPjf830m0TO279lIHtF7_B5gnWQTiYCidkeYU,1190
+pipu_cli/cli.py,sha256=4pZh9kh0JO8FRbDBewVUJWt8iQrEC5w4AylOghYWkd4,41838
 pipu_cli/common.py,sha256=g5krfXFsvVJpOf87Vw4DGi5WIduDgMlRuONKXqO328M,78
 pipu_cli/config.py,sha256=xsfNU4ORAujla_FGfsMKpxy7QTpd_bJhRF_u4IPKLW0,3635
-pipu_cli/internals.py,sha256=u8J2df2rirOSgpeX3yp3ZHRLWyiqm7cMgo6TRFE8shU,35032
+pipu_cli/internals.py,sha256=m_aF-yrOT5UJt54vv6X2gEukgokFXkz0m9SAKRofir0,35101
 pipu_cli/package_constraints.py,sha256=6LSFlC93HNIFym7dYkfYn0fsOic6QDe1ADyghK94Pk8,93052
 pipu_cli/thread_safe.py,sha256=zdQyCoMVJW73MC-d1pL_4ZO-K4AwkI0JeVyQsd8x7nY,7545
 pipu_cli/utils.py,sha256=ijSHKVuKbjmRbj2RwD9S1606PeY4oDiutzhutpX25wM,5842
 pipu_cli/ui/__init__.py,sha256=nCb_3G_vZXy5_Or9z9r-3XhYV1ppUR1r7nMZ9_6Srwg,1432
 pipu_cli/ui/apps.py,sha256=ltH24sg-3nqVpoomgCwhVYuAwq3hBUwYRH60JXtV2Yg,59771
 pipu_cli/ui/constants.py,sha256=HBPf4KYWHiT18c7ciQ0HeI7gZE3VIFOT0uobLU8YxQA,445
-pipu_cli/ui/modal_dialogs.py,sha256=_Q6BIJBX9l6CpqDILH3WqPfKYMqRlDnMLNUelIhZdUM,48248
+pipu_cli/ui/modal_dialogs.py,sha256=-Trh60n2mev6Pr-aIvetJHnXqqoJaVDmA3c8xH_xePM,47974
 pipu_cli/ui/table_widgets.py,sha256=PC0CqqrK3KgMbTCYRPG01lxkEtRBz9xr9PN8EzoObz8,14322
-pipu_cli-0.1.dev4.dist-info/licenses/LICENSE,sha256=q6TxVbSI0WMB9ulF2V0FWQfeA5om3d-T9X7QwuhdiYE,1075
-pipu_cli-0.1.dev4.dist-info/METADATA,sha256=jSrp9kzQLwM6zr60AwSeiiZ6eqpBD1TK0IsoWLwQPSs,13200
-pipu_cli-0.1.dev4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pipu_cli-0.1.dev4.dist-info/entry_points.txt,sha256=VSv6od00zOPblnFPflNLaci4jBtQIgLYJjL1BKxLz_o,42
-pipu_cli-0.1.dev4.dist-info/top_level.txt,sha256=z3Yce93-jGQjGRpsGZUZvbS8osh3OyS7MVpzG0uBE5M,9
-pipu_cli-0.1.dev4.dist-info/RECORD,,
+pipu_cli-0.1.dev6.dist-info/licenses/LICENSE,sha256=q6TxVbSI0WMB9ulF2V0FWQfeA5om3d-T9X7QwuhdiYE,1075
+pipu_cli-0.1.dev6.dist-info/METADATA,sha256=JqoGCM76nI14oiMrjwdvm2HjNRbVWQagOuxa_Q5ybsM,13200
+pipu_cli-0.1.dev6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pipu_cli-0.1.dev6.dist-info/entry_points.txt,sha256=VSv6od00zOPblnFPflNLaci4jBtQIgLYJjL1BKxLz_o,42
+pipu_cli-0.1.dev6.dist-info/top_level.txt,sha256=z3Yce93-jGQjGRpsGZUZvbS8osh3OyS7MVpzG0uBE5M,9
+pipu_cli-0.1.dev6.dist-info/RECORD,,