Merge pull request #2049 from stonebig/master

stonebig · web-flow · commit cef9ca3f1441 · 2026-06-21T11:27:48.000+02:00
display missing dependancies
diff --git a/wppm/__init__.py b/wppm/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '17.5.20260525'
+__version__ = '17.6.20260621'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/wppm/piptree.py b/wppm/piptree.py
@@ -166,6 +166,7 @@ def _get_dependency_tree(self, package_name: str, extra: str = "", version_req:
         extras = extra.split(",")
         pkg_key = self.normalize(package_name)
         ret_all = []
+        wall_hit = ""
 
         full_name = f"{package_name}[{extra}]" if extra else package_name
         if full_name in path:
@@ -200,8 +201,9 @@ def _get_dependency_tree(self, package_name: str, extra: str = "", version_req:
                                     extra + ',' in dependency["req_extra"] + ',' and \
                                     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
+                                    #tag upward limiting dependancies
                                     wall = " " if dependency["req_version"][:1] == "~" or dependency["req_version"].startswith("==") or "<" in dependency["req_version"] else ""
+                                    wall_hit += wall
                                     if ppend=="" or wall==" ":
                                         ret += self._get_dependency_tree(
                                             dependency["req_key"],
@@ -215,31 +217,44 @@ def _get_dependency_tree(self, package_name: str, extra: str = "", version_req:
                                             upward=upward,
                                         )
                         elif not dependency.get("req_marker") or Marker(dependency["req_marker"]).evaluate(environment=environment):
-                            ret += self._get_dependency_tree(
-                                dependency["req_key"],
-                                dependency["req_extra"],
-                                dependency["req_version"],
-                                depth,
-                                next_path,
-                                verbose=verbose,
-                                upward=upward,
-                            )
+                            #tag downward missing dependancies
+                            wall = ""
+                            if ppend=="" or wall==" ":
+                                ret += self._get_dependency_tree(
+                                    dependency["req_key"],
+                                    dependency["req_extra"],
+                                    dependency["req_version"],
+                                    depth,
+                                    next_path,
+                                    verbose=verbose,
+                                    upward=upward,
+                                )
+                    elif not upward and (not dependency.get("req_marker") or Marker(dependency["req_marker"]).evaluate(environment=environment)):
+                        # not there but was required
+                        wall_hit += " "
+                        ret += [[f'{dependency["req_key"]}==? {dependency["req_version"]}']]
 
                 ret_all.append(ret)
-        return ret_all
+        if ppend=="" or wall_hit != "":
+            return ret_all
+        else:
+            return [""]
 
-    def down(self, pp: str = "", extra: str = "", depth: int = 20, indent: int = 4, version_req: str = "", verbose: bool = False) -> str:
+    def down(self, ppw: str = "", extra: str = "", depth: int = 20, indent: int = 4, version_req: str = "", verbose: bool = False) -> str:
         """Generate downward dependency tree as formatted string."""
+        pp = ppw[:-1] if ppw.endswith('!') else ppw
+        ppend = "!" if ppw.endswith('!') else "" #show only downward missing dependancies
         ppp = [pp] if pp in self.distro else ()
         if pp == ".":
            ppp = [p for p in self.distro]
         results = []
         for p in sorted(ppp):
             if extra == ".":
                 for one_extra in sorted(self.distro[p]["provides"]):
-                    results +=  self._get_dependency_tree(p, one_extra, version_req, depth, verbose=verbose)
+                    a =  self._get_dependency_tree(p, one_extra, version_req, depth, verbose=verbose, ppend=ppend)
             else:
-                results += self._get_dependency_tree(p, extra, version_req, depth, verbose=verbose)
+                a = self._get_dependency_tree(p, extra, version_req, depth, verbose=verbose, ppend=ppend)
+            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('"', "")
diff --git a/wppm/wppm.py b/wppm/wppm.py
@@ -270,12 +270,12 @@ def main(test=False):
     parser.add_argument("--unregister", dest="unregisterWinPython", action="store_true", help=unregisterWinPythonHelp)
     parser.add_argument("--fix", action="store_true", help="make WinPython fix")
     parser.add_argument("--movable", action="store_true", help="make WinPython movable")
-    parser.add_argument("-ws", dest="wheelsource", default=None, type=str, help="wheels location, '.' = WheelHouse): wppm pylock.toml -ws source_of_wheels, wppm -ls -ws .")
+    parser.add_argument("-ws", dest="wheelsource", default=None, type=str, help="wheels location, ('.' = WheelHouse): wppm pylock.toml -ws source_of_wheels, wppm -ls -ws .")
     parser.add_argument("-wd", dest="wheeldrain" , default=None, type=str, help="wheels destination: wppm pylock.toml -wd destination_of_wheels")
     parser.add_argument("-ls", "--list", action="store_true", help="list installed packages matching [optional] expression: wppm -ls, wppm -ls pand")
     parser.add_argument("-lsa", dest="all", action="store_true",help=f"list details of packages matching [optional]  expression: wppm -lsa pandas -l1")
     parser.add_argument("-md", dest="markdown", action="store_true",help=f"markdown summary of the installation")
-    parser.add_argument("-p",dest="pipdown",action="store_true",help="show Package dependencies of the given package[option], [.]=all: wppm -p pandas[.]")
+    parser.add_argument("-p",dest="pipdown",action="store_true",help="show Package (!= missing) dependencies of the given package[option], [.]=all: wppm -p pandas[.]")
     parser.add_argument("-r", dest="pipup", action="store_true", help=f"show Reverse (!= constraining) dependancies of the given package[option]: wppm -r pytest![test]")
     parser.add_argument("-l", dest="levels", type=int, default=-1, help="show 'LEVELS' levels of dependencies (with -p, -r): wppm -p pandas -l1")
     parser.add_argument("-t", dest="target", default=sys.prefix, help=f'path to target Python distribution (default: "{sys.prefix}")')
