Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit eac30c0

Browse files
stonebigstonebig
authored
Merge pull request #1957 from stonebig/master
simplifying maintenance
2 parents d62f6c9 + c353268 commit eac30c0

23 files changed

+27644
-21
lines changed

‎.github/workflows/github_workflows_build-2026_01.yml‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ on:
1717
env:
1818
# === Global Configuration ===
1919
WINPYARCH: "64"
20+
my_cycle: "winpython/portable/cycle_2026_01"
2021
my_release_level: "b0"
2122
dotwheelhouse: "dotpython\\wheelhouse\\included.wheels"
2223
pandoc_source: "https://github.com/jgm/pandoc/releases/download/3.1.9/pandoc-3.1.9-windows-x86_64.zip"
@@ -30,18 +31,18 @@ jobs:
3031
matrix:
3132
flavor:
3233
- name: "dot"
33-
REQUIREMENTS_313: "winpython\\portable\\cycle_2025_05\\requir.64-3_13_11_0dot.txt"
34-
REQUIREMENTS_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0dot.txt"
35-
REQUIREMENTS_315: "winpython\\portable\\cycle_2025_05\\requir.64-3_15_0_0dot.txt"
34+
REQUIREMENTS_313: "requir.64-3_13_11_1dotb0.txt"
35+
REQUIREMENTS_314: "requir.64-3_14_2_1dotb0.txt"
36+
REQUIREMENTS_315: "requir.64-3_15_0_1dotb0.txt"
3637
REQUIREMENTS_WHL_313: ""
3738
REQUIREMENTS_WHL_314: ""
3839
REQUIREMENTS_WHL_315: ""
3940
formats: { zip: true, 7z: false, exe: true }
4041
PANDOC: "0"
4142
WINPYARCHDET: "64"
4243
- name: "slim"
43-
REQUIREMENTS_313: "winpython\\portable\\cycle_2025_05\\requir.64-3_13_11_0slim.txt"
44-
REQUIREMENTS_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0slim.txt"
44+
REQUIREMENTS_313: "requir.64-3_13_11_1slimb0.txt"
45+
REQUIREMENTS_314: "requir.64-3_14_2_1slimb0.txt"
4546
REQUIREMENTS_315: ""
4647
REQUIREMENTS_WHL_313: ""
4748
REQUIREMENTS_WHL_314: ""
@@ -50,18 +51,18 @@ jobs:
5051
PANDOC: "1"
5152
WINPYARCHDET: "64"
5253
- name: "whl"
53-
REQUIREMENTS_313: "winpython\\portable\\cycle_2025_05\\requir.64-3_13_11_0dot.txt"
54-
REQUIREMENTS_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0dot.txt"
54+
REQUIREMENTS_313: "requir.64-3_13_11_1dotb0.txt"
55+
REQUIREMENTS_314: "requir.64-3_14_2_1dotb0.txt"
5556
REQUIREMENTS_315: ""
56-
REQUIREMENTS_WHL_313: "winpython\\portable\\cycle_2025_05\\requir.64-3_13_11_0whl_wheels.txt"
57-
REQUIREMENTS_WHL_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0whl_wheels.txt"
57+
REQUIREMENTS_WHL_313: "requir.64-3_13_11_1whl_wheelsb0.txt"
58+
REQUIREMENTS_WHL_314: "requir.64-3_14_2_1whl_wheelsb0.txt"
5859
REQUIREMENTS_WHL_315: ""
5960
formats: { zip: false, 7z: true, exe: false }
6061
PANDOC: "0"
6162
WINPYARCHDET: "64"
6263
- name: "free"
6364
REQUIREMENTS_313: ""
64-
REQUIREMENTS_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0free.txt"
65+
REQUIREMENTS_314: "requir.64-3_14_2_1freeb0.txt"
6566
REQUIREMENTS_315: ""
6667
REQUIREMENTS_WHL_313: ""
6768
REQUIREMENTS_WHL_314: ""
@@ -71,7 +72,7 @@ jobs:
7172
WINPYARCHDET: "64F"
7273
- name: "slimf"
7374
REQUIREMENTS_313: ""
74-
REQUIREMENTS_314: "winpython\\portable\\cycle_2025_05\\requir.64-3_14_2_0slimf.txt"
75+
REQUIREMENTS_314: "requir.64-3_14_2_1slimfb0.txt"
7576
REQUIREMENTS_315: ""
7677
REQUIREMENTS_WHL_313: ""
7778
REQUIREMENTS_WHL_314: ""
@@ -97,25 +98,25 @@ jobs:
9798
case "${{ github.event.inputs.python_versionf }}" in
9899
"3.13")
99100
echo "ver2=3.13.11.1" >> $GITHUB_OUTPUT
100-
echo "v_tag=3_13_11_" >> $GITHUB_OUTPUT
101+
echo "v_tag=3_13_11_1" >> $GITHUB_OUTPUT
101102
echo "src=https://github.com/astral-sh/python-build-standalone/releases/download/20251205/cpython-3.13.11+20251205-x86_64-pc-windows-msvc-install_only_stripped.tar.gz" >> $GITHUB_OUTPUT
102103
echo "sha=d8a2b5e05ef71fc71f048a6f409d69b940bc5d33da8b112611cfba68fc5b86c3" >> $GITHUB_OUTPUT
103104
;;
104105
"3.14")
105106
echo "ver2=3.14.2.1" >> $GITHUB_OUTPUT
106-
echo "v_tag=3_14_2_" >> $GITHUB_OUTPUT
107+
echo "v_tag=3_14_2_1" >> $GITHUB_OUTPUT
107108
echo "src=https://github.com/astral-sh/python-build-standalone/releases/download/20251205/cpython-3.14.2+20251205-x86_64-pc-windows-msvc-install_only_stripped.tar.gz" >> $GITHUB_OUTPUT
108109
echo "sha=512744d8a86dc6042a712035ada5d87c5e2ce4218f5dbdc74d039cee46e76fb4" >> $GITHUB_OUTPUT
109110
;;
110111
"3.14F")
111112
echo "ver2=3.14.2.1" >> $GITHUB_OUTPUT
112-
echo "v_tag=3_14_2_" >> $GITHUB_OUTPUT
113+
echo "v_tag=3_14_2_1" >> $GITHUB_OUTPUT
113114
echo "src=https://github.com/astral-sh/python-build-standalone/releases/download/20251205/cpython-3.14.2+20251205-x86_64-pc-windows-msvc-freethreaded+pgo-full.tar.zst" >> $GITHUB_OUTPUT
114115
echo "sha=536cf813857ea566fcfae18a1b7dbcd185385f1dc1f04d5a0951bad235c8fc61" >> $GITHUB_OUTPUT
115116
;;
116117
"3.15")
117118
echo "ver2=3.15.0.1" >> $GITHUB_OUTPUT
118-
echo "v_tag=3_15_0_" >> $GITHUB_OUTPUT
119+
echo "v_tag=3_15_0_1" >> $GITHUB_OUTPUT
119120
echo "src=https://github.com/astral-sh/python-build-standalone/releases/download/20251217/cpython-3.15.0a3+20251217-x86_64-pc-windows-msvc-install_only_stripped.tar.gz" >> $GITHUB_OUTPUT
120121
echo "sha=4cac37170050bb402eaabad84e7ceb4679ec8ffaf43fbea71d62651ca761dcd7" >> $GITHUB_OUTPUT
121122
;;
@@ -127,6 +128,8 @@ jobs:
127128
PYTHON_VERSIONF: ${{ env.PYTHON_VERSIONF }}
128129
WINPYARCHDET: ${{ env.WINPYARCHDET }}
129130
WINPYVER2: ${{ steps.python_config.outputs.ver2 }}
131+
my_cycle: ${{ env.my_cycle }}
132+
V_TAG: ${{ steps.python_config.outputs.v_tag }}
130133
FLAVOR_NAME: ${{ matrix.flavor.name }}
131134
run: |
132135
PYTHON_VERSION="${PYTHON_VERSIONF%F}" # remove trailing F if present
@@ -145,14 +148,19 @@ jobs:
145148
146149
# Populate generic per-flavor / per-version selections using matrix-expanded values
147150
if [ "$PYTHON_VERSION" = "3.13" ]; then
148-
echo "WINPYREQUIREMENTS=${{ matrix.flavor.REQUIREMENTS_313 }}" >> $GITHUB_ENV
149-
echo "WINPYREQUIREMENTSwhl=${{ matrix.flavor.REQUIREMENTS_WHL_313 }}" >> $GITHUB_ENV
151+
echo "WINPYREQUIREMENTS=$my_cycle/${{ matrix.flavor.REQUIREMENTS_313 }}" >> $GITHUB_ENV
152+
echo "WINPYREQUIREMENTSwhl=$my_cycle/${{ matrix.flavor.REQUIREMENTS_WHL_313 }}" >> $GITHUB_ENV
150153
elif [ "$PYTHON_VERSION" = "3.14" ] && [ "$WINPYARCHDET" = "$detected_arch" ]; then
151-
echo "WINPYREQUIREMENTS=${{ matrix.flavor.REQUIREMENTS_314 }}" >> $GITHUB_ENV
152-
echo "WINPYREQUIREMENTSwhl=${{ matrix.flavor.REQUIREMENTS_WHL_314 }}" >> $GITHUB_ENV
154+
echo "WINPYREQUIREMENTS=$my_cycle/${{ matrix.flavor.REQUIREMENTS_314 }}" >> $GITHUB_ENV
155+
echo "WINPYREQUIREMENTSwhl=$my_cycle/${{ matrix.flavor.REQUIREMENTS_WHL_314 }}" >> $GITHUB_ENV
153156
elif [ "$PYTHON_VERSION" = "3.15" ]; then
154-
echo "WINPYREQUIREMENTS=${{ matrix.flavor.REQUIREMENTS_315 }}" >> $GITHUB_ENV
155-
echo "WINPYREQUIREMENTSwhl=${{ matrix.flavor.REQUIREMENTS_WHL_315 }}" >> $GITHUB_ENV
157+
echo "WINPYREQUIREMENTS=$my_cycle/${{ matrix.flavor.REQUIREMENTS_315 }}" >> $GITHUB_ENV
158+
echo "WINPYREQUIREMENTSwhl=$my_cycle/${{ matrix.flavor.REQUIREMENTS_WHL_315 }}" >> $GITHUB_ENV
159+
$test = "$my_cycle/requir.64-$vtag" + "$FLAVOR_NAME" + ".txt"
160+
echo "WINPYREQUIREMENTS=$test"
161+
if [[ -f "$test" ]]; then
162+
echo "Found $test"
163+
fi
156164
fi
157165
158166
# write common flavor env vars derived here rather than in the job env block

‎winpython/portable/cycle_2026_01/pylock.64-3_13_11_1dotb0.toml‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
lock-version = "1.0"
2+
created-by = "pip"
3+
4+
[[packages]]
5+
name = "build"
6+
version = "1.3.0"
7+
8+
[[packages.wheels]]
9+
name = "build-1.3.0-py3-none-any.whl"
10+
url = "https://files.pythonhosted.org/packages/cb/8c/2b30c12155ad8de0cf641d76a8b396a16d2c36bc6d50b621a62b7c4567c1/build-1.3.0-py3-none-any.whl"
11+
12+
[packages.wheels.hashes]
13+
sha256 = "7145f0b5061ba90a1500d60bd1b13ca0a8a4cebdd0cc16ed8adf1c0e739f43b4"
14+
15+
[[packages]]
16+
name = "colorama"
17+
version = "0.4.6"
18+
19+
[[packages.wheels]]
20+
name = "colorama-0.4.6-py2.py3-none-any.whl"
21+
url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl"
22+
23+
[packages.wheels.hashes]
24+
sha256 = "4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"
25+
26+
[[packages]]
27+
name = "packaging"
28+
version = "25.0"
29+
30+
[[packages.wheels]]
31+
name = "packaging-25.0-py3-none-any.whl"
32+
url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl"
33+
34+
[packages.wheels.hashes]
35+
sha256 = "29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484"
36+
37+
[[packages]]
38+
name = "pyproject-hooks"
39+
version = "1.2.0"
40+
41+
[[packages.wheels]]
42+
name = "pyproject_hooks-1.2.0-py3-none-any.whl"
43+
url = "https://files.pythonhosted.org/packages/bd/24/12818598c362d7f300f18e74db45963dbcb85150324092410c8b49405e42/pyproject_hooks-1.2.0-py3-none-any.whl"
44+
45+
[packages.wheels.hashes]
46+
sha256 = "9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913"
47+
48+
[[packages]]
49+
name = "setuptools"
50+
version = "80.9.0"
51+
52+
[[packages.wheels]]
53+
name = "setuptools-80.9.0-py3-none-any.whl"
54+
url = "https://files.pythonhosted.org/packages/a3/dc/17031897dae0efacfea57dfd3a82fdd2a2aeb58e0ff71b77b87e44edc772/setuptools-80.9.0-py3-none-any.whl"
55+
56+
[packages.wheels.hashes]
57+
sha256 = "062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922"
58+
59+
[[packages]]
60+
name = "sqlite-bro"
61+
version = "0.13.1"
62+
63+
[[packages.wheels]]
64+
name = "sqlite_bro-0.13.1-py3-none-any.whl"
65+
url = "https://files.pythonhosted.org/packages/2a/b3/81b91f5b26fff329c59dbf826a87637bd51d1903120427912322f86e7d33/sqlite_bro-0.13.1-py3-none-any.whl"
66+
67+
[packages.wheels.hashes]
68+
sha256 = "c26033b0af133049ca578b5fd30b2372f002e7ff934b39774aa4d2da7638c23d"
69+
70+
[[packages]]
71+
name = "sv-ttk"
72+
version = "2.6.0"
73+
74+
[[packages.wheels]]
75+
name = "sv_ttk-2.6.0-py3-none-any.whl"
76+
url = "https://files.pythonhosted.org/packages/0f/3d/be0abc3202e90f282ad465f4e7c6e41bc8dce810ce5d1611566a1e7dfba8/sv_ttk-2.6.0-py3-none-any.whl"
77+
78+
[packages.wheels.hashes]
79+
sha256 = "4319c52edf2e14732fe84bdc9788e26f9e9a1ad79451ec0f89f0120ffc8105d9"
80+
81+
[[packages]]
82+
name = "wheel"
83+
version = "0.45.1"
84+
85+
[[packages.wheels]]
86+
name = "wheel-0.45.1-py3-none-any.whl"
87+
url = "https://files.pythonhosted.org/packages/0b/2c/87f3254fd8ffd29e4c02732eee68a83a1d3c346ae39bc6822dcbcb697f2b/wheel-0.45.1-py3-none-any.whl"
88+
89+
[packages.wheels.hashes]
90+
sha256 = "708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248"
91+
92+
[[packages]]
93+
name = "wppm"
94+
version = "17.2.20250823"
95+
96+
[[packages.wheels]]
97+
name = "wppm-17.2.20250823-py3-none-any.whl"
98+
url = "https://files.pythonhosted.org/packages/ae/a9/2581cc7f91354eada41367bf68b91b1b7fba6cb6fb469f500dbaf6191539/wppm-17.2.20250823-py3-none-any.whl"
99+
100+
[packages.wheels.hashes]
101+
sha256 = "0945411b12eaf6da134a9d8662a4afb2b25e129dd34fc2f6ef76ee62d61411c3"

0 commit comments

Comments
 (0)