10000 Merge pull request #1660 from stonebig/master · winpython/winpython@425dff3 · GitHub
[go: up one dir, main page]

Skip to content

Commit 425dff3

Browse files
authored
Merge pull request #1660 from stonebig/master
remove requirements handling in make.py
2 parents ba413a4 + d579fc0 commit 425dff3

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

make.py

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def _create_initial_batch_scripts(self):
182182
with open(self.winpython_directory / "scripts" / "env.ini", "w") as f:
183183
f.writelines([f'{a}={b}\n' for a, b in init_variables])
184184

185-
def build(self, rebuild: bool = True, requirements_files_list=None, winpy_dirname: str = None):
185+
def build(self, rebuild: bool = True, winpy_dirname: str = None):
186186
"""Make or finalise WinPython distribution in the target directory"""
187187
print(f"Building WinPython with Python archive: {self.python_zip_file.name}")
188188
if winpy_dirname is None:
@@ -205,21 +205,13 @@ def build(self, rebuild: bool = True, requirements_files_list=None, winpy_dirnam
205205
self._create_initial_batch_scripts()
206206
utils.python_execmodule("ensurepip", self.distribution.target)
207207
self.distribution.patch_standard_packages("pip")
208-
209208
essential_packages = ["pip", "setuptools", "wheel", "wppm"]
210209
for package_name in essential_packages:
211210
actions = ["install", "--upgrade", "--pre", package_name] + self.install_options
212211
self._print_action(f"Piping: {' '.join(actions)}")
213212
self.distribution.do_pip_action(actions)
214213
self.distribution.patch_standard_packages(package_name)
215214

216-
if requirements_files_list:
217-
for req in requirements_files_list:
218-
actions = ["install", "-r", req] + (self.install_options or [])
219-
self._print_action(f"Piping: {' '.join(actions)}")
220-
self.distribution.do_pip_action(actions)
221-
self.distribution.patch_standard_packages()
222-
223215
self._print_action("Writing package index")
224216
self.winpyver2 = f"{self.python_full_version}.{self.build_number}"
225217
output_markdown_filename = str(self.winpython_directory.parent / f"WinPython{self.flavor}-{self.distribution.architecture}bit-{self.winpyver2}.md")
@@ -232,7 +224,7 @@ def build(self, rebuild: bool = True, requirements_files_list=None, winpy_dirnam
232224

233225
def make_all(build_number: int, release_level: str, pyver: str, architecture: int, basedir: Path,
234226
verbose: bool = False, rebuild: bool = True, create_installer: str = "True", install_options=["--no-index"],
235-
flavor: str = "", requirements: str | list[Path] = None, find_links: str | list[Path] = None,
227+
flavor: str = "", find_links: str | list[Path] = None,
236228
source_dirs: Path = None, toolsdirs: str | list[Path] = None,
237229
python_target_release: str = None, # e.g. "37101" for 3.7.10
238230
):
@@ -249,7 +241,6 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
249241
create_installer: Type of installer to create (str).
250242
install_options: pip options (r'--no-index --pre --trusted-host=None')
251243
flavor: WinPython flavor (str).
252-
requirements: package lists for pip (r'D:\requirements.txt')
253244
find_links: package directories (r'D:\Winpython\packages.srcreq')
254245
source_dirs: the python.zip + rebuilt winpython wheel package directory
255246
toolsdirs: Directory with development tools r'D:\WinPython\basedir34\t.Slim'
@@ -261,7 +252,6 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
261252
tools_dirs_list = parse_list_argument(toolsdirs, ",")
262253
install_options_list = parse_list_argument(install_options, " ")
263254
find_links_dirs_list = parse_list_argument(find_links, ",")
264-
requirements_files_list = [Path(f) for f in parse_list_argument(requirements, ",") if f]
265255
find_links_options = [f"--find-links={link}" for link in find_links_dirs_list + [source_dirs]]
266256
build_directory = Path(basedir) / ("bu" + flavor)
267257

@@ -286,7 +276,7 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
286276
else:
287277
winpython_dirname = f"WPy{architecture}-{pyver.replace('.', '')}{python_minor_version_str}{build_number}{release_level}"
288278

289-
builder.build(rebuild=rebuild, requirements_files_list=requirements_files_list, winpy_dirname=winpython_dirname)
279+
builder.build(rebuild=rebuild, winpy_dirname=winpython_dirname)
290280

291281
for commmand in create_installer.lower().replace("7zip",".exe").split('.'):
292282
installer_type, compression = (commmand + "-").split("-")[:2]
@@ -302,7 +292,6 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
302292
verbose=True,
303293
architecture=64,
304294
flavor="Barebone",
305-
requirements=r"D:\Winpython\basedir34\barebone_requirements.txt",
306295
install_options=r"--no-index --pre --trusted-host=None",
307296
find_links=r"D:\Winpython\packages.srcreq",
308297
source_dirs=r"D:\WinPython\basedir34\packages.win-amd64",

0 commit comments

Comments
 (0)
0