Skip to content

Commit 3e59fe5

Browse files
committed
Fix tests
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 37375d2 commit 3e59fe5

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

src/python_inspector/resolution.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,14 @@ def remove_extras(identifier: str) -> str:
248248

249249

250250
class PythonInputProvider(AbstractProvider):
251-
def __init__(self, environment=None, repos=tuple(), insecure=False):
251+
def __init__(self, environment=None, repos=tuple(), analyze_setup_py_insecurely=False):
252252
self.environment = environment
253253
self.environment_marker = get_environment_marker_from_environment(environment)
254254
self.repos = repos or []
255255
self.versions_by_package = {}
256256
self.dependencies_by_purl = {}
257257
self.wheel_or_sdist_by_package = {}
258-
self.insecure = insecure
258+
self.analyze_setup_py_insecurely = analyze_setup_py_insecurely
259259

260260
def identify(self, requirement_or_candidate: Union[Candidate, Requirement]) -> str:
261261
"""Given a requirement, return an identifier for it. Overridden."""
@@ -378,7 +378,10 @@ def get_requirements_for_package_from_pypi_simple(
378378
)
379379
if not sdist_location:
380380
return
381-
yield from get_setup_dependencies(location=sdist_location, insecure=self.insecure)
381+
yield from get_setup_dependencies(
382+
location=sdist_location,
383+
analyze_setup_py_insecurely=self.analyze_setup_py_insecurely,
384+
)
382385

383386
def get_requirements_for_package_from_pypi_json_api(
384387
self, purl: PackageURL
@@ -678,7 +681,7 @@ def get_package_list(results):
678681
return list(sorted(packages))
679682

680683

681-
def get_setup_dependencies(location, insecure=False, use_requirements=True):
684+
def get_setup_dependencies(location, analyze_setup_py_insecurely=False, use_requirements=True):
682685
"""
683686
Yield dependencies from the given setup.py and setup.cfg location.
684687
"""
@@ -736,7 +739,7 @@ def get_setup_dependencies(location, insecure=False, use_requirements=True):
736739
if not has_deps and contain_string(
737740
string="_require", files=[setup_py_location, setup_cfg_location]
738741
):
739-
if insecure:
742+
if analyze_setup_py_insecurely:
740743
yield from parse_setup_py_insecurely(setup_py=setup_py_location)
741744
else:
742745
raise Exception("Unable to collect setup.py dependencies securely")
@@ -750,7 +753,7 @@ def get_resolved_dependencies(
750753
max_rounds: int = 200000,
751754
verbose: bool = False,
752755
pdt_output: bool = False,
753-
insecure: bool = False,
756+
analyze_setup_py_insecurely: bool = False,
754757
):
755758
"""
756759
Return resolved dependencies of a ``requirements`` list of Requirement for
@@ -762,7 +765,11 @@ def get_resolved_dependencies(
762765
"""
763766
try:
764767
resolver = Resolver(
765-
provider=PythonInputProvider(environment=environment, repos=repos, insecure=insecure),
768+
provider=PythonInputProvider(
769+
environment=environment,
770+
repos=repos,
771+
analyze_setup_py_insecurely=analyze_setup_py_insecurely,
772+
),
766773
reporter=BaseReporter(),
767774
)
768775
resolver_results = resolver.resolve(requirements=requirements, max_rounds=max_rounds)

src/python_inspector/resolve_cli.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def resolve_dependencies(
193193
max_rounds,
194194
use_cached_index=False,
195195
use_pypi_json_api=False,
196-
insecure=False,
196+
analyze_setup_py_insecurely=False,
197197
verbose=TRACE,
198198
):
199199
"""
@@ -337,7 +337,7 @@ def resolve_dependencies(
337337
max_rounds=max_rounds,
338338
verbose=verbose,
339339
pdt_output=pdt_output,
340-
insecure=insecure,
340+
analyze_setup_py_insecurely=analyze_setup_py_insecurely,
341341
)
342342

343343
cli_options = [f"--requirement {rf}" for rf in requirement_files]
@@ -401,7 +401,7 @@ def resolve(
401401
max_rounds=200000,
402402
verbose=False,
403403
pdt_output=False,
404-
insecure=False,
404+
analyze_setup_py_insecurely=False,
405405
):
406406
"""
407407
Resolve dependencies given a ``direct_dependencies`` list of
@@ -427,7 +427,7 @@ def resolve(
427427
max_rounds=max_rounds,
428428
verbose=verbose,
429429
pdt_output=pdt_output,
430-
insecure=insecure,
430+
analyze_setup_py_insecurely=analyze_setup_py_insecurely,
431431
)
432432

433433
initial_requirements = [d.to_dict() for d in direct_dependencies]

0 commit comments

Comments
 (0)