From d80b9bf3e132534e4f26ab6c09c2dfd3764edffc Mon Sep 17 00:00:00 2001 From: stonebig Date: Sun, 13 Jul 2025 16:56:02 +0200 Subject: [PATCH] make wppm -r .! work better, and declare Packaging dependancy --- make.py | 1 - pyproject.toml | 4 +++- wppm/__init__.py | 2 +- wppm/piptree.py | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/make.py b/make.py index 9cd53815..1bf22502 100644 --- a/make.py +++ b/make.py @@ -120,7 +120,6 @@ def _create_env_config(self): } env_path = self.winpython_directory / "scripts" / "env.ini" env_path.parent.mkdir(parents=True, exist_ok=True) - print("zzz env_path", env_path) self._print_action(f"Creating env.ini environment {env_path}") env_path.write_text("\n".join(f"{k}={v}" for k, v in config.items())) diff --git a/pyproject.toml b/pyproject.toml index 4460ae5a..cfae051f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,9 @@ authors = [ {name = "Pierre Raybaut"}, {name = "stonebig"}, ] -dependencies = [] +dependencies = [ + "packaging", +] requires-python = ">=3.10" readme = "README.rst" license = {file = "LICENSE"} diff --git a/wppm/__init__.py b/wppm/__init__.py index 186dabb5..3ed7567b 100644 --- a/wppm/__init__.py +++ b/wppm/__init__.py @@ -28,6 +28,6 @@ OTHER DEALINGS IN THE SOFTWARE. """ -__version__ = '17.1.20250712b1' +__version__ = '17.1.20250714b1' __license__ = __doc__ __project_url__ = 'http://winpython.github.io/' diff --git a/wppm/piptree.py b/wppm/piptree.py index 11700945..1dfd8560 100644 --- a/wppm/piptree.py +++ b/wppm/piptree.py @@ -198,7 +198,7 @@ def _get_dependency_tree(self, package_name: str, extra: str = "", version_req: Marker(dependency["req_marker"]).evaluate(environment=environment | {"extra": up_req})): # IA risk error: # dask[array] go upwards as dask[dataframe], so {"extra": up_req} , not {"extra": extra} #tag downward limiting dependancies - wall = " " if dependency["req_version"][:1] in("<", "~") or dependency["req_version"].startswith("==") else "" + wall = " " if dependency["req_version"][:1] = "~" or dependency["req_version"].startswith("==") or "<" in dependency["req_version"] else "" ret += self._get_dependency_tree( dependency["req_key"], up_req, @@ -249,7 +249,7 @@ def up(self, ppw: str, extra: str = "", depth: int = 20, indent: int = 5, versio pp = ppw[:-1] if ppw.endswith('!') else ppw ppend = "!" if ppw.endswith('!') else "" #show only downward limiting dependancies if pp == ".": - results = [aa:=self.up(p + ppend, extra, depth, indent, version_req, verbose) if '[requires :' in aa else None for p in sorted(self.distro)] + results = [aa for p in sorted(self.distro) if '[requires' in (aa:=self.up(p + ppend, extra, depth, indent, version_req, verbose))] return '\n'.join(filter(None, results)) if extra == ".":