Merge pull request #1681 from stonebig/master

stonebig · web-flow · commit 8da9c89badcf · 2025-07-13T16:56:27.000+02:00
make wppm -r .!  work better, and declare  Packaging dependancy
diff --git 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
@@ -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
@@ -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
@@ -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 == ".":

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,6 @@ def _create_env_config(self):`
`120`	`120`	`}`
`121`	`121`	`env_path = self.winpython_directory / "scripts" / "env.ini"`
`122`	`122`	`env_path.parent.mkdir(parents=True, exist_ok=True)`
`123`		`- print("zzz env_path", env_path)`
`124`	`123`	`self._print_action(f"Creating env.ini environment {env_path}")`
`125`	`124`	`env_path.write_text("\n".join(f"{k}={v}" for k, v in config.items()))`
`126`	`125`