fix get_requires_dependencies

Reference: #2983 Signed-off-by: Tushar Goel <[email protected]>
aboutcode-org · Jun 7, 2022 · 19aed1c · 19aed1c
1 parent aba3112
commit 19aed1c
Show file tree

Hide file tree

Showing 19 changed files with 146 additions and 146 deletions.
diff --git a/src/packagedcode/pypi.py b/src/packagedcode/pypi.py
@@ -1149,7 +1149,7 @@ def get_requires_dependencies(requires, default_scope='install'):
                 is_runtime=True,
                 is_optional=False,
                 is_resolved=is_resolved,
-                extracted_requirement=requirement,
+                extracted_requirement=str(req),
         ))
 
     return dependent_packages

diff --git a/tests/packagedcode/data/instance/python-package-instance-expected-with-uuid.json b/tests/packagedcode/data/instance/python-package-instance-expected-with-uuid.json
@@ -2,7 +2,7 @@
   "dependencies": [
     {
       "purl": "pkg:pypi/colorama",
-      "extracted_requirement": null,
+      "extracted_requirement": "colorama; platform_system == \"Windows\"",
       "scope": "install",
       "is_runtime": true,
       "is_optional": false,
@@ -15,7 +15,7 @@
     },
     {
       "purl": "pkg:pypi/importlib-metadata",
-      "extracted_requirement": null,
+      "extracted_requirement": "importlib-metadata; python_version < \"3.8\"",
       "scope": "install",
       "is_runtime": true,
       "is_optional": false,
@@ -177,7 +177,7 @@
           "dependencies": [
             {
               "purl": "pkg:pypi/colorama",
-              "extracted_requirement": null,
+              "extracted_requirement": "colorama; platform_system == \"Windows\"",
               "scope": "install",
               "is_runtime": true,
               "is_optional": false,
@@ -186,7 +186,7 @@
             },
             {
               "purl": "pkg:pypi/importlib-metadata",
-              "extracted_requirement": null,
+              "extracted_requirement": "importlib-metadata; python_version < \"3.8\"",
               "scope": "install",
               "is_runtime": true,
               "is_optional": false,

diff --git a/tests/packagedcode/data/instance/python-package-instance-expected.json b/tests/packagedcode/data/instance/python-package-instance-expected.json
@@ -2,7 +2,7 @@
   "dependencies": [
     {
       "purl": "pkg:pypi/colorama",
-      "extracted_requirement": null,
+      "extracted_requirement": "colorama; platform_system == \"Windows\"",
       "scope": "install",
       "is_runtime": true,
       "is_optional": false,
@@ -15,7 +15,7 @@
     },
     {
       "purl": "pkg:pypi/importlib-metadata",
-      "extracted_requirement": null,
+      "extracted_requirement": "importlib-metadata; python_version < \"3.8\"",
       "scope": "install",
       "is_runtime": true,
       "is_optional": false,
@@ -177,7 +177,7 @@
           "dependencies": [
             {
               "purl": "pkg:pypi/colorama",
-              "extracted_requirement": null,
+              "extracted_requirement": "colorama; platform_system == \"Windows\"",
               "scope": "install",
               "is_runtime": true,
               "is_optional": false,
@@ -186,7 +186,7 @@
             },
             {
               "purl": "pkg:pypi/importlib-metadata",
-              "extracted_requirement": null,
+              "extracted_requirement": "importlib-metadata; python_version < \"3.8\"",
               "scope": "install",
               "is_runtime": true,
               "is_optional": false,

diff --git a/tests/packagedcode/data/pypi/archive/commoncode-21.5.12-py3.9.egg-expected.json b/tests/packagedcode/data/pypi/archive/commoncode-21.5.12-py3.9.egg-expected.json
@@ -69,7 +69,7 @@
     "dependencies": [
       {
         "purl": "pkg:pypi/attrs",
-        "extracted_requirement": "!=20.1.0,>=18.1",
+        "extracted_requirement": "attrs!=20.1.0,>=18.1",
         "scope": "install",
         "is_runtime": true,
         "is_optional": false,
@@ -78,7 +78,7 @@
       },
       {
         "purl": "pkg:pypi/click",
-        "extracted_requirement": ">=6.0.0",
+        "extracted_requirement": "click>=6.0.0",
         "scope": "install",
         "is_runtime": true,
         "is_optional": false,
@@ -87,7 +87,7 @@
       },
       {
         "purl": "pkg:pypi/text-unidecode",
-        "extracted_requirement": ">=1.0",
+        "extracted_requirement": "text_unidecode>=1.0",
         "scope": "install",
         "is_runtime": true,
         "is_optional": false,
@@ -96,7 +96,7 @@
       },
       {
         "purl": "pkg:pypi/beautifulsoup4",
-        "extracted_requirement": "<5.0.0,>=4.0.0",
+        "extracted_requirement": "Beautifulsoup4<5.0.0,>=4.0.0",
         "scope": "install",
         "is_runtime": true,
         "is_optional": false,
@@ -105,7 +105,7 @@
       },
       {
         "purl": "pkg:pypi/requests",
-        "extracted_requirement": "<3.0.0,>=2.7.0",
+        "extracted_requirement": "requests<3.0.0,>=2.7.0",
         "scope": "install",
         "is_runtime": true,
         "is_optional": false,
@@ -114,7 +114,7 @@
       },
       {
         "purl": "pkg:pypi/intbitset",
-        "extracted_requirement": "<3.0,>=2.3.0",
+        "extracted_requirement": "intbitset<3.0,>=2.3.0",
         "scope": "install",
         "is_runtime": true,
         "is_optional": false,
@@ -123,7 +123,7 @@
       },
       {
         "purl": "pkg:pypi/saneyaml",
-        "extracted_requirement": null,
+        "extracted_requirement": "saneyaml",
         "scope": "install",
         "is_runtime": true,
         "is_optional": false,
@@ -132,7 +132,7 @@
       },
       {
         "purl": "pkg:pypi/typing",
-        "extracted_requirement": "<3.7,>=3.6",
+        "extracted_requirement": "typing<3.7,>=3.6; python_version < \"3.7\"",
         "scope": "install",
         "is_runtime": true,
         "is_optional": false,
@@ -141,7 +141,7 @@
       },
       {
         "purl": "pkg:pypi/sphinx",
-        "extracted_requirement": ">=3.3.1",
+        "extracted_requirement": "Sphinx>=3.3.1; extra == \"docs\"",
         "scope": "docs",
         "is_runtime": true,
         "is_optional": false,
@@ -150,7 +150,7 @@
       },
       {
         "purl": "pkg:pypi/sphinx-rtd-theme",
-        "extracted_requirement": ">=0.5.0",
+        "extracted_requirement": "sphinx-rtd-theme>=0.5.0; extra == \"docs\"",
         "scope": "docs",
         "is_runtime": true,
         "is_optional": false,
@@ -159,7 +159,7 @@
       },
       {
         "purl": "pkg:pypi/doc8",
-        "extracted_requirement": ">=0.8.1",
+        "extracted_requirement": "doc8>=0.8.1; extra == \"docs\"",
         "scope": "docs",
         "is_runtime": true,
         "is_optional": false,
@@ -168,7 +168,7 @@
       },
       {
         "purl": "pkg:pypi/pytest",
-        "extracted_requirement": ">=6",
+        "extracted_requirement": "pytest>=6; extra == \"testing\"",
         "scope": "testing",
         "is_runtime": true,
         "is_optional": false,
@@ -177,7 +177,7 @@
       },
       {
         "purl": "pkg:pypi/pytest-xdist",
-        "extracted_requirement": ">=2",
+        "extracted_requirement": "pytest-xdist>=2; extra == \"testing\"",
         "scope": "testing",
         "is_runtime": true,
         "is_optional": false,