Merge branch 'main' into string

Author: mynk8

.github/workflows/prepare-release.yml

@@ -34,3 +34,4 @@ jobs:
           title: Release ${{ inputs.version }}
           body: Update the changelog and the specfile for release ${{ inputs.version }}.
           delete-branch: true
+          token: ${{ secrets.RELEASEBOT_GITHUB_TOKEN }}

.github/workflows/pypi-publish.yml

@@ -5,24 +5,58 @@ name: Publish Python 🐍 distributions 📦 to PyPI
 
 on:
   release:
+    # • `released` reacts to stable releases
+    # • `prereleased` reacts to pre-releases
+    # • `published` reacts to both
     types: [published]
 
 jobs:
-  build-n-publish:
+  build:
+    name: Build distribution 📦
     runs-on: ubuntu-latest
-    permissions:
-      id-token: write # for trusted publishing
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-python@v5
+
+      - name: Get history and tags for SCM versioning to work
+        run: |
+          git fetch --prune --unshallow
+          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
 
       - name: Build a source tarball and a binary wheel
         # https://pypa-build.readthedocs.io
         run: |
           python -m pip install build
           python -m build
 
+      - name: Store the distribution packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-package-distributions
+          path: dist/
+
+  publish:
+    name: Publish Python 🐍 distribution 📦 to PyPI
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/project/specfile/
+    permissions:
+      id-token: write # for trusted publishing
+
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@v4
+        with:
+          name: python-package-distributions
+          path: dist/
+
       - name: Publish 📦 to PyPI
         # https://github.com/pypa/gh-action-pypi-publish
         uses: pypa/gh-action-pypi-publish@release/v1

.pre-commit-config.yaml

@@ -50,7 +50,10 @@ repos:
       - id: mypy
         args: [--show-error-codes, --ignore-missing-imports]
         additional_dependencies:
-          [types-setuptools, types-requests, types-python-dateutil]
+          - types-setuptools
+          - types-requests
+          - types-python-dateutil
+          - typing_extensions
           # This file is overridden by a type stub
         exclude: "specfile/context_management.py"
   - repo: https://github.com/teemtee/tmt.git

specfile/context_management.pyi

@@ -3,7 +3,9 @@
 
 import contextlib
 from collections.abc import Iterator
-from typing import Callable, Generator, ParamSpec, TypeVar
+from typing import Callable, Generator, TypeVar
+
+from typing_extensions import ParamSpec
 
 _T_co = TypeVar("_T_co", covariant=True)
 _P = ParamSpec("_P")