Skip to content

Commit 19aed1c

Browse files
TG1999TG1999
committed
fix get_requires_dependencies
Reference: #2983 Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent aba3112 commit 19aed1c

19 files changed

Lines changed: 146 additions & 146 deletions

‎src/packagedcode/pypi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ def get_requires_dependencies(requires, default_scope='install'):
11491149
is_runtime=True,
11501150
is_optional=False,
11511151
is_resolved=is_resolved,
1152-
extracted_requirement=requirement,
1152+
extracted_requirement=str(req),
11531153
))
11541154

11551155
return dependent_packages

‎tests/packagedcode/data/instance/python-package-instance-expected-with-uuid.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"dependencies": [
33
{
44
"purl": "pkg:pypi/colorama",
5-
"extracted_requirement": null,
5+
"extracted_requirement": "colorama; platform_system == \"Windows\"",
66
"scope": "install",
77
"is_runtime": true,
88
"is_optional": false,
@@ -15,7 +15,7 @@
1515
},
1616
{
1717
"purl": "pkg:pypi/importlib-metadata",
18-
"extracted_requirement": null,
18+
"extracted_requirement": "importlib-metadata; python_version < \"3.8\"",
1919
"scope": "install",
2020
"is_runtime": true,
2121
"is_optional": false,
@@ -177,7 +177,7 @@
177177
"dependencies": [
178178
{
179179
"purl": "pkg:pypi/colorama",
180-
"extracted_requirement": null,
180+
"extracted_requirement": "colorama; platform_system == \"Windows\"",
181181
"scope": "install",
182182
"is_runtime": true,
183183
"is_optional": false,
@@ -186,7 +186,7 @@
186186
},
187187
{
188188
"purl": "pkg:pypi/importlib-metadata",
189-
"extracted_requirement": null,
189+
"extracted_requirement": "importlib-metadata; python_version < \"3.8\"",
190190
"scope": "install",
191191
"is_runtime": true,
192192
"is_optional": false,

‎tests/packagedcode/data/instance/python-package-instance-expected.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"dependencies": [
33
{
44
"purl": "pkg:pypi/colorama",
5-
"extracted_requirement": null,
5+
"extracted_requirement": "colorama; platform_system == \"Windows\"",
66
"scope": "install",
77
"is_runtime": true,
88
"is_optional": false,
@@ -15,7 +15,7 @@
1515
},
1616
{
1717
"purl": "pkg:pypi/importlib-metadata",
18-
"extracted_requirement": null,
18+
"extracted_requirement": "importlib-metadata; python_version < \"3.8\"",
1919
"scope": "install",
2020
"is_runtime": true,
2121
"is_optional": false,
@@ -177,7 +177,7 @@
177177
"dependencies": [
178178
{
179179
"purl": "pkg:pypi/colorama",
180-
"extracted_requirement": null,
180+
"extracted_requirement": "colorama; platform_system == \"Windows\"",
181181
"scope": "install",
182182
"is_runtime": true,
183183
"is_optional": false,
@@ -186,7 +186,7 @@
186186
},
187187
{
188188
"purl": "pkg:pypi/importlib-metadata",
189-
"extracted_requirement": null,
189+
"extracted_requirement": "importlib-metadata; python_version < \"3.8\"",
190190
"scope": "install",
191191
"is_runtime": true,
192192
"is_optional": false,

‎tests/packagedcode/data/pypi/archive/commoncode-21.5.12-py3.9.egg-expected.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"dependencies": [
7070
{
7171
"purl": "pkg:pypi/attrs",
72-
"extracted_requirement": "!=20.1.0,>=18.1",
72+
"extracted_requirement": "attrs!=20.1.0,>=18.1",
7373
"scope": "install",
7474
"is_runtime": true,
7575
"is_optional": false,
@@ -78,7 +78,7 @@
7878
},
7979
{
8080
"purl": "pkg:pypi/click",
81-
"extracted_requirement": ">=6.0.0",
81+
"extracted_requirement": "click>=6.0.0",
8282
"scope": "install",
8383
"is_runtime": true,
8484
"is_optional": false,
@@ -87,7 +87,7 @@
8787
},
8888
{
8989
"purl": "pkg:pypi/text-unidecode",
90-
"extracted_requirement": ">=1.0",
90+
"extracted_requirement": "text_unidecode>=1.0",
9191
"scope": "install",
9292
"is_runtime": true,
9393
"is_optional": false,
@@ -96,7 +96,7 @@
9696
},
9797
{
9898
"purl": "pkg:pypi/beautifulsoup4",
99-
"extracted_requirement": "<5.0.0,>=4.0.0",
99+
"extracted_requirement": "Beautifulsoup4<5.0.0,>=4.0.0",
100100
"scope": "install",
101101
"is_runtime": true,
102102
"is_optional": false,
@@ -105,7 +105,7 @@
105105
},
106106
{
107107
"purl": "pkg:pypi/requests",
108-
"extracted_requirement": "<3.0.0,>=2.7.0",
108+
"extracted_requirement": "requests<3.0.0,>=2.7.0",
109109
"scope": "install",
110110
"is_runtime": true,
111111
"is_optional": false,
@@ -114,7 +114,7 @@
114114
},
115115
{
116116
"purl": "pkg:pypi/intbitset",
117-
"extracted_requirement": "<3.0,>=2.3.0",
117+
"extracted_requirement": "intbitset<3.0,>=2.3.0",
118118
"scope": "install",
119119
"is_runtime": true,
120120
"is_optional": false,
@@ -123,7 +123,7 @@
123123
},
124124
{
125125
"purl": "pkg:pypi/saneyaml",
126-
"extracted_requirement": null,
126+
"extracted_requirement": "saneyaml",
127127
"scope": "install",
128128
"is_runtime": true,
129129
"is_optional": false,
@@ -132,7 +132,7 @@
132132
},
133133
{
134134
"purl": "pkg:pypi/typing",
135-
"extracted_requirement": "<3.7,>=3.6",
135+
"extracted_requirement": "typing<3.7,>=3.6; python_version < \"3.7\"",
136136
"scope": "install",
137137
"is_runtime": true,
138138
"is_optional": false,
@@ -141,7 +141,7 @@
141141
},
142142
{
143143
"purl": "pkg:pypi/sphinx",
144-
"extracted_requirement": ">=3.3.1",
144+
"extracted_requirement": "Sphinx>=3.3.1; extra == \"docs\"",
145145
"scope": "docs",
146146
"is_runtime": true,
147147
"is_optional": false,
@@ -150,7 +150,7 @@
150150
},
151151
{
152152
"purl": "pkg:pypi/sphinx-rtd-theme",
153-
"extracted_requirement": ">=0.5.0",
153+
"extracted_requirement": "sphinx-rtd-theme>=0.5.0; extra == \"docs\"",
154154
"scope": "docs",
155155
"is_runtime": true,
156156
"is_optional": false,
@@ -159,7 +159,7 @@
159159
},
160160
{
161161
"purl": "pkg:pypi/doc8",
162-
"extracted_requirement": ">=0.8.1",
162+
"extracted_requirement": "doc8>=0.8.1; extra == \"docs\"",
163163
"scope": "docs",
164164
"is_runtime": true,
165165
"is_optional": false,
@@ -168,7 +168,7 @@
168168
},
169169
{
170170
"purl": "pkg:pypi/pytest",
171-
"extracted_requirement": ">=6",
171+
"extracted_requirement": "pytest>=6; extra == \"testing\"",
172172
"scope": "testing",
173173
"is_runtime": true,
174174
"is_optional": false,
@@ -177,7 +177,7 @@
177177
},
178178
{
179179
"purl": "pkg:pypi/pytest-xdist",
180-
"extracted_requirement": ">=2",
180+
"extracted_requirement": "pytest-xdist>=2; extra == \"testing\"",
181181
"scope": "testing",
182182
"is_runtime": true,
183183
"is_optional": false,

0 commit comments

Comments
 (0)