simplify tools.ini tricky plumbery for just 4 tools

stonebig · stonebig · commit caa4020bec21 · 2025-04-17T14:03:23.000+02:00
diff --git a/make.py b/make.py
@@ -130,26 +130,22 @@ def package_index_markdown(self) -> str:
 
     def _get_installed_tools_markdown(self) -> str:
         """Generates Markdown for installed tools section in package index."""
-        installed_tools = []
-
-        def get_tool_path(relative_path):
-            path = self.winpython_directory / relative_path if self.winpython_directory else None
-            return path if path and path.exists() else None
+        tool_lines = []
 
-        if nodejs_path := get_tool_path(NODEJS_RELATIVE_PATH):
-            installed_tools.append(("Nodejs", utils.get_nodejs_version(nodejs_path)))
-            installed_tools.append(("npmjs", utils.get_npmjs_version(nodejs_path)))
+        if (nodejs_path := self.winpython_directory / NODEJS_RELATIVE_PATH).exists():
+            version = utils.get_nodejs_version(nodejs_path)
+            tool_lines.append(f"[Nodejs](https://nodejs.org) | {version} | a JavaScript runtime built on Chrome's V8 JavaScript engine")
+            version = utils.get_npmjs_version(nodejs_path)
+            tool_lines.append(f"[npmjs](https://www.npmjs.com) | {version} | a package manager for JavaScript")
 
-        if pandoc_exe := get_tool_path("t/pandoc.exe"):
-            installed_tools.append(("Pandoc", utils.get_pandoc_version(str(pandoc_exe.parent))))
+        if (pandoc_exe := self.winpython_directory / "t" / "pandoc.exe").exists():
+            version = utils.get_pandoc_version(str(pandoc_exe.parent))
+            tool_lines.append(f"[Pandoc](https://pandoc.org) | {version} | an universal document converter")
 
-        if vscode_exe := get_tool_path("t/VSCode/Code.exe"):
-            installed_tools.append(("VSCode", utils.getFileProperties(str(vscode_exe))["FileVersion"]))
+        if vscode_exe := (self.winpython_directory / "t" / "VSCode" / "Code.exe").exists():
+            version = utils.getFileProperties(str(vscode_exe))["FileVersion"]
+            tool_lines.append(f"[VSCode](https://code.visualstudio.com) | {version} | a source-code editor developed by Microsoft")
 
-        tool_lines = []
-        for name, version in installed_tools:
-            metadata = utils.get_package_metadata("tools.ini", name)
-            tool_lines.append(f"[{name}]({metadata['url']}) | {version} | {metadata['description']}")
         return "\n".join(tool_lines)
 
     def _get_installed_packages_markdown(self) -> str:
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '15.2.20250412'
+__version__ = '15.3.20250417'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/data/tools.ini b/winpython/data/tools.ini
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -379,27 +379,6 @@ def normalize(this):
     """Apply PEP 503 normalization to the string."""
     return re.sub(r"[-_.]+", "-", this).lower()
 
-def get_package_metadata(database, name):
-    """Extract infos (description, url) from the local database."""
-    DATA_PATH = Path(sys.modules['winpython'].__file__).parent / 'data'
-    db = cp.ConfigParser()
-    filepath = Path(database) if Path(database).is_absolute() else DATA_PATH / database
-    db.read_file(open(str(filepath), encoding=guess_encoding(filepath)[0]))
-
-    my_metadata = {
-        "description": "",
-        "url": f"https://pypi.org/project/{name}",
-    }
-    for key in my_metadata:
-        for name2 in (name, normalize(name)):
-            try:
-                my_metadata[key] = db.get(name2, key)
-                break
-            except (cp.NoSectionError, cp.NoOptionError):
-                pass
-
-    return my_metadata
-
 if __name__ == '__main__':
     print_box("Test")
     dname = sys.prefix
