Merge branch 'main' into what-snew

Author: StanFromIreland

.github/workflows/build-release.yml

@@ -322,5 +322,6 @@ jobs:
 
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
+          name: ios
           path: cross-build/dist/*
           if-no-files-found: error

release.py

@@ -193,7 +193,9 @@ def normalized(self) -> str:
 
     @property
     def branch(self) -> str:
-        return "main" if self.is_alpha_release else f"{self.major}.{self.minor}"
+        if self.is_alpha_release or self.is_feature_freeze_release:
+            return "main"
+        return f"{self.major}.{self.minor}"
 
     @property
     def is_alpha_release(self) -> bool:

requirements.txt

@@ -969,8 +969,8 @@ typing-extensions==4.15.0 \
 typing-inspection==0.4.2 \
     --hash=sha256:4ed1cacbdc298c220f1bd249ed5287caa16f34d44ef4e9c3d0cbad5b521545e7
     # via pydantic
-urllib3==2.6.3 \
-    --hash=sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4
+urllib3==2.7.0 \
+    --hash=sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897
     # via
     #   requests
     #   tuf

run_release.py

@@ -601,6 +601,10 @@ def wait_for_build_release(db: ReleaseShelf) -> None:
             downloads_path / f"python-{release_tag}-{arch}-linux-android.tar.gz"
             for arch in ["aarch64", "x86_64"]
         ]
+    if release_tag.as_tuple() >= (3, 15):
+        wait_for_paths.append(
+            downloads_path / f"python-{release_tag}-iOS-XCframework.tar.gz"
+        )
     if should_wait_for_docs:
         docs_path = release_path / "docs"
         docs_path.mkdir(parents=True, exist_ok=True)
@@ -1142,8 +1146,13 @@ def post_release_tagging(db: ReleaseShelf) -> None:
         cwd=db["git_repo"],
     )
 
+    if release_tag.is_feature_freeze_release:
+        checkout_branch = release_tag.basic_version
+    else:
+        checkout_branch = release_tag.branch
+
     subprocess.check_call(
-        ["git", "checkout", release_tag.branch],
+        ["git", "checkout", checkout_branch],
         cwd=db["git_repo"],
     )
 
@@ -1219,7 +1228,7 @@ def branch_new_versions(db: ReleaseShelf) -> None:
     subprocess.check_call(["git", "checkout", "main"], cwd=db["git_repo"])
 
     subprocess.check_call(
-        ["git", "checkout", "-b", release_tag.branch],
+        ["git", "checkout", "-b", release_tag.basic_version],
         cwd=db["git_repo"],
     )
 

tests/test_release_tag.py

@@ -41,26 +41,31 @@ def test_tag_phase() -> None:
     assert alpha.is_feature_freeze_release is False
     assert alpha.is_release_candidate is False
     assert alpha.is_final is False
+    assert alpha.branch == "main"
 
     assert beta1.is_alpha_release is False
     assert beta1.is_feature_freeze_release is True
     assert beta1.is_release_candidate is False
     assert beta1.is_final is False
+    assert beta1.branch == "main"
 
     assert beta4.is_alpha_release is False
     assert beta4.is_feature_freeze_release is False
     assert beta4.is_release_candidate is False
     assert beta4.is_final is False
+    assert beta4.branch == "3.13"
 
     assert rc.is_alpha_release is False
     assert rc.is_feature_freeze_release is False
     assert rc.is_release_candidate is True
     assert rc.is_final is False
+    assert rc.branch == "3.13"
 
     assert final.is_alpha_release is False
     assert final.is_feature_freeze_release is False
     assert final.is_release_candidate is False
     assert final.is_final is True
+    assert final.branch == "3.13"
 
 
 def test_tag_committed_at_not_found() -> None:

tests/test_run_release.py

@@ -59,7 +59,9 @@ def test_invalid_extract_github_owner() -> None:
     [
         # Success cases
         ("3.15.0rc1", "3.15\n", does_not_raise()),
-        ("3.15.0b1", "3.15\n", does_not_raise()),
+        ("3.15.0b3", "3.15\n", does_not_raise()),
+        ("3.15.0b2", "3.15\n", does_not_raise()),
+        ("3.15.0b1", "main\n", does_not_raise()),
         ("3.15.0a6", "main\n", does_not_raise()),
         ("3.14.3", "3.14\n", does_not_raise()),
         ("3.13.12", "3.13\n", does_not_raise()),
@@ -71,8 +73,8 @@ def test_invalid_extract_github_owner() -> None:
         ),
         (
             "3.15.0b1",
-            "main\n",
-            pytest.raises(ReleaseException, match="on main branch, expected 3.15"),
+            "3.15\n",
+            pytest.raises(ReleaseException, match="on 3.15 branch, expected main"),
         ),
         (
             "3.15.0a6",

windows-release/tcltk-build.yml

@@ -1,18 +1,18 @@
 parameters:
-- name: TclSourceTag
-  displayName: 'Tcl Source Tag'
+- name: TclVersion
+  displayName: 'Tcl Version'
   type: string
-- name: TkSourceTag
-  displayName: 'Tk Source Tag'
+- name: TkVersion
+  displayName: 'Tk Version'
+  type: string
+- name: TclTagPrefix
+  displayName: 'Tcl source tag prefix'
   type: string
-- name: IncludeTix
-  displayName: 'Include Tix (pre-3.13)'
-  type: boolean
-  default: false
-- name: TixSourceTag
-  displayName: 'Tix Source Tag'
+  default: 'tcl-'
+- name: TkTagPrefix
+  displayName: 'Tk source tag prefix'
   type: string
-  default: tix-8.4.3.6
+  default: 'tk-'
 - name: SigningCertificate
   displayName: "Code signing certificate"
   type: string
@@ -27,7 +27,7 @@ parameters:
   default: 'https://github.com/python/cpython-source-deps'
 
 
-name: tcltk$(TkSourceTag)_$(Date:yyyyMMdd)$(Rev:.rr)
+name: tcltk$(TkVersion)_$(Date:yyyyMMdd)$(Rev:.rr)
 
 
 resources:
@@ -52,15 +52,17 @@ variables:
 - name: Configuration
   value: 'Release'
 - name: SigningDescription
-  value: 'Tcl/Tk for Python (${{ parameters.TclSourceTag }})'
+  value: 'Tcl/Tk for Python (${{ parameters.TkVersion }})'
 - name: SourcesRepo
   value: ${{ parameters.SourcesRepo }}
+- name: TclVersion
+  value: ${{ parameters.TclVersion }}
+- name: TkVersion
+  value: ${{ parameters.TkVersion }}
 - name: TclSourceTag
-  value: ${{ parameters.TclSourceTag }}
+  value: ${{ parameters.TclTagPrefix }}${{ parameters.TclVersion }}
 - name: TkSourceTag
-  value: ${{ parameters.TkSourceTag }}
-- name: TixSourceTag
-  value: ${{ parameters.TixSourceTag }}
+  value: ${{ parameters.TkTagPrefix }}${{ parameters.TkVersion }}
 
 
 jobs:
@@ -85,19 +87,15 @@ jobs:
         git clone $(SourcesRepo) -b $(TkSourceTag) --depth 1 "$(ExternalsDir)\$(TkSourceTag)"
       displayName: 'Check out Tk sources'
 
-    - ${{ if eq(parameters.IncludeTix, 'true') }}:
-      - powershell: |
-          git clone $(SourcesRepo) -b $(TixSourceTag) --depth 1 "$(ExternalsDir)\$(TixSourceTag)"
-        displayName: 'Check out Tix sources'
-
     # This msbuild.rsp file will be used by the build to forcibly override these variables
     - powershell: |
         del -Force -EA 0 msbuild.rsp
         "/p:IntDir=$(IntDir)\" >> msbuild.rsp
         "/p:ExternalsDir=$(ExternalsDir)\" >> msbuild.rsp
         "/p:tclDir=$(ExternalsDir)\$(TclSourceTag)\" >> msbuild.rsp
         "/p:tkDir=$(ExternalsDir)\$(TkSourceTag)\" >> msbuild.rsp
-        "/p:tixDir=$(ExternalsDir)\$(TixSourceTag)\" >> msbuild.rsp
+        "/p:TclVersion=$(TclVersion)" >> msbuild.rsp
+        "/p:TkVersion=$(TkVersion)" >> msbuild.rsp
       displayName: 'Generate msbuild.rsp'
 
     - powershell: |
@@ -115,13 +113,6 @@ jobs:
         & "$(msbuild)" cpython\PCbuild\tk.vcxproj  "@msbuild.rsp" /p:Platform=ARM64 /p:tcltkDir="$(OutDir)\arm64"
       displayName: 'Build for arm64'
 
-    - ${{ if eq(parameters.IncludeTix, 'true') }}:
-      - powershell: |
-          & "$(msbuild)" cpython\PCbuild\tix.vcxproj "@msbuild.rsp" /p:Platform=Win32 /p:tcltkDir="$(OutDir)\win32"
-          & "$(msbuild)" cpython\PCbuild\tix.vcxproj "@msbuild.rsp" /p:Platform=x64 /p:tcltkDir="$(OutDir)\amd64"
-          & "$(msbuild)" cpython\PCbuild\tix.vcxproj "@msbuild.rsp" /p:Platform=ARM64 /p:tcltkDir="$(OutDir)\arm64"
-        displayName: 'Build Tix'
-
     - ${{ if ne(parameters.SigningCertificate, 'Unsigned') }}:
       - template: sign-files.yml
         parameters: