ci: stabilize GitHub Actions workflows on openSUSE Leap 15.6

- Cleaned up .github/posix-deps-zypp.sh dependencies:
  - Replaced non-existent 'lzma' and 'lzma-devel' with 'xz-devel'.
  - Changed 'uuid-devel' to the standard 'libuuid-devel'.
  - Removed duplicate package declarations (libffi-devel, xvfb-run).
- Reorganized .github/ directory structure:
  - Moved posix-deps-zypp.sh from .github/workflows/ to .github/.
  - Updated build.yml and doc.yml to reference the new path.
- Re-enabled 'generated-files' task:
  - Removed the 'if: false' overrides on the generated files steps.
- Modernized verify-ensurepip-wheels.yml:
  - Upgraded actions versions to checkout@v4 and setup-python@v5.
  - Made the script execution explicitly use python3.

Author: mcepl

.github/posix-deps-zypp.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+set -eu
+
+zypper --non-interactive refresh
+
+# The container can have newer libraries than the repositories' matching -devel
+# packages. Allow the solver to downgrade dependencies rather than cancel.
+# Install build tools explicitly: build patterns pull in a full base system,
+# including packages that conflict with the container's busybox replacements.
+# Python 3.6 needs OpenSSL 1.1 headers rather than Leap's default OpenSSL 3.
+zypper --non-interactive install --auto-agree-with-licenses \
+    --allow-downgrade --no-recommends \
+    autoconf automake gcc gcc-c++ make patch pkg-config python3 \
+    binutils diffutils findutils gdb gzip libtool perl tar which \
+    libabigail-tools xorg-x11-server-Xvfb xvfb-run \
+    cantarell-fonts google-droid-fonts google-inconsolata-fonts dejavu-fonts \
+    libffi-devel \
+    xz-devel \
+    bzip2 \
+    zlib-devel \
+    libbz2-devel \
+    ncurses-devel \
+    readline-devel \
+    sqlite3-devel \
+    libopenssl-1_1-devel \
+    gdbm-devel \
+    tk-devel \
+    libuuid-devel \
+    lcov

.github/workflows/build.yml

@@ -60,7 +60,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Install All Dependencies
-      run: sh -x ./.github/workflows/posix-deps-zypp.sh
+      run: sh -x ./.github/posix-deps-zypp.sh
 
     - name: 'Restore OpenSSL build'
       if: matrix.task == 'build-and-test'
@@ -85,15 +85,13 @@ jobs:
 
     # === Steps for Generated Files Check ===
     - name: Build CPython for Generated Files Check
-      # if: matrix.task == 'generated-files'
-      if: false
+      if: matrix.task == 'generated-files'
       run: |
         ./configure --with-pydebug
         make -j4 regen-all
 
     - name: Check for changes in generated files
-      # if: matrix.task == 'generated-files'
-      if: false
+      if: matrix.task == 'generated-files'
       run: |
         if ! git diff --quiet; then
           echo "Generated files are not up to date. Please run 'make regen-all' and commit the changes."
@@ -103,8 +101,7 @@ jobs:
         fi
 
     - name: Check exported libpython symbols
-      # if: matrix.task == 'generated-files'
-      if: false
+      if: matrix.task == 'generated-files'
       run: make smelly
 
     # === Steps for Full Build and Test ===

.github/workflows/doc.yml

@@ -28,7 +28,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: 'Install Dependencies'
-      run: ./.github/workflows/posix-deps-zypp.sh
+      run: sh ./.github/posix-deps-zypp.sh
       # apt-get install wamerican
 
     - name: 'Configure CPython'

.github/workflows/posix-deps-zypp.sh

@@ -20,9 +20,9 @@ jobs:
   verify:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3'
       - name: Compare checksums of bundled pip and setuptools to ones published on PyPI
-        run: ./Tools/scripts/verify_ensurepip_wheels.py
+        run: python3 ./Tools/scripts/verify_ensurepip_wheels.py

.github/workflows/verify-ensurepip-wheels.yml

@@ -7,7 +7,7 @@
 PYTHON       = python3
 VENVDIR      = ./venv
 SPHINXBUILD  = PATH=$(VENVDIR)/bin:$$PATH sphinx-build
-BLURB        = PATH=$(VENVDIR)/bin:$$PATH blurb
+BLURB        = $(VENVDIR)/bin/python3 $(VENVDIR)/blurb.py
 PAPER        =
 SOURCES      =
 DISTVERSION  = $(shell $(PYTHON) tools/extensions/patchlevel.py)
@@ -49,7 +49,6 @@ build:
 		cp ../Misc/NEWS build/NEWS; \
 	elif [ -d ../Misc/NEWS.d ]; then \
 		echo "Building NEWS from Misc/NEWS.d with blurb"; \
-		$(BLURB) --version; \
 		$(BLURB) merge -f build/NEWS; \
 	else \
 		echo "Neither Misc/NEWS.d nor Misc/NEWS found; cannot build docs"; \
@@ -124,8 +123,10 @@ clean:
 
 venv:
 	$(PYTHON) -m venv $(VENVDIR)
-	$(VENVDIR)/bin/python3 -m pip install -U Sphinx==2.3.1 \
-		git+https://github.com/python/blurb.git@3696908d9621d284837715d6f1db7cc167be7514
+	$(VENVDIR)/bin/python3 -m pip install -r requirements.txt
+	# Patch a private copy, leaving the installed package unchanged.
+	cp "$$($(VENVDIR)/bin/python3 -c 'import blurb; print(blurb.__file__)')" $(VENVDIR)/blurb.py
+	patch --batch $(VENVDIR)/blurb.py tools/blurb-gh-issues.patch
 	@echo "The venv has been created in the $(VENVDIR) directory"
 
 dist:

Doc/Makefile

@@ -39,9 +39,21 @@ build the HTML output files::
 
   make html
 
-By default, if the virtual environment is not created, the Makefile will
-look for instances of sphinxbuild and blurb installed on your process PATH
-(configurable with the SPHINXBUILD and BLURB variables).
+This branch pins the Python tools in ``requirements.txt`` for Python 3.6.
+The ``venv`` target also requires GNU ``patch``. It copies blurb 1.0.7 to
+``venv/blurb.py`` and applies ``tools/blurb-gh-issues.patch`` to that private
+copy so NEWS generation accepts both Roundup and GitHub issue numbers.
+The installed blurb package and NEWS fragments are not modified. Repeating
+``make venv`` recreates the patched copy from the installed package.
+
+The Makefile looks for Sphinx in the virtual environment and then on PATH.
+It uses the private blurb copy by default. Override ``SPHINXBUILD`` or ``BLURB``
+to use other tools; an external blurb must support GitHub issue entries.
+
+To run the documentation-tool regression tests::
+
+  venv/bin/python3 tools/test_blurb.py
+  venv/bin/python3 tools/test_extensions.py
 
 On Windows, we try to emulate the Makefile as closely as possible with a
 ``make.bat`` file. If you need to specify the Python interpreter to use,

Doc/README.rst

@@ -491,7 +491,7 @@ be finalized; only the internally used file object will be closed. See the
       Return an :class:`io.BufferedReader` object.
 
 .. attribute:: TarFile.errorlevel
-   :type: int
+   :annotation: : int
 
    If *errorlevel* is ``0``, errors are ignored when using :meth:`TarFile.extract`
    and :meth:`TarFile.extractall`.
@@ -676,19 +676,19 @@ A ``TarInfo`` object has the following public data attributes:
 
 
 .. attribute:: TarInfo.name
-   :type: str
+   :annotation: : str
 
    Name of the archive member.
 
 
 .. attribute:: TarInfo.size
-   :type: int
+   :annotation: : int
 
    Size in bytes.
 
 
 .. attribute:: TarInfo.mtime
-   :type: int | float
+   :annotation: : int | float
 
    Time of last modification in seconds since the :ref:`epoch <epoch>`,
    as in :attr:`os.stat_result.st_mtime`.
@@ -700,7 +700,7 @@ A ``TarInfo`` object has the following public data attributes:
       attribute.
 
 .. attribute:: TarInfo.mode
-   :type: int
+   :annotation: : int
 
    Permission bits, as for :func:`os.chmod`.
 
@@ -720,14 +720,14 @@ A ``TarInfo`` object has the following public data attributes:
 
 
 .. attribute:: TarInfo.linkname
-   :type: str
+   :annotation: : str
 
    Name of the target file name, which is only present in :class:`TarInfo` objects
    of type :const:`LNKTYPE` and :const:`SYMTYPE`.
 
 
 .. attribute:: TarInfo.uid
-   :type: int
+   :annotation: : int
 
    User ID of the user who originally stored this member.
 
@@ -738,7 +738,7 @@ A ``TarInfo`` object has the following public data attributes:
       attribute.
 
 .. attribute:: TarInfo.gid
-   :type: int
+   :annotation: : int
 
    Group ID of the user who originally stored this member.
 
@@ -749,7 +749,7 @@ A ``TarInfo`` object has the following public data attributes:
       attribute.
 
 .. attribute:: TarInfo.uname
-   :type: str
+   :annotation: : str
 
    User name.
 
@@ -760,7 +760,7 @@ A ``TarInfo`` object has the following public data attributes:
       attribute.
 
 .. attribute:: TarInfo.gname
-   :type: str
+   :annotation: : str
 
    Group name.
 
@@ -771,7 +771,7 @@ A ``TarInfo`` object has the following public data attributes:
       attribute.
 
 .. attribute:: TarInfo.pax_headers
-   :type: dict
+   :annotation: : dict
 
    A dictionary containing key-value pairs of an associated pax extended header.
 

Doc/library/tarfile.rst

@@ -0,0 +1,5 @@
+Sphinx==2.3.1
+blurb==1.0.7
+
+# docutils 0.18's meta node conflicts with Sphinx 2.3.1 under -W.
+docutils==0.15.2

Doc/requirements.txt

@@ -0,0 +1,65 @@
+Backport GitHub issue support for NEWS reading and merging to blurb 1.0.7.
+Based on upstream commit a2e8eeca0c72343fb30e67aaf33a6f0c1db440b1:
+https://github.com/python/blurb/commit/a2e8eeca0c72343fb30e67aaf33a6f0c1db440b1
+
+Keep Python 3.6 and pip 18.1 support. Only the documentation build's private
+copy is patched; the installed blurb package and NEWS fragments are unchanged.
+
+--- a/blurb.py
++++ b/blurb.py
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python3
+ """Command-line tool to manage CPython Misc/NEWS.d entries."""
+-__version__ = "1.0.7"
++__version__ = "1.0.7+gh"
+ 
+ ##
+ ## blurb version 1.0
+@@ -468,7 +468,7 @@
+             if not body:
+                 throw("Blurb 'body' text must not be empty!")
+             text = textwrap_body(body)
+-            for naughty_prefix in ("- ", "Issue #", "bpo-"):
++            for naughty_prefix in ("- ", "Issue #", "bpo-", "gh-", "gh-issue-"):
+                 if text.startswith(naughty_prefix):
+                     throw("Blurb 'body' can't start with " + repr(naughty_prefix) + "!")
+ 
+@@ -481,11 +481,12 @@
+                 elif section not in sections:
+                     throw("Invalid 'section'!  You must use one of the predefined sections.")
+ 
+-            bpo = None
++            issue_kind = 'gh-issue' if 'gh-issue' in metadata else 'bpo'
++            issue_number = metadata.get(issue_kind)
+             try:
+-                bpo = int(metadata.get('bpo'))
++                int(issue_number)
+             except (TypeError, ValueError):
+-                throw("Invalid bpo issue number! (" + repr(bpo) + ")")
++                throw("Invalid " + issue_kind + " issue number! (" + repr(issue_number) + ")")
+ 
+             self.append((metadata, text))
+             metadata = {}
+@@ -568,7 +569,7 @@
+         metadata = {"date": fields[0], "nonce": fields[-2], "section": section}
+ 
+         for field in fields[1:-2]:
+-            for name in ("bpo",):
++            for name in ("gh-issue", "bpo"):
+                 _, got, value = field.partition(name + "-")
+                 if got:
+                     metadata[name] = value.strip()
+@@ -1094,9 +1095,10 @@
+                 print("-" * len(section))
+                 print()
+ 
+-            bpo = metadata['bpo']
+-            if int(bpo):
+-                body = "bpo-" + bpo + ": " + body
++            issue_kind = 'gh-issue' if 'gh-issue' in metadata else 'bpo'
++            issue_number = metadata[issue_kind]
++            if int(issue_number):
++                body = issue_kind + "-" + issue_number + ": " + body
+             body = "- " + body
+             text = textwrap_body(body, subsequent_indent='  ')
+             print(text)