From e6ad188f72151acbf24868a73a8b55b22b19b764 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Sat, 29 Oct 2022 12:13:14 +0200 Subject: [PATCH 1/2] Small build fixes - Remove warning - Add comment - Style fix on comment --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 293d4522b5..b7dc5fb675 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ # Configuration -CPYTHON_PATH := cpython #Current commit for this upstream repo is setted by the submodule +CPYTHON_PATH := cpython # Current commit for this upstream repo is setted by the submodule BRANCH := 3.11 LANGUAGE_TEAM := python-docs-es LANGUAGE := es @@ -40,6 +40,7 @@ help: .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 @@ -48,7 +49,7 @@ build: setup 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 $(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 auto -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"; From c265ebb0fb9ac8ff9b2cc23b51715e90ed668128 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Sat, 29 Oct 2022 12:24:52 +0200 Subject: [PATCH 2/2] Github build --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c7590e3d81..263220aed4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,4 +46,4 @@ jobs: 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 sphinx-build -j auto -W --keep-going -b html -d cpython/Doc/_build/doctree -D language=es . cpython/Doc/_build/html + 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