Merge pull request #89 from nexB/recursive_requirements

TG1999 · web-flow · commit 41545d6e5b83 · 2022-11-04T20:37:32.000+05:30
Add support for recursive requirements #88
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@ Changelog
 =========
 
 
+v0.9.3
+------
+
+- Add support for recursive requirements.
+
+
 v0.9.2
 ------
 
diff --git a/src/python_inspector/dependencies.py b/src/python_inspector/dependencies.py
@@ -15,8 +15,7 @@
 
 from _packagedcode import models
 from _packagedcode.pypi import PipRequirementsFileHandler
-from _packagedcode.pypi import PythonSetupPyHandler
-from python_inspector.resolution import get_requirements_from_distribution
+from _packagedcode.pypi import get_requirements_txt_dependencies
 
 """
 Utilities to resolve dependencies .
@@ -30,14 +29,16 @@ def get_dependencies_from_requirements(requirements_file="requirements.txt"):
     Yield DependentPackage for each requirement in a `requirement`
     file.
     """
-    for package_data in PipRequirementsFileHandler.parse(location=requirements_file):
-        for dependent_package in package_data.dependencies:
-            if TRACE:
-                print(
-                    "dependent_package.extracted_requirement:",
-                    dependent_package.extracted_requirement,
-                )
-            yield dependent_package
+    dependent_packages, _ = get_requirements_txt_dependencies(
+        location=requirements_file, include_nested=True
+    )
+    for dependent_package in dependent_packages:
+        if TRACE:
+            print(
+                "dependent_package.extracted_requirement:",
+                dependent_package.extracted_requirement,
+            )
+        yield dependent_package
 
 
 def get_extra_data_from_requirements(requirements_file="requirements.txt"):
diff --git a/src/python_inspector/resolve_cli.py b/src/python_inspector/resolve_cli.py
@@ -20,7 +20,7 @@
 
 TRACE = False
 
-__version__ = "0.9.2"
+__version__ = "0.9.3"
 
 DEFAULT_PYTHON_VERSION = "38"
 PYPI_SIMPLE_URL = "https://pypi.org/simple"
diff --git a/tests/data/azure-devops.req-310-expected.json b/tests/data/azure-devops.req-310-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/azure-devops.req.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/azure-devops.req-38-expected.json b/tests/data/azure-devops.req-38-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/azure-devops.req.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/default-url-expected.json b/tests/data/default-url-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--specifier zipp==3.8.0",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/environment-marker-test-requirements.txt-expected.json b/tests/data/environment-marker-test-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/environment-marker-test-requirements.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/frozen-requirements.txt-expected.json b/tests/data/frozen-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/frozen-requirements.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/insecure-setup-2/setup.py-expected.json b/tests/data/insecure-setup-2/setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",
diff --git a/tests/data/insecure-setup/setup.py-expected.json b/tests/data/insecure-setup/setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",
diff --git a/tests/data/pdt-requirements.txt-expected.json b/tests/data/pdt-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pdt-requirements.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/pinned-pdt-requirements.txt-expected.json b/tests/data/pinned-pdt-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pinned-pdt-requirements.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/pinned-requirements.txt-expected.json b/tests/data/pinned-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pinned-requirements.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/prefer-source-expected.json b/tests/data/prefer-source-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--specifier zipp==3.8.0",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/recursive_requirements/com.txt b/tests/data/recursive_requirements/com.txt
@@ -0,0 +1 @@
+simplekml==1.3.5
diff --git a/tests/data/recursive_requirements/r.txt b/tests/data/recursive_requirements/r.txt
@@ -0,0 +1,5 @@
+# Only installs requirements for deployments
+PyYAML==6.0
+retrying==1.3.3
+shapely==1.7.1
+-r com.txt
diff --git a/tests/data/setup/no-direct-dependencies-setup.py-expected.json b/tests/data/setup/no-direct-dependencies-setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",
diff --git a/tests/data/setup/simple-setup.py-expected.json b/tests/data/setup/simple-setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",
diff --git a/tests/data/setup/spdx-setup.py-expected.json b/tests/data/setup/spdx-setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",
diff --git a/tests/data/single-url-except-simple-expected.json b/tests/data/single-url-except-simple-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--specifier flask",
       "--index-url https://thirdparty.aboutcode.org/pypi/simple/",
diff --git a/tests/data/single-url-expected.json b/tests/data/single-url-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.2",
+    "tool_version": "0.9.3",
     "options": [
       "--specifier zipp==3.8.0",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/test-api-with-recursive-requirement-file.json b/tests/data/test-api-with-recursive-requirement-file.json
diff --git a/tests/data/tilde_req-expected.json b/tests/data/tilde_req-expected.json
diff --git a/tests/test_api.py b/tests/test_api.py
diff --git a/tests/test_cli.py b/tests/test_cli.py
