Skip to content

Commit f44f56a

Browse files
committed
Merge branch 'pre-only-where-named'
2 parents 7dfdbdc + b039897 commit f44f56a

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎constraints.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@ onnxruntime>=1.23.2
273273
openai>=2.7.1
274274
openpyxl>=3.1.5
275275
opentelemetry-api>=1.34.1
276+
# 2026-08-30 this project publishes betas only, so the specifier names one.
277+
# That is what lets pip take it now that the build no longer passes --pre.
278+
opentelemetry-semantic-conventions>=0.60b1
276279
optree>=0.17.0
277280
optuna>=4.2.1
278281
orjson>=3.11.4

‎winpython/build_winpython.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ def pip_install(python_exe: Path, req_file: str, constraints: str, find_links: s
4848
cmd = [
4949
str(python_exe), "-m", "pip", "install",
5050
"-r", req_file, "-c", constraints,
51-
"--pre", "--no-index", f"--find-links={find_links}",
51+
# No --pre. pip accepts a prerelease when the specifier itself names
52+
# one, so a prerelease reaches a build because the constraints ask
53+
# for it on that target, not because it happened to be the newest
54+
# file in the wheelhouse.
55+
"--no-index", f"--find-links={find_links}",
5256
"--upgrade", "--no-warn-script-location"
5357
]
5458
if options:
@@ -173,7 +177,8 @@ def process_wheelhouse_requirements(target_python: Path, winpydirbase: Path,args
173177
if wheelhousereq.is_file():
174178
# Generate pylock from wheelhousereq
175179
cmd = [
176-
str(target_python), "-m", "pip", "lock", "--no-index", "--trusted-host=None", "--pre",
180+
# no --pre here either: same rule as pip_install()
181+
str(target_python), "-m", "pip", "lock", "--no-index", "--trusted-host=None",
177182
"--find-links", args.find_links, "-c", args.constraints, "-r", str(wheelhousereq),
178183
"-o", str(out)
179184
]

0 commit comments

Comments
 (0)