wheelhouse in changelogs

stonebig · stonebig · commit 99709de4edd0 · 2025-05-28T23:49:33.000+02:00
diff --git a/diff.py b/diff.py
@@ -31,7 +31,7 @@ def __str__(self):
     def from_text(self, text):
         match = re.match(self.PATTERN_OLD, text) or re.match(self.PATTERN, text)
         if not match:
-            raise ValueError("Text does not match expected pattern")
+            raise ValueError("Text does not match expected pattern: "+ text)
         self.name, self.url, self.version, self.description = match.groups()
 
     def to_wiki(self):
@@ -45,6 +45,7 @@ class PackageIndex:
     WINPYTHON_PATTERN = r"\#\# WinPython\-*[0-9b-t]* ([0-9\.a-zA-Z]*)"
     TOOLS_LINE = "### Tools"
     PYTHON_PACKAGES_LINE = "### Python packages"
+    WHEELHOUSE_PACKAGES_LINE = "### WheelHouse packages"
     HEADER_LINE1 = "Name | Version | Description"
     HEADER_LINE2 = "-----|---------|------------"
 
@@ -55,6 +56,7 @@ def __init__(self, version, basedir=None, flavor="", architecture=64):
         self.architecture = architecture
         self.other_packages = {}
         self.python_packages = {}
+        self.wheelhouse_packages = {}
         self.from_file(basedir)
 
     def from_file(self, basedir):
@@ -67,24 +69,29 @@ def from_file(self, basedir):
     def from_text(self, text):
         version = re.match(self.WINPYTHON_PATTERN + self.flavor, text).groups()[0]
         assert version == self.version
-        tools_flag = python_flag = False
+        tools_flag = python_flag = wheelhouse_flag = False
         for line in text.splitlines():
             if line:
                 if line == self.TOOLS_LINE:
-                    tools_flag, python_flag = True, False
+                    tools_flag, python_flag, wheelhouse_flag = True, False, False
                     continue
                 elif line == self.PYTHON_PACKAGES_LINE:
-                    tools_flag, python_flag = False, True
+                    tools_flag, python_flag, wheelhouse_flag  = False, True, False
+                    continue
+                elif line == self.WHEELHOUSE_PACKAGES_LINE:
+                    tools_flag, python_flag, wheelhouse_flag  = False, False, True
                     continue
                 elif line in (self.HEADER_LINE1, self.HEADER_LINE2, "<details>", "</details>"):
                     continue
-                if tools_flag or python_flag:
+                if tools_flag or python_flag or wheelhouse_flag:
                     package = Package()
                     package.from_text(line)
                     if tools_flag:
                         self.other_packages[package.name] = package
-                    else:
+                    elif python_flag:
                         self.python_packages[package.name] = package
+                    else:
+                        self.wheelhouse_packages[package.name] = package
 
 def diff_package_dicts(old_packages, new_packages):
     """Return difference between package old and package new"""
@@ -141,6 +148,10 @@ def compare_package_indexes(version2, version1=None, basedir=None, flavor="", fl
     if py_text:
         text += PackageIndex.PYTHON_PACKAGES_LINE + "\r\n\r\n" + py_text
 
+    py_text = diff_package_dicts(pi1.wheelhouse_packages, pi2.wheelhouse_packages)
+    if py_text:
+        text += PackageIndex.WHEELHOUSE_PACKAGES_LINE + "\r\n\r\n" + py_text
+
     text += "\r\n</details>\r\n* * *\r\n"
     return text
 
diff --git a/make.py b/make.py
@@ -120,6 +120,12 @@ def package_index_markdown(self) -> str:
 -----|---------|------------
 {self.distribution.get_installed_packages_markdown()}
 
+### WheelHouse packages
+
+Name | Version | Description
+-----|---------|------------
+{self.distribution.get_wheelhouse_packages_markdown()}
+
 </details>
 """
 
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -76,6 +76,17 @@ def get_installed_packages_markdown(self) -> str:
         ]
         return "\n".join(package_lines)
 
+    def get_wheelhouse_packages_markdown(self) -> str:
+        wheeldir = self.wheelhouse / 'included.wheels'
+        if wheeldir.is_dir():
+            package_lines = [
+               f"[{name}](https://pypi.org/project/{name}) | {version} | {summary}"
+               for name, version, summary in wh.list_packages_with_metadata(str(wheeldir))
+               #for pkg in sorted(wh.list_packages_with_metadata(str(wheeldir)), key=lambda p: p.name.lower())
+            ]
+            return "\n".join(package_lines)
+        return ""
+
     def find_package(self, name: str) -> Package | None:
         """Find installed package by name."""
         for pack in self.get_installed_packages():
