@@ -182,7 +182,7 @@ def _create_initial_batch_scripts(self):
182
182
with open (self .winpython_directory / "scripts" / "env.ini" , "w" ) as f :
183
183
f .writelines ([f'{ a } ={ b } \n ' for a , b in init_variables ])
184
184
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 ):
186
186
"""Make or finalise WinPython distribution in the target directory"""
187
187
print (f"Building WinPython with Python archive: { self .python_zip_file .name } " )
188
188
if winpy_dirname is None :
@@ -205,21 +205,13 @@ def build(self, rebuild: bool = True, requirements_files_list=None, winpy_dirnam
205
205
self ._create_initial_batch_scripts ()
206
206
utils .python_execmodule ("ensurepip" , self .distribution .target )
207
207
self .distribution .patch_standard_packages ("pip" )
208
-
209
208
essential_packages = ["pip" , "setuptools" , "wheel" , "wppm" ]
210
209
for package_name in essential_packages :
211
210
actions = ["install" , "--upgrade" , "--pre" , package_name ] + self .install_options
212
211
self ._print_action (f"Piping: { ' ' .join (actions )} " )
213
212
self .distribution .do_pip_action (actions )
214
213
self .distribution .patch_standard_packages (package_name )
215
214
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
-
223
215
self ._print_action ("Writing package index" )
224
216
self .winpyver2 = f"{ self .python_full_version } .{ self .build_number } "
225
217
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
232
224
233
225
def make_all (build_number : int , release_level : str , pyver : str , architecture : int , basedir : Path ,
234
226
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 ,
236
228
source_dirs : Path = None , toolsdirs : str | list [Path ] = None ,
237
229
python_target_release : str = None , # e.g. "37101" for 3.7.10
238
230
):
@@ -249,7 +241,6 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
249
241
create_installer: Type of installer to create (str).
250
242
install_options: pip options (r'--no-index --pre --trusted-host=None')
251
243
flavor: WinPython flavor (str).
252
- requirements: package lists for pip (r'D:\r equirements.txt')
253
244
find_links: package directories (r'D:\Winpython\packages.srcreq')
254
245
source_dirs: the python.zip + rebuilt winpython wheel package directory
255
246
toolsdirs: Directory with development tools r'D:\WinPython\b asedir34\t .Slim'
@@ -261,7 +252,6 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
261
252
tools_dirs_list = parse_list_argument (toolsdirs , "," )
262
253
install_options_list = parse_list_argument (install_options , " " )
263
254
find_links_dirs_list = parse_list_argument (find_links , "," )
264
- requirements_files_list = [Path (f ) for f in parse_list_argument (requirements , "," ) if f ]
265
255
find_links_options = [f"--find-links={ link } " for link in find_links_dirs_list + [source_dirs ]]
266
256
build_directory = Path (basedir ) / ("bu" + flavor )
267
257
@@ -286,7 +276,7 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
286
276
else :
287
277
winpython_dirname = f"WPy{ architecture } -{ pyver .replace ('.' , '' )} { python_minor_version_str } { build_number } { release_level } "
288
278
289
- builder .build (rebuild = rebuild , requirements_files_list = requirements_files_list , winpy_dirname = winpython_dirname )
279
+ builder .build (rebuild = rebuild , winpy_dirname = winpython_dirname )
290
280
291
281
for commmand in create_installer .lower ().replace ("7zip" ,".exe" ).split ('.' ):
292
282
installer_type , compression = (commmand + "-" ).split ("-" )[:2 ]
@@ -302,7 +292,6 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
302
292
verbose = True ,
303
293
architecture = 64 ,
304
294
flavor = "Barebone" ,
305
- requirements = r"D:\Winpython\basedir34\barebone_requirements.txt" ,
306
295
install_options = r"--no-index --pre --trusted-host=None" ,
307
296
find_links = r"D:\Winpython\packages.srcreq" ,
308
297
source_dirs = r"D:\WinPython\basedir34\packages.win-amd64" ,
0 commit comments