Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions winpython/piptree.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,12 +273,12 @@ def _get_dependency_tree(self, package_name: str, extra: str = "", version_req:
if dependency["req_key"] in self.distro and dependency["req_key"]+"["+up_req+"]" not in path:
# upward dependancy taken if:
# - if extra "" demanded, and no marker from upward package: like pandas[] ==> numpy
# - if an extra "array" is demanded, and indeed in the req_extra list: array,dataframe,diagnostics,distributer
# - or the extra is in the upward package, like pandas[test] ==> pytest, for 'test' extra
# - or an extra "array" is demanded, and indeed in the req_extra list: array,dataframe,diagnostics,distributer
if (not dependency.get("req_marker") and extra ==""
) or (extra !="" and extra==up_req and dependency["req_key"]!=package_key
) or (extra !="" and "req_marker" in dependency and extra+',' in dependency["req_extra"]+','
) or ("req_marker" in dependency and extra+',' in dependency["req_extra"]+',' and Marker(dependency["req_marker"]).evaluate(environment=environment)):
) or ("req_marker" in dependency and extra==up_req and dependency["req_key"]!=package_key and Marker(dependency["req_marker"]).evaluate(environment=environment)
) or ("req_marker" in dependency and extra!="" and extra+',' in dependency["req_extra"]+',' and Marker(dependency["req_marker"]).evaluate(environment=environment|{"extra": up_req})
):
ret += self._get_dependency_tree(
dependency["req_key"],
up_req, # dask[array] going upwards continues as dask[dataframe]
Expand Down