Drop support for resolved_requirements

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

src/python_inspector/resolution.py

@@ -52,26 +52,15 @@ def get_response(url):
     return None
 
 
-def get_requirements_from_distribution(handler, location, resolved_requirements):
+def get_requirements_from_distribution(handler, location):
     """
     Return a list of requirements from a distribution.
     """
     if not os.path.exists(location):
         return []
     deps = list(handler.parse(location))
     assert len(deps) == 1
-    return list(
-        get_requirements_from_dependencies(
-            deps[0].dependencies, resolved_requirements=resolved_requirements
-        )
-    )
-
-
-def is_dep_resolved_and_in_resolved_requirements(dep, dep_purl_name, resolved_requirements):
-    """
-    Return True if the given ``dep`` is resolved and is in the given ``resolved_requirements``.
-    """
-    return dep.is_resolved and dep_purl_name in resolved_requirements
+    return list(get_requirements_from_dependencies(deps[0].dependencies))
 
 
 def is_requirements_file_in_setup_files(setup_files):
@@ -150,7 +139,7 @@ def fetch_and_extract_sdist(repos, candidate, python_version):
     return os.path.join(utils_pypi.CACHE_THIRDPARTY_DIR, "extracted_sdists", sdist_file, sdist_file)
 
 
-def get_requirements_from_dependencies(dependencies, resolved_requirements):
+def get_requirements_from_dependencies(dependencies):
     """
     Generate parsed requirements for the given ``dependencies``.
     """
@@ -161,20 +150,6 @@ def get_requirements_from_dependencies(dependencies, resolved_requirements):
         if dep.scope != "install":
             continue
 
-        dep_purl = PackageURL.from_string(dep.purl)
-
-        dep_purl_name = packaging.utils.canonicalize_name(dep_purl.name)
-
-        if is_dep_resolved_and_in_resolved_requirements(
-            dep=dep, dep_purl_name=dep_purl_name, resolved_requirements=resolved_requirements
-        ):
-            yield packaging.requirements.Requirement(
-                f"{str(dep_purl_name)}{str(resolved_requirements[str(dep_purl_name)])}"
-            )
-            continue
-
-        if dep.is_resolved:
-            resolved_requirements[dep_purl_name] = f"=={dep_purl.version}"
         # skip the requirement starting with -- like
         # --editable, --requirement
         if not dep.extracted_requirement.startswith("-"):
@@ -191,13 +166,12 @@ def remove_extras(identifier):
 
 
 class PythonInputProvider(AbstractProvider):
-    def __init__(self, environment=None, repos=tuple(), resolved_requirements=tuple()):
+    def __init__(self, environment=None, repos=tuple()):
         self.environment = environment
         self.repos = repos or []
         self.versions_by_package = {}
         self.dependencies_by_purl = {}
         self.wheel_or_sdist_by_package = {}
-        self.resolved_requirements = resolved_requirements
 
     def identify(self, requirement_or_candidate):
         """Given a requirement, return an identifier for it. Overridden."""
@@ -297,7 +271,6 @@ def get_requirements_for_package_from_pypi_simple(self, candidate):
             deps = get_requirements_from_distribution(
                 handler=PypiWheelHandler,
                 location=wheel_location,
-                resolved_requirements=self.resolved_requirements,
             )
             if deps:
                 has_wheels = True
@@ -329,7 +302,6 @@ def get_requirements_for_package_from_pypi_simple(self, candidate):
                     deps = get_requirements_from_distribution(
                         handler=handler,
                         location=location,
-                        resolved_requirements=self.resolved_requirements,
                     )
                     if deps:
                         deps_in_setup = True
@@ -345,7 +317,6 @@ def get_requirements_for_package_from_pypi_simple(self, candidate):
                     deps = get_requirements_from_distribution(
                         hanlder=PipRequirementsFileHandler,
                         location=requirement_location,
-                        resolved_requirements=self.resolved_requirements,
                     )
                     if deps:
                         yield from deps
@@ -577,15 +548,8 @@ def get_resolved_dependencies(
     Used the provided ``repos`` list of PypiSimpleRepository.
     If empty, use instead the PyPI.org JSON API exclusively instead
     """
-    resolved_requirements = {
-        packaging.utils.canonicalize_name(r.name): r.specifier
-        for r in requirements
-        if getattr(r, "is_requirement_resolved", False)
-    }
     resolver = Resolver(
-        provider=PythonInputProvider(
-            environment=environment, repos=repos, resolved_requirements=resolved_requirements
-        ),
+        provider=PythonInputProvider(environment=environment, repos=repos),
         reporter=BaseReporter(),
     )
     results = resolver.resolve(requirements=requirements, max_rounds=max_rounds)

src/python_inspector/resolve_cli.py

@@ -285,7 +285,6 @@ def resolve(direct_dependencies, environment, repos=tuple(), as_tree=False, max_
         if dependency.extra_data.get("is_editable"):
             continue
         requirement = Requirement(requirement_string=dependency.extracted_requirement)
-        requirement.is_requirement_resolved = dependency.is_resolved
         requirements.append(requirement)
 
     resolved_dependencies = get_resolved_dependencies(

tests/data/single-url-except-simple-expected.json

@@ -43,7 +43,7 @@
         "pkg:pypi/importlib-metadata@4.12.0",
         "pkg:pypi/itsdangerous@2.1.2",
         "pkg:pypi/jinja2@3.1.2",
-        "pkg:pypi/werkzeug@2.2.0"
+        "pkg:pypi/werkzeug@2.2.1"
       ],
       "wheel_urls": [
         "https://files.pythonhosted.org/packages/af/6a/00d144ac1626fbb44c4ff36519712e258128985a5d0ae43344778ae5cbb9/Flask-2.1.3-py3-none-any.whl"
@@ -87,14 +87,14 @@
       "sdist_url": "https://files.pythonhosted.org/packages/1d/97/2288fe498044284f39ab8950703e88abbac2abbdf65524d576157af70556/MarkupSafe-2.1.1.tar.gz"
     },
     {
-      "package": "pkg:pypi/werkzeug@2.2.0",
+      "package": "pkg:pypi/werkzeug@2.2.1",
       "dependencies": [
         "pkg:pypi/markupsafe@2.1.1"
       ],
       "wheel_urls": [
-        "https://files.pythonhosted.org/packages/d3/63/0e4cb01bc4fe5c62ce63587c9471645afdb8a1a3dc2fa1fe2b6a3fbb78f5/Werkzeug-2.2.0-py3-none-any.whl"
+        "https://files.pythonhosted.org/packages/c0/93/d6d60870e47162ea6a1bbdd787649eea776b2a70618dd66ed87cb2238543/Werkzeug-2.2.1-py3-none-any.whl"
       ],
-      "sdist_url": "https://files.pythonhosted.org/packages/dc/db/598e5986e8cc1eeb14ecff2c1590dc59f95153cdb757196b0980b3ad0763/Werkzeug-2.2.0.tar.gz"
+      "sdist_url": "https://files.pythonhosted.org/packages/32/19/a92cdbd9fb795928dfca1031278ae8a7f051e78a2c057c224ad2d4cdd95e/Werkzeug-2.2.1.tar.gz"
     },
     {
       "package": "pkg:pypi/zipp@3.8.1",

tests/test_resolution.py

@@ -38,7 +38,7 @@ def test_get_resolved_dependencies_with_flask_and_python_310():
         "pkg:pypi/itsdangerous@2.1.2",
         "pkg:pypi/jinja2@3.1.2",
         "pkg:pypi/markupsafe@2.1.1",
-        "pkg:pypi/werkzeug@2.2.0",
+        "pkg:pypi/werkzeug@2.2.1",
     ]
 
 
@@ -63,7 +63,7 @@ def test_get_resolved_dependencies_with_flask_and_python_310_windows():
         "pkg:pypi/itsdangerous@2.1.2",
         "pkg:pypi/jinja2@3.1.2",
         "pkg:pypi/markupsafe@2.1.1",
-        "pkg:pypi/werkzeug@2.2.0",
+        "pkg:pypi/werkzeug@2.2.1",
     ]
 
 
@@ -116,7 +116,7 @@ def test_get_resolved_dependencies_with_tilde_requirement_using_json_api():
         "pkg:pypi/itsdangerous@2.1.2",
         "pkg:pypi/jinja2@3.1.2",
         "pkg:pypi/markupsafe@2.1.1",
-        "pkg:pypi/werkzeug@2.2.0",
+        "pkg:pypi/werkzeug@2.2.1",
         "pkg:pypi/zipp@3.8.1",
     ]