Skip to content

Commit 915286f

Browse files
AA-TurnerAA-Turner
authored
Merge branch 'main' into sha256-release-pydotorg
2 parents 8537b09 + f2ff07c commit 915286f

File tree

12 files changed

+33
-157
lines changed

12 files changed

+33
-157
lines changed

‎.github/workflows/build-release.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ permissions: {}
4343
# Set from inputs for workflow_dispatch, or set defaults to test push/PR events
4444
env:
4545
GIT_REMOTE: ${{ github.event.inputs.git_remote || 'python' }}
46-
GIT_COMMIT: ${{ github.event.inputs.git_commit || 'ebf955df7a89ed0c7968f79faec1de49f61ed7cb' }}
47-
CPYTHON_RELEASE: ${{ github.event.inputs.cpython_release || '3.14.0' }}
46+
GIT_COMMIT: ${{ github.event.inputs.git_commit || 'df793163d5821791d4e7caf88885a2c11a107986' }}
47+
CPYTHON_RELEASE: ${{ github.event.inputs.cpython_release || '3.14.2' }}
4848

4949
jobs:
5050
verify-input:
@@ -61,12 +61,12 @@ jobs:
6161
echo "cpython_release: $CPYTHON_RELEASE"
6262
6363
- name: "Checkout python/release-tools"
64-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
64+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
6565
with:
6666
persist-credentials: false
6767

6868
- name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
69-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
69+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
7070
with:
7171
persist-credentials: false
7272
repository: "${{ env.GIT_REMOTE }}/cpython"
@@ -81,7 +81,7 @@ jobs:
8181
fi
8282
8383
- name: "Setup Python"
84-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
84+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
8585
with:
8686
python-version: 3.12
8787

@@ -97,20 +97,20 @@ jobs:
9797
- verify-input
9898
steps:
9999
- name: "Checkout python/release-tools"
100-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
100+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
101101
with:
102102
persist-credentials: false
103103

104104
- name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
105-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
105+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
106106
with:
107107
persist-credentials: false
108108
repository: "${{ env.GIT_REMOTE }}/cpython"
109109
ref: "v${{ env.CPYTHON_RELEASE }}"
110110
path: "cpython"
111111

112112
- name: "Setup Python"
113-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
113+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
114114
with:
115115
python-version: 3.12
116116

@@ -139,14 +139,14 @@ jobs:
139139
if: fromJSON(needs.verify-input.outputs.build-docs)
140140
steps:
141141
- name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
142-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
142+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
143143
with:
144144
persist-credentials: false
145145
repository: "${{ env.GIT_REMOTE }}/cpython"
146146
ref: "v${{ env.CPYTHON_RELEASE }}"
147147

148148
- name: "Setup Python"
149-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
149+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
150150
with:
151151
python-version: 3.12
152152

@@ -217,7 +217,7 @@ jobs:
217217
triplet: ${{ matrix.arch }}-linux-android
218218
steps:
219219
- name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
220-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
220+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
221221
with:
222222
persist-credentials: false
223223
repository: "${{ env.GIT_REMOTE }}/cpython"

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6.0.0
1717
with:
1818
persist-credentials: false
19-
- uses: actions/setup-python@v6
19+
- uses: actions/setup-python@v6.1.0
2020
with:
2121
python-version: "3.x"
2222
cache: pip

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
python-version: ["3.12", "3.13"]
1818
os: [macos-latest, ubuntu-latest]
1919
steps:
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2121
with:
2222
persist-credentials: false
23-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
23+
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
cache: pip

‎add_to_pydotorg.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def run_cmd(
9393
}
9494

9595

96-
def macos_universal2_description(version: tuple[int, int, int]) -> str:
96+
def macos_description(version: tuple[int, int, int]) -> str:
9797
if version >= (3, 14):
9898
return "for macOS 10.15 and later"
9999
elif version >= (3, 12, 6):
@@ -173,10 +173,10 @@ def get_file_descriptions(
173173
(
174174
rx(r"-macos(x)?1[1-9](\.[0-9]*)?\.pkg$"),
175175
(
176-
"macOS 64-bit universal2 installer",
176+
"macOS installer",
177177
"macos",
178178
True,
179-
macos_universal2_description(v),
179+
macos_description(v),
180180
),
181181
),
182182
(

‎dev-requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,9 +505,9 @@ propcache==0.2.1 \
505505
# via
506506
# aiohttp
507507
# yarl
508-
pyfakefs==5.10.1 \
509-
--hash=sha256:2e752d2e05e77add0759bb17efb1418060c176e8c06399c8258ca49377ab5b20 \
510-
--hash=sha256:4d76c481ba47d5e09d7a32519e837bcbd36f0e2bd7bc09ea75e633167665a4e5
508+
pyfakefs==5.10.2 \
509+
--hash=sha256:6ff0e84653a71efc6a73f9ee839c3141e3a7cdf4e1fb97666f82ac5b24308d64 \
510+
--hash=sha256:8ae0e5421e08de4e433853a4609a06a1835f4bc2a3ce13b54f36713a897474ba
511511
# via -r dev-requirements.in
512512
pygments==2.19.2 \
513513
--hash=sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887 \

‎mypy-requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aiohttp==3.13.2
22
alive_progress>=3.3.0
3-
mypy==1.18.2
3+
mypy==1.19.0
44
pyfakefs
55
pytest
66
pytest-mock

‎release.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ def make_tag(tag: Tag, *, sign_gpg: bool = True) -> bool:
771771
if tag.patch > 0:
772772
if (
773773
get_output(["git", "name-rev", "--name-only", "HEAD"]).strip().decode()
774-
!= tag.basic_version
774+
!= f"branch-{tag}"
775775
):
776776
print("It doesn't look like you're on the correct branch.")
777777
if input("Are you sure you want to tag? (y/n) > ").lower() not in (

‎requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -854,8 +854,8 @@ typing-extensions==4.12.2 \
854854
# pydantic
855855
# pydantic-core
856856
# pyopenssl
857-
urllib3==2.5.0 \
858-
--hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
857+
urllib3==2.6.0 \
858+
--hash=sha256:c90f7a39f716c572c4e3e58509581ebd83f9b59cced005b7db7ad2d22b0db99f
859859
# via
860860
# requests
861861
# tuf

‎run_release.py‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import argparse
1010
import asyncio
1111
import contextlib
12-
import datetime as dt
1312
import functools
1413
import getpass
1514
import json
@@ -922,9 +921,6 @@ def start_build_release(db: ReleaseShelf) -> None:
922921
print(
923922
f"Go to https://github.com/{origin_remote_github_owner}/cpython/commit/{commit_sha}"
924923
)
925-
print(
926-
"- Ensure that there is no warning that the commit does not belong to this repository."
927-
)
928924
print("- Ensure that the commit diff does not contain any unexpected changes.")
929925
print(
930926
"- For the next step, ensure the commit SHA matches the one you verified on GitHub in this step."
@@ -1110,38 +1106,6 @@ def purge_the_cdn(db: ReleaseShelf) -> None:
11101106
raise RuntimeError("Failed to purge the python.org/downloads CDN")
11111107

11121108

1113-
def modify_the_prereleases_page(db: ReleaseShelf) -> None:
1114-
if db["release"].is_final:
1115-
if not ask_question(
1116-
"Have you already removed the release from https://www.python.org/download/pre-releases/ ?"
1117-
):
1118-
raise ReleaseException(
1119-
"The release has not been removed from the pre-releases page"
1120-
)
1121-
else:
1122-
if not ask_question(
1123-
"Have you already added the release to https://www.python.org/download/pre-releases/ ?"
1124-
):
1125-
raise ReleaseException(
1126-
"The release has not been added to the pre-releases page"
1127-
)
1128-
1129-
1130-
def modify_the_docs_by_version_page(db: ReleaseShelf) -> None:
1131-
if db["release"].is_final:
1132-
version = db["release"]
1133-
date = dt.datetime.now().strftime("%d %B %Y")
1134-
if not ask_question(
1135-
"Have you already added the docs to https://www.python.org/doc/versions/ ?\n"
1136-
"For example:\n"
1137-
f"* `Python {version} <https://docs.python.org/release/{version}/>`_, "
1138-
f"documentation released on {date}."
1139-
):
1140-
raise ReleaseException(
1141-
"The docs have not been added to the docs by version page"
1142-
)
1143-
1144-
11451109
def announce_release(db: ReleaseShelf) -> None:
11461110
if not ask_question(
11471111
"Have you announced the release at https://discuss.python.org/c/core-dev/23 "
@@ -1478,8 +1442,6 @@ def _api_key(api_key: str) -> str:
14781442
Task(remove_temporary_branch, "Removing temporary release branch"),
14791443
Task(run_add_to_python_dot_org, "Add files to python.org download page"),
14801444
Task(purge_the_cdn, "Purge the CDN of python.org/downloads"),
1481-
Task(modify_the_prereleases_page, "Modify the pre-release page"),
1482-
Task(modify_the_docs_by_version_page, "Update docs by version page"),
14831445
Task(announce_release, "Announce the release"),
14841446
]
14851447
automata = ReleaseDriver(

‎tests/test_add_to_pydotorg.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,8 @@ def test_minor_version_tuple(release: str, expected: tuple[int, int]) -> None:
143143
((3, 14, 0), "for macOS 10.15 and later"),
144144
],
145145
)
146-
def test_macos_universal2_description(
147-
release: tuple[int, int, int], expected: str
148-
) -> None:
149-
assert add_to_pydotorg.macos_universal2_description(release) == expected
146+
def test_macos_description(release: tuple[int, int, int], expected: str) -> None:
147+
assert add_to_pydotorg.macos_description(release) == expected
150148

151149

152150
def test_list_files(fs: FakeFilesystem) -> None:
@@ -215,7 +213,7 @@ def test_list_files(fs: FakeFilesystem) -> None:
215213
),
216214
(
217215
"python-3.14.0b3-macos11.pkg",
218-
"macOS 64-bit universal2 installer",
216+
"macOS installer",
219217
"macos",
220218
True,
221219
"for macOS 10.15 and later",

0 commit comments

Comments
 (0)