diff --git a/generate_winpython_distros313_dot.bat b/generate_winpython_distros313_dot.bat index b0ed9351..a1290cd3 100644 --- a/generate_winpython_distros313_dot.bat +++ b/generate_winpython_distros313_dot.bat @@ -15,6 +15,7 @@ set my_release_level= rem list of installers to create separated per dot: False=none, .zip=zip, .7z=.7z, 7zip=auto-extractible 7z set my_create_installer=7zip.7z.zip +set my_create_installer=7zip.zip set my_preclear_build_directory=Yes @@ -25,11 +26,9 @@ set my_source_dirs=C:\Winp\bd313\packages.win-amd64 set my_find_links=C:\Winp\packages.srcreq set my_toolsdirs=C:\Winp\bdTools\Tools.dot -set my_docsdirs=C:\WinP\bdDocs\docs.dot set my_install_options=--no-index --pre --trusted-host=None call %~dp0\generate_a_winpython_distro.bat - pause \ No newline at end of file diff --git a/generate_winpython_distros313_slim.bat b/generate_winpython_distros313_slim.bat index 7b7a1ffc..e8829c58 100644 --- a/generate_winpython_distros313_slim.bat +++ b/generate_winpython_distros313_slim.bat @@ -30,11 +30,8 @@ set my_toolsdirs=C:\Winp\bdTools\Tools.dot REM 2024-07-13:put back pandoc (so from 598Mo to 518Mo?) set my_toolsdirs=C:\WinP\bdTools\tools64_pandoc_alone -set my_docsdirs=C:\WinP\bdDocs\docs.dot - set my_install_options=--no-index --pre --trusted-host=None call %~dp0\generate_a_winpython_distro.bat - pause \ No newline at end of file diff --git a/generate_winpython_distros313_wheel.bat b/generate_winpython_distros313_wheel.bat index 02edeb99..317d7774 100644 --- a/generate_winpython_distros313_wheel.bat +++ b/generate_winpython_distros313_wheel.bat @@ -15,8 +15,7 @@ set my_release_level= rem list of installers to create separated per dot: False=none, .zip=zip, .7z=.7z, 7zip=auto-extractible 7z set my_create_installer=7zip-mx5.7z-mx7.zip -set my_create_installer=.7z-mx7 - +set my_create_installer=.7z-mx9 set my_preclear_build_directory=Yes set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target% @@ -26,12 +25,12 @@ set my_source_dirs=C:\Winp\bd313\packages.win-amd64 set my_find_links=C:\Winp\packages.srcreq set my_toolsdirs=C:\Winp\bdTools\Tools.dot -set my_docsdirs=C:\WinP\bdDocs\docs.dot set my_install_options=--no-index --pre --trusted-host=None rem set addlockfile=dot +set wheelhousereq=C:\Winp\bd313\dot_requirements.txt set wheelhousereq=C:\Winp\bd313\requirements64_whl.txt diff --git a/make.py b/make.py index 5781ad67..22ad0b37 100644 --- a/make.py +++ b/make.py @@ -58,7 +58,7 @@ class WinPythonDistributionBuilder: """Builds a WinPython distribution.""" def __init__(self, build_number: int, release_level: str, target_directory: Path, wheels_directory: Path, - tools_directories: list[Path] = None, documentation_directories: list[Path] = None, verbose: bool = False, + tools_directories: list[Path] = None, verbose: bool = False, base_directory: Path = None, install_options: list[str] = None, flavor: str = ""): """ Initializes the WinPythonDistributionBuilder. @@ -68,7 +68,6 @@ def __init__(self, build_number: int, release_level: str, target_directory: Path target_directory: The base directory where WinPython will be created. wheels_directory: Directory containing wheel files for packages. tools_directories: List of directories containing development tools to include. - documentation_directories: List of directories containing documentation to include. verbose: Enable verbose output. base_directory: Base directory for building (optional, for relative paths). install_options: Additional pip install options. @@ -79,7 +78,6 @@ def __init__(self, build_number: int, release_level: str, target_directory: Path self.target_directory = Path(target_directory) self.wheels_directory = Path(wheels_directory) self.tools_directories = tools_directories or [] - self.documentation_directories = documentation_directories or [] self.verbose = verbose self.winpython_directory: Path | None = None self.distribution: wppm.Distribution | None = None @@ -242,7 +240,7 @@ def rebuild_winpython_package(source_directory: Path, target_directory: Path, ar def make_all(build_number: int, release_level: str, pyver: str, architecture: int, basedir: Path, verbose: bool = False, rebuild: bool = True, create_installer: str = "True", install_options=["--no-index"], flavor: str = "", requirements: str | list[Path] = None, find_links: str | list[Path] = None, - source_dirs: Path = None, toolsdirs: str | list[Path] = None, docsdirs: str | list[Path] = None, + source_dirs: Path = None, toolsdirs: str | list[Path] = None, python_target_release: str = None, # e.g. "37101" for 3.7.10 ): """ @@ -262,14 +260,12 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in find_links: package directories (r'D:\Winpython\packages.srcreq') source_dirs: the python.zip + rebuilt winpython wheel package directory toolsdirs: Directory with development tools r'D:\WinPython\basedir34\t.Slim' - docsdirs: Directory with documentation r'D:\WinPython\basedir34\docs.Slim' python_target_release: Target Python release (str). """ assert basedir is not None, "The *basedir* directory must be specified" assert architecture in (32, 64) tools_dirs_list = parse_list_argument(toolsdirs, ",") - docs_dirs_list = parse_list_argument(docsdirs, ",") install_options_list = parse_list_argument(install_options, " ") find_links_dirs_list = parse_list_argument(find_links, ",") requirements_files_list = [Path(f) for f in parse_list_argument(requirements, ",") if f] @@ -285,7 +281,6 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in builder = WinPythonDistributionBuilder( build_number, release_level, build_directory, wheels_directory=source_dirs, tools_directories=[Path(d) for d in tools_dirs_list], - documentation_directories=[Path(d) for d in docs_dirs_list], verbose=verbose, base_directory=basedir, install_options=install_options_list + find_links_options, flavor=flavor @@ -321,5 +316,4 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in find_links=r"D:\Winpython\packages.srcreq", source_dirs=r"D:\WinPython\basedir34\packages.win-amd64", toolsdirs=r"D:\WinPython\basedir34\t.Slim", - docsdirs=r"D:\WinPython\basedir34\docs.Slim", )