8000 Merge pull request #1657 from stonebig/master · winpython/winpython@188e58f · GitHub
[go: up one dir, main page]
Skip to content

Commit 188e58f

Browse files
stonebigstonebig
authored
Merge pull request #1657 from stonebig/master
remove all docsdir reference
2 parents 5a71213 + 91513f3 commit 188e58f

File tree

4 files changed

+5
-16
lines changed

4 files changed

+5
-16
lines changed

‎generate_winpython_distros313_dot.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ set my_release_level=
1515

1616
rem list of installers to create separated per dot: False=none, .zip=zip, .7z=.7z, 7zip=auto-extractible 7z
1717
set my_create_installer=7zip.7z.zip
18+
set my_create_installer=7zip.zip
1819

1920
set my_preclear_build_directory=Yes
2021

@@ -25,11 +26,9 @@ set my_source_dirs=C:\Winp\bd313\packages.win-amd64
2526

2627
set my_find_links=C:\Winp\packages.srcreq
2728
set my_toolsdirs=C:\Winp\bdTools\Tools.dot
28-
set my_docsdirs=C:\WinP\bdDocs\docs.dot
2929

3030
set my_install_options=--no-index --pre --trusted-host=None
3131

3232
call %~dp0\generate_a_winpython_distro.bat
3333

34-
3534
pause

‎generate_winpython_distros313_slim.bat

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,8 @@ set my_toolsdirs=C:\Winp\bdTools\Tools.dot
3030
REM 2024-07-13:put back pandoc (so from 598Mo to 518Mo?)
3131
set my_toolsdirs=C:\WinP\bdTools\tools64_pandoc_alone
3232

33-
set my_docsdirs=C:\WinP\bdDocs\docs.dot
34-
3533
set my_install_options=--no-index --pre --trusted-host=None
3634

3735
call %~dp0\generate_a_winpython_distro.bat
3836

39-
4037
pause

‎generate_winpython_distros313_wheel.bat

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ set my_release_level=
1515

1616
rem list of installers to create separated per dot: False=none, .zip=zip, .7z=.7z, 7zip=auto-extractible 7z
1717
set my_create_installer=7zip-mx5.7z-mx7.zip
18-
set my_create_installer=.7z-mx7
19-
18+
set my_create_installer=.7z-mx9
2019
set my_preclear_build_directory=Yes
2120

2221
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
2625

2726
set my_find_links=C:\Winp\packages.srcreq
2827
set my_toolsdirs=C:\Winp\bdTools\Tools.dot
29-
set my_docsdirs=C:\WinP\bdDocs\docs.dot
3028

3129
set my_install_options=--no-index --pre --trusted-host=None
3230

3331
rem set addlockfile=dot
3432

33+
set wheelhousereq=C:\Winp\bd313\dot_requirements.txt
3534
set wheelhousereq=C:\Winp\bd313\requirements64_whl.txt
3635

3736

‎make.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class WinPythonDistributionBuilder:
5858
"""Builds a WinPython distribution."""
5959

6060
def __init__(self, build_number: int, release_level: str, target_directory: Path, wheels_directory: Path,
61-
tools_directories: list[Path] = None, documentation_directories: list[Path] = None, verbose: bool = False,
61+
tools_directories: list[Path] = None, verbose: bool = False,
6262
base_directory: Path = None, install_options: list[str] = None, flavor: str = ""):
6363
"""
6464
Initializes the WinPythonDistributionBuilder.
@@ -68,7 +68,6 @@ def __init__(self, build_number: int, release_level: str, target_directory: Path
6868
target_directory: The base directory where WinPython will be created.
6969
wheels_directory: Directory containing wheel files for packages.
7070
tools_directories: List of directories containing development tools to include.
71-
documentation_directories: List of directories containing documentation to include.
7271
verbose: Enable verbose output.
7372
base_directory: Base directory for building (optional, for relative paths).
7473
install_options: Additional pip install options.
@@ -79,7 +78,6 @@ def __init__(self, build_number: int, release_level: str, target_directory: Path
7978
self.target_directory = Path(target_directory)
8079
self.wheels_directory = Path(wheels_directory)
8180
self.tools_directories = tools_directories or []
82-
self.documentation_directories = documentation_directories or []
8381
self.verbose = verbose
8482
self.winpython_directory: Path | None = None
8583
self.distribution: wppm.Distribution | None = None
@@ -242,7 +240,7 @@ def rebuild_winpython_package(source_directory: Path, target_directory: Path, ar
242240
def make_all(build_number: int, release_level: str, pyver: str, architecture: int, basedir: Path,
243241
verbose: bool = False, rebuild: bool = True, create_installer: str = "True", install_options=["--no-index"],
244242
flavor: str = "", requirements: str | list[Path] = None, find_links: str | list[Path] = None,
245-
source_dirs: Path = None, toolsdirs: str | list[Path] = None, docsdirs: str | list[Path] = None,
243+
source_dirs: Path = None, toolsdirs: str | list[Path] = None,
246244
python_target_release: str = None, # e.g. "37101" for 3.7.10
247245
):
248246
"""
@@ -262,14 +260,12 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
262260
find_links: package directories (r'D:\Winpython\packages.srcreq')
263261
source_dirs: the python.zip + rebuilt winpython wheel package directory
264262
toolsdirs: Directory with development tools r'D:\WinPython\basedir34\t.Slim'
265-
docsdirs: Directory with documentation r'D:\WinPython\basedir34\docs.Slim'
266263
python_target_release: Target Python release (str).
267264
"""
268265
assert basedir is not None, "The *basedir* directory must be specified"
269266
assert architecture in (32, 64)
270267

271268
tools_dirs_list = parse_list_argument(toolsdirs, ",")
272-
docs_dirs_list = parse_list_argument(docsdirs, ",")
273269
install_options_list = parse_list_argument(install_options, " ")
274270
find_links_dirs_list = parse_list_argument(find_links, ",")
275271
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
285281
builder = WinPythonDistributionBuilder(
286282
build_number, release_level, build_directory, wheels_directory=source_dirs,
287283
tools_directories=[Path(d) for d in tools_dirs_list],
288-
documentation_directories=[Path(d) for d in docs_dirs_list],
289284
verbose=verbose, base_directory=basedir,
290285
install_options=install_options_list + find_links_options,
291286
flavor=flavor
@@ -321,5 +316,4 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
321316
find_links=r"D:\Winpython\packages.srcreq",
322317
source_dirs=r"D:\WinPython\basedir34\packages.win-amd64",
323318
toolsdirs=r"D:\WinPython\basedir34\t.Slim",
324-
docsdirs=r"D:\WinPython\basedir34\docs.Slim",
325319
)

0 commit comments

Comments
 (0)
0