Merge remote-tracking branch 'origin/main' into requests-inline-types

Author: hugovk

.github/workflows/lint.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           python-version: "3.x"
           cache: pip
-      - uses: j178/prek-action@5337cb91e0fa35a7ff31b9ca345126d8bbbcdf16 # v2.0.6
+      - uses: j178/prek-action@4e14d07f9231acabce116ccfca13b13dd9755ece # v3.0.0
 
       - name: Install dependencies
         run: |

mypy-requirements.txt

@@ -1,10 +1,10 @@
 aiohttp==3.14.3
 alive_progress>=3.3.0
-mypy==2.3.0
+mypy==2.3.1
 pyfakefs
 pytest
 pytest-mock
 python-gnupg  # untyped :(
 requests>=2.34
-sigstore==4.4.0
+sigstore==4.5.0
 types-paramiko

requirements.in

@@ -6,4 +6,4 @@ python-gnupg
 aiohttp
 blurb>=1.2.1
 requests>=2.34
-sigstore>=4.4.0
+sigstore>=4.5.0

requirements.txt

@@ -925,8 +925,8 @@ rich==13.9.4 \
 securesystemslib==1.2.0 \
     --hash=sha256:fa63abcb1cf4dba4f2df964f623baa45bc39029980d7a0a2119d90731942afc6
     # via tuf
-sigstore==4.4.0 \
-    --hash=sha256:80c36d08b02479e2a282d0bea93de68fe0d43a93b0d58e4d9ac6bb9f8425957c
+sigstore==4.5.0 \
+    --hash=sha256:f045b207f2e12605cf775ec38e89c5eda625d71ffa7830477db65e47ec2bc8b2
     # via -r requirements.in
 sigstore-models==0.0.6 \
     --hash=sha256:5201a68f4d7d0f8bec1e2f4378eb646b084c52609a4e31db8c385095fff68b2e

run_release.py

@@ -1090,12 +1090,18 @@ def run_add_to_python_dot_org(db: ReleaseShelf) -> None:
     stdin, stdout, stderr = client.exec_command(
         f"AUTH_INFO={auth_info} SIGSTORE_IDENTITY_TOKEN={identity_token} python3 add_to_pydotorg.py {db['release']}"
     )
-    stderr_text = stderr.read().decode()
-    if stderr_text:
-        raise paramiko.SSHException(f"Failed to execute the command: {stderr_text}")
     stdout_text = stdout.read().decode()
+    stderr_text = stderr.read().decode()
+    exit_status = stdout.channel.recv_exit_status()
+    if exit_status != 0:
+        raise paramiko.SSHException(
+            f"Failed to execute the command (exit code {exit_status}): {stderr_text}"
+        )
     print("-- Command output --")
     print(stdout_text)
+    if stderr_text:
+        print("-- Command stderr --")
+        print(stderr_text)
     print("-- End of command output --")
 
 

tests/test_update_version_next.py

@@ -18,6 +18,8 @@
 
 .. deprecated-removed:: next 4.0
 
+.. soft-deprecated:: next
+
 whitespace:
 
 ..   versionchanged:: next

update_version_next.py

@@ -21,7 +21,7 @@
     r"""
         (?P<before>
             \s*\.\.\s+
-            (version(added|changed|removed)|deprecated(-removed)?)
+            (version(added|changed|removed)|deprecated(-removed)?|soft-deprecated)
             \s*::\s*
         )
         next