Merge branch 'master' into b1-source_uri

Author: hugovk

add_to_pydotorg.py

@@ -104,7 +104,15 @@ def get_file_descriptions(
     return [
         (rx(r"\.tgz$"), ("Gzipped source tarball", 3, False, "")),
         (rx(r"\.tar\.xz$"), ("XZ compressed source tarball", 3, True, "")),
-        (rx(r"-webinstall\.exe$"), ("", 0, False, "")),
+        (
+            rx(r"windows-.+\.json"),
+            (
+                "Windows release manifest",
+                1,
+                False,
+                f"Install with 'py install {v[0]}.{v[1]}'",
+            ),
+        ),
         (
             rx(r"-embed-amd64\.zip$"),
             ("Windows embeddable package (64-bit)", 1, False, ""),

dev-requirements.txt

@@ -473,9 +473,9 @@ pytest-cov==6.1.1 \
     --hash=sha256:46935f7aaefba760e716c2ebfbe1c216240b9592966e7da99ea8292d4d3e2a0a \
     --hash=sha256:bddf29ed2d0ab6f4df17b4c55b0a657287db8684af9c42ea546b21b1041b3dde
     # via -r dev-requirements.in
-pytest-mock==3.14.0 \
-    --hash=sha256:0b72c38033392a5f4621342fe11e9219ac11ec9d375f8e2a0c164539e0d70f6f \
-    --hash=sha256:2719255a1efeceadbc056d6bf3df3d1c5015530fb40cf347c0f9afac88410bd0
+pytest-mock==3.14.1 \
+    --hash=sha256:159e9edac4c451ce77a5cdb9fc5d1100708d2dd4ba3c3df572f14097351af80e \
+    --hash=sha256:178aefcd11307d874b4cd3100344e7e2d888d9791a6a1d9bfe90fbc1b74fd1d0
     # via -r dev-requirements.in
 yarl==1.18.3 \
     --hash=sha256:00e5a1fea0fd4f5bfa7440a47eff01d9822a65b4488f7cff83155a0f31a2ecba \

mypy-requirements.txt

@@ -1,6 +1,6 @@
-aiohttp==3.11.18
+aiohttp==3.12.6
 alive_progress  # untyped :(
-mypy==1.15.0
+mypy==1.16.0
 pytest
 pytest-mock
 python-gnupg  # untyped :(

requirements.txt

@@ -792,8 +792,8 @@ python-dateutil==2.9.0.post0 \
 python-gnupg==0.5.4 \
     --hash=sha256:40ce25cde9df29af91fe931ce9df3ce544e14a37f62b13ca878c897217b2de6c
     # via -r requirements.in
-requests==2.32.3 \
-    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
+requests==2.32.4 \
+    --hash=sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c
     # via
     #   id
     #   sigstore

windows-release/azure-pipelines.yml

@@ -228,7 +228,8 @@ stages:
           BuildToPackage: ${{ parameters.BuildToPackage }}
           DoARM64: ${{ parameters.DoARM64}}
           DoFreethreaded: ${{ parameters.DoFreethreaded }}
-          SigningCertificate: ${{ parameters.SigningCertificate }}
+          ${{ if and(parameters.SigningCertificate, ne(parameters.SigningCertificate, 'Unsigned')) }}:
+            SigningCertificate: ${{ parameters.SigningCertificate }}
     - ${{ if eq(parameters.DoMSIX, 'true') }}:
       - template: stage-pack-msix.yml
         parameters:

windows-release/checkout.yml

@@ -35,3 +35,13 @@ steps:
   ${{ if and(parameters.Path, ne(parameters.Path, '.')) }}:
     workingDirectory: ${{ parameters.Path }}
   condition: and(succeeded(), variables['SourceCommit'])
+
+- powershell: |
+    if (-not (Test-Path "Misc\externals.spdx.json")) {
+      "externals.spdx.json is missing - skipping SBOM"
+      Write-Host "##vso[task.setvariable variable=SkipSBOM]1"
+    }
+  displayName: 'Checking for SBOM inputs'
+  ${{ if and(parameters.Path, ne(parameters.Path, '.')) }}:
+    workingDirectory: ${{ parameters.Path }}
+  condition: and(succeeded(), not(variables['SkipSBOM']))

windows-release/stage-layout-embed.yml

@@ -95,6 +95,7 @@ jobs:
 
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: sbom'
+    condition: and(succeeded(), not(variables['SkipSBOM']))
     inputs:
       PathtoPublish: $(Build.ArtifactStagingDirectory)\sbom
       ArtifactName: sbom