pipgrip 0.10.14__tar.gz → 0.11.0__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pipgrip
-Version: 0.10.14
+Version: 0.11.0
 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
 
@@ -157,6 +169,10 @@ Options:
   -v, --verbose                 Control verbosity: -v will print cyclic
                                 dependencies (WARNING), -vv will show solving
                                 decisions (INFO), -vvv for development (DEBUG).
+  --skip-invalid-input          Skip invalid requirements (e.g. internal
+                                repositories, typos) and continue processing
+                                other dependencies.
+  --version                     Show the version and exit.
   -h, --help                    Show this message and exit.
 ```
 

{pipgrip-0.10.14 → pipgrip-0.11.0}/README.md

@@ -112,6 +112,10 @@ Options:
   -v, --verbose                 Control verbosity: -v will print cyclic
                                 dependencies (WARNING), -vv will show solving
                                 decisions (INFO), -vvv for development (DEBUG).
+  --skip-invalid-input          Skip invalid requirements (e.g. internal
+                                repositories, typos) and continue processing
+                                other dependencies.
+  --version                     Show the version and exit.
   -h, --help                    Show this message and exit.
 ```
 

{pipgrip-0.10.14 → pipgrip-0.11.0}/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.14 → pipgrip-0.11.0}/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.11.0/src/pipgrip/_repo_version.py

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

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

@@ -45,6 +45,8 @@ import click
 from anytree import AsciiStyle, ContStyle, Node, RenderTree
 from anytree.exporter import DictExporter
 from packaging.markers import default_environment
+from packaging.requirements import InvalidRequirement
+from pkg_resources import RequirementParseError
 
 from pipgrip import __version__
 from pipgrip.compat import PIP_VERSION
@@ -56,6 +58,7 @@ from pipgrip.pipper import (
     BUILD_FAILURE_STR,
     REPORT_FAILURE_STR,
     install_packages,
+    parse_req,
     read_requirements,
 )
 
@@ -383,6 +386,12 @@ def render_lock(packages, include_dot=True, sort=False):
     count=True,
     help="Control verbosity: -v will print cyclic dependencies (WARNING), -vv will show solving decisions (INFO), -vvv for development (DEBUG).",
 )
+@click.option(
+    "--skip-invalid-input",
+    is_flag=True,
+    help="Skip invalid requirements (e.g. internal repositories, typos) and continue processing other dependencies.",
+)
+@click.version_option(version=__version__, prog_name="pipgrip")
 def main(
     dependencies,
     requirements_file,
@@ -406,6 +415,7 @@ def main(
     threads,
     pre,
     verbose,
+    skip_invalid_input,
 ):
     if verbose == 0:
         logger.setLevel(logging.ERROR)
@@ -476,7 +486,15 @@ def main(
             pre=pre,
         )
         for root_dependency in dependencies:
-            source.root_dep(root_dependency)
+            try:
+                source.root_dep(root_dependency)
+            except (InvalidRequirement, RequirementParseError) as e:
+                if skip_invalid_input:
+                    logger.warning(
+                        "Skipping invalid requirement '%s': %s", root_dependency, str(e)
+                    )
+                else:
+                    raise
 
         solver = VersionSolver(source, threads=threads)
         try:

{pipgrip-0.10.14 → pipgrip-0.11.0}/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.14 → pipgrip-0.11.0}/src/pipgrip/pipper.py

@@ -460,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"

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pipgrip
-Version: 0.10.14
+Version: 0.11.0
 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
 
@@ -157,6 +169,10 @@ Options:
   -v, --verbose                 Control verbosity: -v will print cyclic
                                 dependencies (WARNING), -vv will show solving
                                 decisions (INFO), -vvv for development (DEBUG).
+  --skip-invalid-input          Skip invalid requirements (e.g. internal
+                                repositories, typos) and continue processing
+                                other dependencies.
+  --version                     Show the version and exit.
   -h, --help                    Show this message and exit.
 ```
 

{pipgrip-0.10.14 → pipgrip-0.11.0}/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.14/src/pipgrip/_repo_version.py

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