Merge branch '3.12' into issue-2423

cmaureir · web-flow · commit fe0fb945cbc5 · 2024-11-18T15:02:19.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -77,7 +77,7 @@ jobs:
           diff -Naur TRANSLATORS <(LANG=es python scripts/sort.py < TRANSLATORS)
       - name: Powrap
         if: steps.po-files-to-check.outputs.any_po_files_to_check == 'true'
-        run: powrap --check --quiet ${{ steps.po-files-to-check.outputs.po_files_to_check }}
+        run: powrap --diff --check --quiet ${{ steps.po-files-to-check.outputs.po_files_to_check }}
       - name: Sphinx lint
         if: steps.po-files-to-check.outputs.any_po_files_to_check == 'true'
         run: sphinx-lint ${{ steps.po-files-to-check.outputs.po_files_to_check }}
@@ -88,13 +88,5 @@ jobs:
       # Construcción de la documentación
       - name: Construir documentación
         run: |
-          # FIXME: Relative paths for includes in 'cpython'
-          sed -i -e 's|.. include:: ../includes/wasm-notavail.rst|.. include:: ../../../../includes/wasm-notavail.rst|g' cpython/Doc/**/*.rst
-          sed -i -e 's|.. include:: ../distutils/_setuptools_disclaimer.rst|.. include:: ../../../../distutils/_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
-          sed -i -e 's|.. include:: ./_setuptools_disclaimer.rst|.. include:: ../../../_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
-          sed -i -e 's|.. include:: token-list.inc|.. include:: ../../../token-list.inc|g' cpython/Doc/**/*.rst
-          sed -i -e 's|.. include:: ../../using/venv-create.inc|.. include:: ../using/venv-create.inc|g' cpython/Doc/**/*.rst
-          sed -i -e 's|.. include:: ../../../using/venv-create.inc|.. include:: ../../using/venv-create.inc|g' cpython/Doc/**/*.rst
-          sed -i -e 's|.. include:: /using/venv-create.inc|.. include:: ../../../../using/venv-create.inc|g' cpython/Doc/**/*.rst
           # Normal build
           PYTHONWARNINGS=ignore::FutureWarning,ignore::RuntimeWarning sphinx-build -j auto -W --keep-going -b html -d cpython/Doc/_build/doctree -D language=es . cpython/Doc/_build/html
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
--   repo: https://github.com/JulienPalard/powrap
-    rev: v0.4.0
+-   repo: https://git.afpy.org/AFPy/powrap
+    rev: v1.0.2
     hooks:
     -   id: powrap
 -   repo: local
diff --git a/Makefile b/Makefile
@@ -20,6 +20,7 @@ OUTPUT_DOCTREE      := $(CPYTHON_WORKDIR)/Doc/build/doctree
 OUTPUT_HTML         := $(CPYTHON_WORKDIR)/Doc/build/html
 LOCALE_DIR          := $(CPYTHON_WORKDIR)/locale
 POSPELL_TMP_DIR     := .pospell
+SPHINX_JOBS         := auto
 
 
 .PHONY: help
@@ -38,22 +39,15 @@ help:
 #        before this. If passing SPHINXERRORHANDLING='', warnings will not be
 #        treated as errors, which is good to skip simple Sphinx syntax mistakes.
 .PHONY: build
-build: setup
-	# FIXME: Relative paths for includes in 'cpython'
-	# See more about this at https://github.com/python/python-docs-es/issues/1844
-	sed -i -e 's|.. include:: ../includes/wasm-notavail.rst|.. include:: ../../../../includes/wasm-notavail.rst|g' cpython/Doc/**/*.rst
-	sed -i -e 's|.. include:: ../distutils/_setuptools_disclaimer.rst|.. include:: ../../../../distutils/_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
-	sed -i -e 's|.. include:: ./_setuptools_disclaimer.rst|.. include:: ../../../_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
-	sed -i -e 's|.. include:: token-list.inc|.. include:: ../../../token-list.inc|g' cpython/Doc/**/*.rst
-	sed -i -e 's|.. include:: ../../using/venv-create.inc|.. include:: ../using/venv-create.inc|g' cpython/Doc/**/*.rst
-	sed -i -e 's|.. include:: ../../../using/venv-create.inc|.. include:: ../../using/venv-create.inc|g' cpython/Doc/**/*.rst
-	sed -i -e 's|.. include:: /using/venv-create.inc|.. include:: ../../../../using/venv-create.inc|g' cpython/Doc/**/*.rst
+build: setup do_build
+
+.PHONY: do_build
+do_build:
 	# Normal build
-	PYTHONWARNINGS=ignore::FutureWarning,ignore::RuntimeWarning $(VENV)/bin/sphinx-build -j auto -W --keep-going -b html -d $(OUTPUT_DOCTREE) -D language=$(LANGUAGE) . $(OUTPUT_HTML) && \
+	PYTHONWARNINGS=ignore::FutureWarning,ignore::RuntimeWarning $(VENV)/bin/sphinx-build -j $(SPHINX_JOBS) -W --keep-going -b html -d $(OUTPUT_DOCTREE) -D language=$(LANGUAGE) . $(OUTPUT_HTML) && \
 		echo "Success! Open file://`pwd`/$(OUTPUT_HTML)/index.html, " \
 			"or run 'make serve' to see them in http://localhost:8000";
 
-
 # setup: After running "venv" target, prepare that virtual environment with
 #        a local clone of cpython repository and the translation files.
 #        If the directories exists, only update the cpython repository and
diff --git a/conf.py b/conf.py
@@ -16,6 +16,8 @@
 import sys
 import os
 import time
+from pathlib import Path
+
 sys.path.append(os.path.abspath('cpython/Doc/tools/extensions'))
 sys.path.append(os.path.abspath('cpython/Doc/includes'))
 
@@ -70,7 +72,6 @@
 
 if os.environ.get('SPHINX_GETTEXT') is None:
     # Override all the files from ``.overrides`` directory
-    from pathlib import Path
     overrides_paths = Path('.overrides')
 
     for path in overrides_paths.glob('**/*.*'):
@@ -129,7 +130,7 @@ def add_contributing_banner(app, doctree):
             document.insert(0, banner)
 
     # Change the sourcedir programmatically because Read the Docs always call it with `.`
-    app.srcdir = 'cpython/Doc'
+    app.srcdir = Path(os.getcwd() + '/cpython/Doc')
 
     app.connect('doctree-read', add_contributing_banner)
 
diff --git a/library/re.po b/library/re.po
diff --git a/requirements.txt b/requirements.txt
