@@ -182,7 +182,7 @@ def _create_initial_batch_scripts(self):
182182with open (self .winpython_directory / "scripts" / "env.ini" ,"w" )as f :
183183f .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"""
187187print (f"Building WinPython with Python archive:{ self .python_zip_file .name } )
188188if winpy_dirname is None :
@@ -205,21 +205,13 @@ def build(self, rebuild: bool = True, requirements_files_list=None, winpy_dirnam
205205self ._create_initial_batch_scripts ()
206206utils .python_execmodule ("ensurepip" ,self .distribution .target )
207207self .distribution .patch_standard_packages ("pip" )
208-
209208essential_packages = ["pip" ,"setuptools" ,"wheel" ,"wppm" ]
210209for package_name in essential_packages :
211210actions = ["install" ,"--upgrade" ,"--pre" ,package_name ]+ self .install_options
212211self ._print_action (f"Piping:{ ' ' .join (actions )} )
213212self .distribution .do_pip_action (actions )
214213self .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-
223215self ._print_action ("Writing package index" )
224216self .winpyver2 = f"{ self .python_full_version } { self .build_number }
225217output_markdown_filename = str (self .winpython_directory .parent / f"WinPython{ self .flavor } { self .distribution .architecture } { self .winpyver2 } )
@@ -232,7 +224,7 @@ def build(self, rebuild: bool = True, requirements_files_list=None, winpy_dirnam
232224
233225def make_all (build_number :int ,release_level :str ,pyver :str ,architecture :int ,basedir :Path ,
234226verbose :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 ,
236228source_dirs :Path = None ,toolsdirs :str | list [Path ]= None ,
237229python_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:\r equirements.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\b asedir34\t .Slim'
@@ -261,7 +252,6 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
261252tools_dirs_list = parse_list_argument (toolsdirs ,"," )
262253install_options_list = parse_list_argument (install_options ," " )
263254find_links_dirs_list = parse_list_argument (find_links ,"," )
264- requirements_files_list = [Path (f )for f in parse_list_argument (requirements ,"," )if f ]
265255find_links_options = [f"--find-links={ link } for link in find_links_dirs_list + [source_dirs ]]
266256build_directory = Path (basedir )/ ("bu" + flavor )
267257
@@ -286,7 +276,7 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
286276else :
287277winpython_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
291281for commmand in create_installer .lower ().replace ("7zip" ,".exe" ).split ('.' ):
292282installer_type ,compression = (commmand + "-" ).split ("-" )[:2 ]
@@ -302,7 +292,6 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
302292verbose = True ,
303293architecture = 64 ,
304294flavor = "Barebone" ,
305- requirements = r"D:\Winpython\basedir34\barebone_requirements.txt" ,
306295install_options = r"--no-index --pre --trusted-host=None" ,
307296find_links = r"D:\Winpython\packages.srcreq" ,
308297source_dirs = r"D:\WinPython\basedir34\packages.win-amd64" ,