pipgrip 0.10.13__tar.gz → 0.10.15__tar.gz

{pipgrip-0.10.13/src/pipgrip.egg-info → pipgrip-0.10.15}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pipgrip
-Version: 0.10.13
+Version: 0.10.15
 Summary: Lightweight pip dependency resolver with deptree preview functionality based on the PubGrub algorithm
 Home-page: https://github.com/ddelange/pipgrip
 Author: ddelange
@@ -35,13 +35,25 @@ License-File: LICENSE
 Requires-Dist: anytree>=2.4.1
 Requires-Dist: click>=7
 Requires-Dist: packaging>=17
-Requires-Dist: setuptools>=38.3
+Requires-Dist: setuptools<81,>=38.3
 Requires-Dist: wheel
 Requires-Dist: pip>=22.2; python_version > "3.6"
 Requires-Dist: pip>=7.1.0; python_version <= "3.6"
 Requires-Dist: pkginfo<1.8,>=1.4.2; python_version <= "3.6"
 Requires-Dist: enum34; python_version == "2.7"
 Requires-Dist: typing; python_version == "2.7"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # pipgrip
 

{pipgrip-0.10.13 → pipgrip-0.10.15}/requirements/prod.txt

@@ -1,7 +1,7 @@
 anytree>=2.4.1
 click>=7
 packaging>=17
-setuptools>=38.3  # for pkg_resources
+setuptools>=38.3,<81  # for pkg_resources ref https://github.com/pypa/setuptools/commit/9c28cdffd423f83e43dbfd39fc793c251da48585
 wheel
 pip>=22.2; python_version>'3.6'  # >=22.2 for --dry-run --report ref ddelange/pipgrip#114
 pip>=7.1.0; python_version<='3.6'  # >=7.1.0 for --constraint

{pipgrip-0.10.13 → pipgrip-0.10.15}/src/pipgrip/__init__.py

@@ -31,4 +31,12 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 # version based on .git/refs/tags - make a tag/release locally, or on GitHub (and pull)
+import warnings
+
 from pipgrip._repo_version import version as __version__  # noqa:F401
+
+warnings.filterwarnings(
+    action="ignore",
+    message=".*pkg_resources",
+    category=UserWarning,
+)

pipgrip-0.10.15/src/pipgrip/_repo_version.py

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

{pipgrip-0.10.13 → pipgrip-0.10.15}/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.13 → pipgrip-0.10.15}/src/pipgrip/libs/semver/version.py

@@ -241,9 +241,7 @@ class Version(VersionRange):
         if match is None:
             # VCS support: use numerical hash
             match = COMPLETE_VERSION.match(
-                str(
-                    int(hashlib.sha256(text.encode("utf-8")).hexdigest(), 16) % 10**12
-                )
+                str(int(hashlib.sha256(text.encode("utf-8")).hexdigest(), 16) % 10**12)
             )
 
         text = text.rstrip(".")

{pipgrip-0.10.13 → pipgrip-0.10.15}/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()
@@ -456,11 +460,15 @@ def _download_wheel(
             # match on lowercase line for windows compatibility
             fname_len = len(
                 line_lower.split(
-                    abs_wheel_dir_lower
-                    if abs_wheel_dir_lower in line_lower
-                    else cwd_wheel_dir_lower
-                    if cwd_wheel_dir_lower in line_lower
-                    else wheel_dir_lower,
+                    (
+                        abs_wheel_dir_lower
+                        if abs_wheel_dir_lower in line_lower
+                        else (
+                            cwd_wheel_dir_lower
+                            if cwd_wheel_dir_lower in line_lower
+                            else wheel_dir_lower
+                        )
+                    ),
                     1,
                 )[1].split(".whl", 1)[0]
                 + ".whl"
@@ -474,7 +482,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.13 → pipgrip-0.10.15/src/pipgrip.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pipgrip
-Version: 0.10.13
+Version: 0.10.15
 Summary: Lightweight pip dependency resolver with deptree preview functionality based on the PubGrub algorithm
 Home-page: https://github.com/ddelange/pipgrip
 Author: ddelange
@@ -35,13 +35,25 @@ License-File: LICENSE
 Requires-Dist: anytree>=2.4.1
 Requires-Dist: click>=7
 Requires-Dist: packaging>=17
-Requires-Dist: setuptools>=38.3
+Requires-Dist: setuptools<81,>=38.3
 Requires-Dist: wheel
 Requires-Dist: pip>=22.2; python_version > "3.6"
 Requires-Dist: pip>=7.1.0; python_version <= "3.6"
 Requires-Dist: pkginfo<1.8,>=1.4.2; python_version <= "3.6"
 Requires-Dist: enum34; python_version == "2.7"
 Requires-Dist: typing; python_version == "2.7"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # pipgrip
 

{pipgrip-0.10.13 → pipgrip-0.10.15}/src/pipgrip.egg-info/requires.txt

@@ -1,7 +1,7 @@
 anytree>=2.4.1
 click>=7
 packaging>=17
-setuptools>=38.3
+setuptools<81,>=38.3
 wheel
 
 [:python_version <= "3.6"]

pipgrip-0.10.13/src/pipgrip/_repo_version.py

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