Skip to content

Commit 93444f6

Browse files
committed
Address review comments
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent a026a26 commit 93444f6

11 files changed

+19
-19
lines changed

src/python_inspector/resolve_cli.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ def resolve_dependencies(
322322
click.secho(f" {repo}")
323323

324324
# resolve dependencies proper
325-
requirements, resolved_dependencies, packages = resolve(
325+
requirements, resolved_dependencies, purls = resolve(
326326
direct_dependencies=direct_dependencies,
327327
environment=environment,
328328
repos=repos,
@@ -355,10 +355,10 @@ def resolve_dependencies(
355355
errors=[],
356356
)
357357

358-
metadata = []
358+
packages = []
359359

360-
for package in packages:
361-
metadata.extend(
360+
for package in purls:
361+
packages.extend(
362362
list(get_pypi_data_from_purl(package, repos=repos, environment=environment)),
363363
)
364364

@@ -368,7 +368,7 @@ def resolve_dependencies(
368368
requirements=requirements,
369369
resolved_dependencies=resolved_dependencies,
370370
json_output=json_output,
371-
metadata=metadata,
371+
packages=packages,
372372
)
373373

374374
else:
@@ -377,7 +377,7 @@ def resolve_dependencies(
377377
requirements=requirements,
378378
resolved_dependencies=resolved_dependencies,
379379
json_output=pdt_output,
380-
metadata=metadata,
380+
packages=packages,
381381
pdt_output=True,
382382
)
383383

@@ -443,7 +443,7 @@ def get_requirements_from_direct_dependencies(
443443

444444

445445
def write_output(
446-
headers, requirements, resolved_dependencies, json_output, metadata, pdt_output=False
446+
headers, requirements, resolved_dependencies, json_output, packages, pdt_output=False
447447
):
448448
"""
449449
Write headers, requirements and resolved_dependencies as JSON to ``json_output``.
@@ -455,12 +455,12 @@ def write_output(
455455
headers=headers,
456456
requirements=requirements,
457457
resolved_dependencies=resolved_dependencies,
458-
metadata=metadata,
458+
packages=packages,
459459
)
460460
else:
461461
output = dict(
462462
resolved_dependencies=resolved_dependencies,
463-
metadata=metadata,
463+
packages=packages,
464464
)
465465

466466
json.dump(output, json_output, indent=2)

tests/data/default-url-expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
"dependencies": []
3333
}
3434
],
35-
"metadata": []
35+
"packages": []
3636
}

tests/data/environment-marker-test-requirements.txt-expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
]
4040
}
4141
],
42-
"metadata": [
42+
"packages": [
4343
{
4444
"type": "pypi",
4545
"namespace": null,

tests/data/frozen-requirements.txt-expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@
722722
]
723723
}
724724
],
725-
"metadata": [
725+
"packages": [
726726
{
727727
"type": "pypi",
728728
"namespace": null,

tests/data/pdt-requirements.txt-expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
]
4040
}
4141
],
42-
"metadata": [
42+
"packages": [
4343
{
4444
"type": "pypi",
4545
"namespace": null,

tests/data/pinned-pdt-requirements.txt-expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
"dependencies": []
274274
}
275275
],
276-
"metadata": [
276+
"packages": [
277277
{
278278
"type": "pypi",
279279
"namespace": null,

tests/data/pinned-requirements.txt-expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@
805805
"dependencies": []
806806
}
807807
],
808-
"metadata": [
808+
"packages": [
809809
{
810810
"type": "pypi",
811811
"namespace": null,

tests/data/setup/simple-setup.py-expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
]
3838
}
3939
],
40-
"metadata": [
40+
"packages": [
4141
{
4242
"type": "pypi",
4343
"namespace": null,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"dependencies": []
7474
}
7575
],
76-
"metadata": [
76+
"packages": [
7777
{
7878
"type": "pypi",
7979
"namespace": null,

tests/data/single-url-expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"dependencies": []
3333
}
3434
],
35-
"metadata": [
35+
"packages": [
3636
{
3737
"type": "pypi",
3838
"namespace": null,

0 commit comments

Comments
 (0)