pipgrip 0.10.12__tar.gz → 0.10.14__tar.gz

{pipgrip-0.10.12/src/pipgrip.egg-info → pipgrip-0.10.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pipgrip
-Version: 0.10.12
+Version: 0.10.14
 Summary: Lightweight pip dependency resolver with deptree preview functionality based on the PubGrub algorithm
 Home-page: https://github.com/ddelange/pipgrip
 Author: ddelange

pipgrip-0.10.14/src/pipgrip/_repo_version.py

@@ -0,0 +1 @@
+version = "0.10.14"

{pipgrip-0.10.12 → pipgrip-0.10.14}/src/pipgrip/cli.py

@@ -52,7 +52,12 @@ from pipgrip.libs.mixology.failure import SolverFailure
 from pipgrip.libs.mixology.package import Package
 from pipgrip.libs.mixology.version_solver import VersionSolver
 from pipgrip.package_source import PackageSource, render_pin
-from pipgrip.pipper import install_packages, read_requirements
+from pipgrip.pipper import (
+    BUILD_FAILURE_STR,
+    REPORT_FAILURE_STR,
+    install_packages,
+    read_requirements,
+)
 
 logging.basicConfig(format="%(levelname)s: %(message)s")
 logger = logging.getLogger()
@@ -479,7 +484,7 @@ def main(
             exc = None
         except RuntimeError as e:
             # RuntimeError coming from pipgrip.pipper
-            if "Failed to download/build wheel" not in str(e):
+            if REPORT_FAILURE_STR not in str(e) and BUILD_FAILURE_STR not in str(e):
                 # only continue handling expected RuntimeErrors
                 raise
             solution = solver.solution

{pipgrip-0.10.12 → pipgrip-0.10.14}/src/pipgrip/libs/mixology/range.py

@@ -31,6 +31,7 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 # flake8: noqa:A002,A003
+from copy import deepcopy
 from typing import Any, NoReturn, Optional
 from typing import Union as _Union
 
@@ -315,6 +316,21 @@ class Range(object):
         return not self.include_max or not other.include_min
 
     def is_strictly_higher(self, other):  # type: (Range) -> bool
+        if (
+            self.is_single_version()
+            and self.max is not None
+            and other.max is not None
+            and self.max.is_prerelease()
+            and not other.max.is_prerelease()
+            and not other.include_max
+            and self.max.equals_without_prerelease(other.max)
+        ):
+            # in pip, `<5`, `<5.0`, `<5.0.0` are shorthand for `<5.0.0-alpha.0`.
+            # e.g. `pip install --pre django<5.0` will not install django==5.0rc1
+            # although technically 5.0rc1 < 5.0 according to semver.
+            # mimic this behaviour here (check 5.0rc1 against <5.0.0-alpha.0)
+            other = deepcopy(other)
+            other._max = other.max.first_prerelease
         return other.is_strictly_lower(self)
 
     def is_adjacent_to(self, other):  # type: (Range) -> bool

{pipgrip-0.10.12 → pipgrip-0.10.14}/src/pipgrip/pipper.py

@@ -49,6 +49,10 @@ from pipgrip.compat import PIP_VERSION, urlparse
 
 logger = logging.getLogger(__name__)
 
+REPORT_FAILURE_STR = "Failed to get report for"
+BUILD_FAILURE_STR = "Failed to download/build wheel for"
+VERSIONS_FAILURE_STR = "Failed to get available versions for"
+
 
 def read_requirements(path):
     re_comments = re.compile(r"(?:^|\s+)#")
@@ -292,7 +296,7 @@ def _get_available_versions(package, index_url, extra_index_url, pre):
             ]
             _available_versions_cache[cache_key] = available_versions
             return available_versions
-    raise RuntimeError("Failed to get available versions for {}".format(package))
+    raise RuntimeError("{} {}".format(VERSIONS_FAILURE_STR, package))
 
 
 def _get_package_report(
@@ -357,7 +361,7 @@ def _get_package_report(
                 package, output.strip()
             )
         )
-        raise RuntimeError("Failed to get report for {}".format(package))
+        raise RuntimeError("{} {}".format(REPORT_FAILURE_STR, package))
     else:
         with io.open(report_file, "r", encoding="utf-8") as fp:
             return json.load(fp)
@@ -397,7 +401,7 @@ def _download_wheel(
                 package, output.strip()
             )
         )
-        raise RuntimeError("Failed to download/build wheel for {}".format(package))
+        raise RuntimeError("{} {}".format(BUILD_FAILURE_STR, package))
     out = out.splitlines()[::-1]
     abs_wheel_dir_lower = abs_wheel_dir.lower()
     cwd_wheel_dir_lower = cwd_wheel_dir.lower()
@@ -474,7 +478,7 @@ def _download_wheel(
             "\n".join(out[::-1])
         )
     )
-    raise RuntimeError("Failed to download/build wheel for {}".format(package))
+    raise RuntimeError("{} {}".format(BUILD_FAILURE_STR, package))
 
 
 def _extract_metadata(wheel_fname):

{pipgrip-0.10.12 → pipgrip-0.10.14/src/pipgrip.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pipgrip
-Version: 0.10.12
+Version: 0.10.14
 Summary: Lightweight pip dependency resolver with deptree preview functionality based on the PubGrub algorithm
 Home-page: https://github.com/ddelange/pipgrip
 Author: ddelange

pipgrip-0.10.12/src/pipgrip/_repo_version.py

@@ -1 +0,0 @@
-version = "0.10.12"