8000 Merge pull request #1669 from stonebig/master · winpython/winpython@a42e169 · GitHub
[go: up one dir, main page]

Skip to content

Commit a42e169

Browse files
authored
Merge pull request #1669 from stonebig/master
markdown is generated per main dos script now
2 parents fcb6036 + 10dba93 commit a42e169

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

make.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
from wppm import wppm, utils, diff
1616

1717
# Define constant paths for clarity
18-
CHANGELOGS_DIRECTORY = Path(__file__).parent / "changelogs"
1918
PORTABLE_DIRECTORY = Path(__file__).parent / "portable"
2019
NODEJS_RELATIVE_PATH = "n" # Relative path within WinPython dir
2120

2221
# Ensure necessary directories exist at the start
23-
assert CHANGELOGS_DIRECTORY.is_dir(), f"Changelogs directory not found: {CHANGELOGS_DIRECTORY}"
2422
assert PORTABLE_DIRECTORY.is_dir(), f"Portable directory not found: {PORTABLE_DIRECTORY}"
2523

2624
def copy_items(source_directories: list[Path], target_directory: Path, verbose: bool = False):
@@ -184,16 +182,6 @@ def build(self, rebuild: bool = True, winpy_dir: Path = None):
184182
self.distribution.do_pip_action(actions)
185183
self.distribution.patch_standard_packages(package_name)
186184

187-
self._print_action("Writing package index")
188-
self.winpyver2 = f"{self.python_full_version}.{self.build_number}"
189-
output_markdown_filename = str(self.winpython_directory.parent / f"WinPython{self.flavor}-{self.distribution.architecture}bit-{self.winpyver2}.md")
190-
with open(output_markdown_filename, "w", encoding='utf-8') as f:
191-
f.write(self.package_index_markdown)
192-
193-
self._print_action("Writing changelog")
194-
shutil.copyfile(output_markdown_filename, str(Path(CHANGELOGS_DIRECTORY) / Path(output_markdown_filename).name))
195-
diff.write_changelog(self.winpyver2, None, CHANGELOGS_DIRECTORY, self.flavor, self.distribution.architecture, basedir=self.winpython_directory.parent)
196-
197185
def make_all(build_number: int, release_level: str, basedir_wpy: Path = None,
198186
verbose: bool = False, rebuild: bool = True, create_installer: str = "True", install_options=["--no-index"],
199187
flavor: str = "", find_links: str | list[Path] = None,
@@ -233,7 +221,6 @@ def make_all(build_number: int, release_level: str, basedir_wpy: Path = None,
233221
install_options=install_options_list + find_links_options,
234222
flavor=flavor
235223
)
236-
237224
builder.build(rebuild=rebuild, winpy_dir=winpy_dir)
238225

239226

0 commit comments

Comments
 (0)
0