Skip to content

Commit d09f80d

Browse files
stonebigstonebig
committed
numpy-2.3.2 +numba-0.62.0rc1 + patch local build
1 parent 40fe6b2 commit d09f80d

File tree

9 files changed

+12986
-21
lines changed

9 files changed

+12986
-21
lines changed

‎.github/workflows/github_workflows_build-all_3.13.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
flavor_config:
1919
# WinPython Dot configuration
2020
- FLAVOR: "dotc"
21-
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0dotb3.txt"
21+
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0dotb4.txt"
2222
REQUIREMENTS_WHL: ""
2323
ZIP: "1"
2424
SEVEN_Z: "0"
@@ -35,7 +35,7 @@ jobs:
3535

3636
# WinPython Slim configuration
3737
- FLAVOR: "slimc"
38-
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0slimb3.txt"
38+
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0slimb4.txt"
3939
REQUIREMENTS_WHL: ""
4040
ZIP: "0"
4141
SEVEN_Z: "1"
@@ -52,8 +52,8 @@ jobs:
5252

5353
# WinPython Whl configuration
5454
- FLAVOR: "whlc"
55-
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0dotb3.txt" # Note: Original whl used dotb3 requirements, verify if this is intended
56-
REQUIREMENTS_WHL: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0whlb3_wheels.txt"
55+
REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0dotb4.txt" # Note: Original whl used dotb3 requirements, verify if this is intended
56+
REQUIREMENTS_WHL: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0whlb4_wheels.txt"
5757
ZIP: "0"
5858
SEVEN_Z: "1"
5959
EXE: "0"

‎winpython/build_winpython.py‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
from pathlib import Path
66
from filecmp import cmp
77

8-
LOG_FORMAT = "%(asctime)s %(levelname)s: %(message)s"
9-
10-
def setup_logging(log_file: Path):
8+
def setup_logging(log_file: Path, LOG_FORMAT="%(asctime)s %(levelname)s: %(message)s"):
119
"""Initialize logging to both file and stdout."""
1210
logging.basicConfig(
1311
level=logging.INFO,
@@ -18,10 +16,10 @@ def setup_logging(log_file: Path):
1816
]
1917
)
2018

21-
def log_section(message: str):
22-
logging.info("\n" + "-"*40)
19+
def log_section(message: str, highlight_bar="-"*40):
20+
logging.info("\n" + highlight_bar)
2321
logging.info(message)
24-
logging.info("-"*40)
22+
logging.info(highlight_bar)
2523

2624
def delete_folder_if_exists(folder: Path, check_flavor: str = ""):
2725
check_last = folder.parent.name if not folder.is_dir() else folder.name
@@ -76,8 +74,8 @@ def generate_lockfiles(target_python: Path, winpydirbase: Path, constraints: str
7674
pip_req.write_bytes(b"".join(packages))
7775
# Lock to web and local (scaffolding)
7876
for kind in ("", "local"):
79-
out = winpydirbase.parent / f"pylock.{file_postfix}_{kind}.toml"
80-
outreq = winpydirbase.parent / f"requir.{file_postfix}_{kind}.txt"
77+
out = winpydirbase.parent / f"pylock.{file_postfix}{kind}.toml"
78+
outreq = winpydirbase.parent / f"requir.{file_postfix}{kind}.txt"
8179
cmd = [str(target_python), "-m", "pip", "lock", "--no-deps", "-c", constraints]
8280
if kind == "local":
8381
cmd += ["--find-links", find_links]
@@ -88,11 +86,11 @@ def generate_lockfiles(target_python: Path, winpydirbase: Path, constraints: str
8886
run_command(cmd)
8987
# check equality
9088
web, local = "", "local"
91-
if not cmp(winpydirbase.parent / f"requir.{file_postfix}_{web}.txt", winpydirbase.parent / f"requir.{file_postfix}_{local}.txt"):
92-
print("⚠️⚠️⚠️⚠️⚠️⚠️ ALARM ⚠️⚠️⚠️⚠️⚠️⚠️differences in ", winpydirbase.parent / f"requir.{file_postfix}_{web}.txt", winpydirbase.parent / f"requir.{file_postfix}_{local}.txt")
89+
if not cmp(winpydirbase.parent / f"requir.{file_postfix}{web}.txt", winpydirbase.parent / f"requir.{file_postfix}{local}.txt"):
90+
print("⚠️⚠️⚠️⚠️⚠️⚠️ ALARM ⚠️⚠️⚠️⚠️⚠️⚠️differences in ", winpydirbase.parent / f"requir.{file_postfix}{web}.txt", winpydirbase.parent / f"requir.{file_postfix}{local}.txt")
9391
raise os.error
9492
else:
95-
print ("💖💖💖 match 💖💖💖 ok ",winpydirbase.parent / f"requir.{file_postfix}_{web}.txt", winpydirbase.parent / f"requir.{file_postfix}_{local}.txt")
93+
print ("💖💖💖 match 💖💖💖 ok ",winpydirbase.parent / f"requir.{file_postfix}{web}.txt", winpydirbase.parent / f"requir.{file_postfix}{local}.txt")
9694

9795
# --- Main Logic ---
9896
def run_make_py(build_python, winpydirbase, args):
@@ -114,7 +112,7 @@ def process_wheelhouse_requirements(target_python: Path, winpydirbase: Path,args
114112
if wheelhousereq.is_file():
115113
# Generate pylock from wheelhousereq
116114
cmd = [
117-
str(target_python), "-m", "pip", "lock", "--no-index", "--trusted-host=None",
115+
str(target_python), "-m", "pip", "lock", "--no-index", "--trusted-host=None", "--pre",
118116
"--find-links", args.find_links, "-c", args.constraints, "-r", str(wheelhousereq),
119117
"-o", str(out)
120118
]

‎winpython/make.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
#
2+
# make.py
33
# WinPython build script
44
# Copyright © 2012 Pierre Raybaut
55
# Copyright © 2014-2025+ The Winpython development team https://github.com/winpython/

0 commit comments

Comments
 (0)