Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 4dc9c09

Browse filesBrowse files
authored
Merge pull request #1627 from stonebig/master
markdown reportlog pushed down to wppm
2 parents 2258f71 + c465cfb commit 4dc9c09
Copy full SHA for 4dc9c09

File tree

Expand file treeCollapse file tree

2 files changed

+39
-26
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+39
-26
lines changed

‎make.py

Copy file name to clipboardExpand all lines: make.py
+7-26Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -100,32 +100,13 @@ def _get_python_zip_file(self) -> Path:
100100
@property
101101
def package_index_markdown(self) -> str:
102102
"""Generates a Markdown formatted package index page."""
103-
return f"""## WinPython {self.winpyver2 + self.flavor}
104-
105-
The following packages are included in WinPython-{self.architecture_bits}bit v{self.winpyver2 + self.flavor} {self.release_level}.
106-
107-
<details>
108-
109-
### Tools
110-
111-
Name | Version | Description
112-
-----|---------|------------
113-
{utils.get_installed_tools_markdown(utils.get_python_executable(self.python_executable_directory))}
114-
115-
### Python packages
116-
117-
Name | Version | Description
118-
-----|---------|------------
119-
{self.distribution.get_installed_packages_markdown()}
120-
121-
### WheelHouse packages
122-
123-
Name | Version | Description
124-
-----|---------|------------
125-
{self.distribution.get_wheelhouse_packages_markdown()}
126-
127-
</details>
128-
"""
103+
return self.distribution.generate_package_index_markdown(
104+
self.python_executable_directory,
105+
self.winpyver2,
106+
self.flavor,
107+
self.architecture_bits,
108+
self.release_level
109+
)
129110

130111
@property
131112
def winpython_version_name(self) -> str:

‎winpython/wppm.py

Copy file name to clipboardExpand all lines: winpython/wppm.py
+32Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,38 @@ def get_wheelhouse_packages_markdown(self) -> str:
8787
return "\n".join(package_lines)
8888
return ""
8989

90+
def generate_package_index_markdown(self, python_executable_directory: str, winpyver2: str,
91+
flavor: str, architecture_bits: int, release_level: str) -> str:
92+
"""Generates a Markdown formatted package index page."""
93+
from winpython import utils # If needed
94+
95+
return f"""## WinPython {winpyver2 + flavor}
96+
97+
The following packages are included in WinPython-{architecture_bits}bit v{winpyver2 + flavor} {release_level}.
98+
99+
<details>
100+
101+
### Tools
102+
103+
Name | Version | Description
104+
-----|---------|------------
105+
{utils.get_installed_tools_markdown(utils.get_python_executable(python_executable_directory))}
106+
107+
### Python packages
108+
109+
Name | Version | Description
110+
-----|---------|------------
111+
{self.get_installed_packages_markdown()}
112+
113+
### WheelHouse packages
114+
115+
Name | Version | Description
116+
-----|---------|------------
117+
{self.get_wheelhouse_packages_markdown()}
118+
119+
</details>
120+
"""
121+
90122
def find_package(self, name: str) -> Package | None:
91123
"""Find installed package by name."""
92124
for pack in self.get_installed_packages():

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.