Skip to content

Commit 5c927fd

Browse files
stonebigstonebig
authored
Merge pull request #2089 from stonebig/master
initial clean-up and default security enhancement for new cycle 2026-04
2 parents 729a137 + f44f56a commit 5c927fd

9 files changed

Lines changed: 18 additions & 10 deletions

File tree

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
MIT licence
33

4-
Copyright (c) 2012-2014 Pierre Raybaut
5-
Copyright (c) 2014-2024+ The Winpython development team https://github.com/winpython/
4+
Copyright (c) 2009-2013 Pierre Raybaut
5+
Copyright (c) 2014-2026+ The Winpython development team https://github.com/winpython/
66

77

88
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
WinPython tools
22
===============
33

4-
Copyright 2012-2013 Pierre Raybaut
4+
Copyright 2009-2013 Pierre Raybaut
55

66
Copyright 2014-2026+ The Winpython development team: https://github.com/winpython/
77

‎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
]

‎winpython/portable/launchers_building/launchers_final_proposed/license.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ following license agreement.
1313
WinPython License Agreement (MIT License)
1414
-----------------------------------------
1515

16-
Copyright (c) 2012 Pierre Raybaut, 2016+ WinPython team
16+
Copyright (c) 2009-2013 Pierre Raybaut, 2014-2026+ WinPython team
1717

1818
Permission is hereby granted, free of charge, to any person
1919
obtaining a copy of this software and associated documentation

‎winpython/portable/launchers_building/launchers_src/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DataLab-WinPython is a Python distribution for Windows:
88
I. - WinPython License Agreement (MIT License)
99
----------------------------------------------
1010

11-
Copyright (c) 2012 Pierre Raybaut, 2016+ WinPython team
11+
Copyright (c) 2009-2013 Pierre Raybaut, 2014-2026+ WinPython team
1212

1313
Permission is hereby granted, free of charge, to any person
1414
obtaining a copy of this software and associated documentation

‎winpython/portable/launchers_building/launchers_src_original/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DataLab-WinPython is a Python distribution for Windows:
88
I. - WinPython License Agreement (MIT License)
99
----------------------------------------------
1010

11-
Copyright (c) 2012 Pierre Raybaut, 2016+ WinPython team
11+
Copyright (c) 2009-2013 Pierre Raybaut, 2014-2026+ WinPython team
1212

1313
Permission is hereby granted, free of charge, to any person
1414
obtaining a copy of this software and associated documentation

‎winpython/portable/launchers_final/license.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ following license agreement.
1313
WinPython License Agreement (MIT License)
1414
-----------------------------------------
1515

16-
Copyright (c) 2012 Pierre Raybaut, 2016+ WinPython team
16+
Copyright (c) 2009-2013 Pierre Raybaut, 2014-2026+ WinPython team
1717

1818
Permission is hereby granted, free of charge, to any person
1919
obtaining a copy of this software and associated documentation

‎wppm/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
WinPython License Agreement (MIT License)
44
-----------------------------------------
55
6-
Copyright (c) 2012-2013 Pierre Raybaut
6+
Copyright (c) 2009-2013 Pierre Raybaut
77
Copyright (c) 2014-2026+ The Winpython development team https://github.com/winpython/
88
99
Permission is hereby granted, free of charge, to any person

0 commit comments

Comments
 (0)