fix local building

stonebig · stonebig · commit 050e59d4ba79 · 2025-12-07T10:57:47.000+01:00
diff --git a/winpython/build_winpython.py b/winpython/build_winpython.py
@@ -94,12 +94,13 @@ def generate_lockfiles(target_python: Path, winpydirbase: Path, constraints: str
        print ("💖💖💖 match 💖💖💖 ok ",winpydirbase.parent / f"requir.{file_postfix}{web}.txt", winpydirbase.parent / f"requir.{file_postfix}{local}.txt")
 
 # --- Main Logic ---
-def run_make_py(build_python, winpydirbase, args):
+def run_make_py(build_python, winpydirbase, args, winpyver, winpyver2):
     from . import make
     make.make_all(
         args.release, args.release_level, basedir_wpy=winpydirbase,
         verbose=True, flavor=args.flavor,
-        source_dirs=args.source_dirs, toolsdirs=args.tools_dirs
+        source_dirs=args.source_dirs, toolsdirs=args.tools_dirs,
+        winpyver=winpyver, winpyver2=winpyver2
     )
 
 def process_wheelhouse_requirements(target_python: Path, winpydirbase: Path,args: argparse.Namespace,file_postfix: str):
@@ -189,6 +190,7 @@ def main():
         z = Path(winpydirbase).name[(4+len(args.arch)):]
     tada = f"{z[:1]}_{z[1:3]}_{z[3]}_{args.release}"
     winpyver2 = tada.replace('_', '.')
+    winpyver = f"{winpyver2}{args.flavor}{args.release_level}"
     file_postfix = f"{args.arch}-{tada}{args.flavor}{args.release_level}"
 
     log_section(f"Preparing build for Python {args.python_target} ({args.arch}-bit)")
@@ -197,7 +199,7 @@ def main():
     delete_folder_if_exists(winpydirbase.parent, check_flavor=args.flavor) #bu{flavor]}
 
     log_section(f"🙏 Step 2: make.py Python with {str(build_python)} at ({winpydirbase}")
-    run_make_py(str(build_python), winpydirbase, args)
+    run_make_py(str(build_python), winpydirbase, args, winpyver, winpyver2)
 
     check_env_bat(winpydirbase)
 
diff --git a/winpython/make.py b/winpython/make.py
@@ -42,7 +42,8 @@ class WinPythonDistributionBuilder:
 
     def __init__(self, build_number: int, release_level: str, basedir_wpy: Path,
                  source_dirs: Path, tools_directories: list[Path] = None,
-                 verbose: bool = False, flavor: str = ""):
+                 verbose: bool = False, flavor: str = "",
+                 winpyver: str = "", winpyver2: str = ""):
         """
         Initializes the WinPythonDistributionBuilder.
         Args:
@@ -66,6 +67,8 @@ def __init__(self, build_number: int, release_level: str, basedir_wpy: Path,
         self.python_zip_file: Path = self._get_python_zip_file()
         self.python_name = self.python_zip_file.stem
         self.python_directory_name = "python"
+        self.winpyver = winpyver
+        self.winpyver2 = winpyver2
 
     def _get_python_zip_file(self) -> Path:
         """Finds the Python .zip file in the wheels directory."""
@@ -112,8 +115,8 @@ def _create_env_config(self):
         config = {
             "WINPYthon_exe": executable_name,
             "WINPYthon_subdirectory_name": self.python_directory_name,
-            "WINPYVER": self.winpython_version_name,
-            "WINPYVER2": f"{self.python_full_version}.{self.build_number}",
+            "WINPYVER": self.winpyver,  # self.winpython_version_name,
+            "WINPYVER2": self.winpyver2,  # f"{self.python_full_version}.{self.build_number}",
             "WINPYFLAVOR": self.flavor,
             "WINPYARCH": self.distribution.architecture if self.distribution else 64,
         }
@@ -138,7 +141,8 @@ def build(self):
 
 def make_all(build_number: int, release_level: str, basedir_wpy: Path = None,
              source_dirs: Path = None, toolsdirs: str | list[Path] = None,
-             verbose: bool = False, flavor: str = ""):
+             verbose: bool = False, flavor: str = "",
+             winpyver: str = "", winpyver2: str = ""):
     """
     Make a WinPython distribution for a given set of parameters:
     Args:
@@ -159,7 +163,8 @@ def make_all(build_number: int, release_level: str, basedir_wpy: Path = None,
     builder = WinPythonDistributionBuilder(
         build_number, release_level, Path(basedir_wpy), 
         verbose=verbose, flavor=flavor,
-        source_dirs=source_dirs, tools_directories=tools_directories)
+        source_dirs=source_dirs, tools_directories=tools_directories,
+        winpyver=winpyver, winpyver2=winpyver2)
     builder.build()
 
 if __name__ == "__main__":
@@ -171,4 +176,6 @@ def make_all(build_number: int, release_level: str, basedir_wpy: Path = None,
         flavor="dot",
         source_dirs=r"D:\WinPython\bd314\packages.win-amd64",
         toolsdirs=r"D:\WinPython\bd314\t.Slim",
+        winpyver=r"3.14.0.1dotb3",
+        winpyver2=r"3.14.0.1"        
     )
diff --git a/winpython_builds_bd13.toml b/winpython_builds_bd13.toml
@@ -1,8 +1,8 @@
 [pythons]
-"311" = { python_target_release = "3119", release = "2", my_release_level = "b3" }
-"312" = { python_target_release = "31210", release = "2", my_release_level = "b3" }
-"313" = { python_target_release = "3138", release = "0", my_release_level = "b3" }
-"314" = { python_target_release = "3140", release = "2", my_release_level = "b3" }
+"311" = { python_target_release = "3119", release = "2", my_release_level = "b4" }
+"312" = { python_target_release = "31210", release = "2", my_release_level = "b4" }
+"313" = { python_target_release = "31311", release = "0", my_release_level = "b4" }
+"314" = { python_target_release = "3142", release = "0", my_release_level = "b4" }
 
 
 [[builds]]
diff --git a/winpython_builds_bd14.toml b/winpython_builds_bd14.toml
@@ -1,8 +1,8 @@
 [pythons]
-"311" = { python_target_release = "3119", release = "2", my_release_level = "b3" }
-"312" = { python_target_release = "31210", release = "2", my_release_level = "b3" }
-"313" = { python_target_release = "3138", release = "0", my_release_level = "b3" }
-"314" = { python_target_release = "3140", release = "2", my_release_level = "b3" }
+"311" = { python_target_release = "3119", release = "2", my_release_level = "b4" }
+"312" = { python_target_release = "31210", release = "2", my_release_level = "b4" }
+"313" = { python_target_release = "31311", release = "0", my_release_level = "b4" }
+"314" = { python_target_release = "3142", release = "0", my_release_level = "b4" }
 
 
 
@@ -56,7 +56,7 @@ mandatory_requirements = "C:\\Winp\\bd314\\mandatory_requirements.txt"
 requirements = "C:\\Winp\\bd314\\requirements_slim.txt"
 source_dirs = "C:\\Winp\\bd314\\packages.win-amd64"
 find_links = "C:\\Winp\\packages.srcreq"
-toolsdirs = "C:\\Winp\\bdTools\\Tools.dot"
+toolsdirs = "C:\\Winp\\bdTools\\tools64_pandoc_alone"
 install_options = "--no-index --pre --trusted-host=None --upgrade"
 
 
@@ -93,4 +93,4 @@ source_dirs = "C:\\Winp\\bd314\\packages.win-amd64"
 find_links = "C:\\Winp\\packages.srcreq"
 toolsdirs = "C:\\Winp\\bdTools\\Tools.dot"
 install_options = "--no-index --pre --trusted-host=None --upgrade"
-wheelhousereq = "C:\\Winp\\bd314\\requirements_slim.txt"
+wheelhousereq = "C:\\Winp\\bd314\\requirements_whl.txt"
