Skip to content

fix wppm -p pkg[.] showing only the last extra, and make -p -l0 a true one-liner #2059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Jul 16, 2026
+5 −4
Merged

fix wppm -p pkg[.] showing only the last extra, and make -p -l0 a true one-liner #2059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion wppm/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
OTHER DEALINGS IN THE SOFTWARE.
"""

__version__ = '17.7.20260715'
__version__ = '17.7.20260716'
__license__ = __doc__
__project_url__ = 'http://winpython.github.io/'
5 changes: 3 additions & 2 deletions wppm/piptree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def _get_dependency_tree(self, package_name: str, extra: str = "", version_req:
verbose=verbose,
upward=upward,
)
elif not upward and (not dependency.get("req_marker") or self._marker_true(dependency["req_marker"], extra)):
elif not upward and len(path) < depth and (not dependency.get("req_marker") or self._marker_true(dependency["req_marker"], extra)):
# not there but was required
wall_hit += " "
ret += [[f'{dependency["req_key"]}==? {dependency["req_version"]}']]
Expand All @@ -269,9 +269,10 @@ def down(self, ppw: str = "", extra: str = "", depth: int = 20, indent: int = 4,
if extra == ".":
for one_extra in sorted(self.distro[p]["provides"]):
a = self._get_dependency_tree(p, one_extra, version_req, depth, verbose=verbose, ppend=ppend)
results += a if (len(a[0])>1 or ppend=="") else []
else:
a = self._get_dependency_tree(p, extra, version_req, depth, verbose=verbose, ppend=ppend)
results += a if (len(a[0])>1 or ppend=="") else []
results += a if (len(a[0])>1 or ppend=="") else []
rawtext = json.dumps(results, indent=indent)
lines = [l[2*indent:] for l in rawtext.split("\n") if len(l.strip()) > 2]
return "\n".join(lines).replace('"', "")
Expand Down
2 changes: 1 addition & 1 deletion wppm/wppm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ def main(test=False):
pip = piptree.PipData(targetpython, args.wheelsource)
for args_fname in args.fname:
pack, extra, *other = (args_fname + "[").replace("]", "[").split("[")
print(pip.down(pack, extra, args.levels if args.levels>0 else 2, verbose=args.verbose))
print(pip.down(pack, extra, args.levels if args.levels>=0 else 2, verbose=args.verbose))
sys.exit()
elif args.pipup:
pip = piptree.PipData(targetpython, args.wheelsource)
Expand Down