From 1ca542811a48114c5d9dce3f33a86cb317483d9e Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Fri, 11 Dec 2020 11:34:50 +0100 Subject: [PATCH 01/17] Simplify Makefile --- Makefile | 160 +++++++++++++++++++++-------------------------- c-api/arg.po | 4 +- requirements.txt | 2 +- 3 files changed, 76 insertions(+), 90 deletions(-) diff --git a/Makefile b/Makefile index 2ea5f117b..faecfffdc 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # # Here is what you can do: # -# - make # Automatically build an html local version +# - make # Automatically build an HTML local version # - make todo # To list remaining tasks # - make verifs # To check for correctness: wrapping, spelling # - make wrap # To check for wrapping @@ -33,12 +33,10 @@ EXCLUDED := whatsnew/ c-api/ # Internal variables UPSTREAM := https://github.com/python/cpython -VENV := $(shell pwd)/venv/ + PYTHON := $(shell which python3) MODE := html POSPELL_TMP_DIR := .pospell/ -WORKTREES := $(VENV)/worktrees/ -WORKTREE := $(WORKTREES)/$(CPYTHON_CURRENT_COMMIT)/ JOBS := auto # Detect OS @@ -59,10 +57,11 @@ else endif .PHONY: all -all: setup - mkdir -p $(WORKTREE)/locales/$(LANGUAGE)/LC_MESSAGES/ - $(CP_CMD) -uv --parents *.po */*.po $(WORKTREE)/locales/$(LANGUAGE)/LC_MESSAGES/ | cut -d"'" -f2 - $(MAKE) -C $(WORKTREE)/Doc/ VENVDIR=$(WORKTREE)/Doc/venv/ PYTHON=$(PYTHON) \ +all: ensure_prerequisites + git -C $(CPYTHON_PATH) checkout $(CPYTHON_CURRENT_COMMIT) + mkdir -p $(CPYTHON_PATH)/locales/$(LANGUAGE)/LC_MESSAGES/ + $(CP_CMD) -uv --parents *.po */*.po $(CPYTHON_PATH)/locales/$(LANGUAGE)/LC_MESSAGES/ | cut -d"'" -f2 + $(MAKE) -C $(CPYTHON_PATH)/Doc/ \ SPHINXOPTS='-qW -j$(JOBS) \ -D locale_dirs=../locales \ -D language=$(LANGUAGE) \ @@ -70,121 +69,108 @@ all: setup -D latex_engine=xelatex \ -D latex_elements.inputenc= \ -D latex_elements.fontenc=' \ - $(MODE) && echo "Build success, open file://$(WORKTREE)/Doc/build/html/index.html or run 'make serve' to see them." - - -.PHONY: setup -setup: venv - echo "Setup the main clone" - if ! [ -d $(CPYTHON_PATH) ]; then \ - git clone --depth 16 --branch $(BRANCH) $(UPSTREAM) $(CPYTHON_PATH); \ + $(MODE) + # Cleanup + git -C $(CPYTHON_PATH) checkout - + rm -fr $(CPYTHON_PATH)/locales/ + # Info + @echo "Build success, open file://$(abspath $(CPYTHON_PATH))/Doc/build/html/index.html or run 'make serve' to see them." + + +.PHONY: ensure_prerequisites +ensure_prerequisites: + @if [ -z $(CPYTHON_PATH) ]; then \ + echo "Your CPYTHON_PATH is empty, please provide one."; \ + exit 1; \ fi - - echo "Setup the current worktree" - if ! [ -d $(WORKTREE) ]; then \ - rm -fr $(WORKTREES); \ - git -C $(CPYTHON_PATH) worktree prune; \ - mkdir -p $(WORKTREES); \ - if [ -n "$(CPYTHON_CURRENT_COMMIT)" ]; \ - then \ - depth=32; \ - while ! git -C $(CPYTHON_PATH) cat-file -e $(CPYTHON_CURRENT_COMMIT); \ - do \ - depth=$$((depth * 2)); \ - git -C $(CPYTHON_PATH) fetch --depth $$depth $(UPSTREAM) $(BRANCH); \ - done \ - else \ - git -C $(CPYTHON_PATH) fetch --depth 1 $(UPSTREAM); \ - fi; \ - git -C $(CPYTHON_PATH) worktree add $(WORKTREE)/ $(CPYTHON_CURRENT_COMMIT); \ - $(MAKE) -C $(WORKTREE)/Doc/ VENVDIR=$(WORKTREE)/Doc/venv/ PYTHON=$(PYTHON) venv; \ + @if ! [ -d $(CPYTHON_PATH) ]; then \ + echo "Building the translation requires a cpython clone."; \ + echo "Please provide the path to a clone using the CPYTHON_PATH variable."; \ + echo "(Currently CPYTHON_PATH is $(CPYTHON_PATH)."; \ + echo "So you may want to run:"; \ + echo ""; \ + echo " git clone $(UPSTREAM) $(CPYTHON_PATH)"; \ + exit 1; \ fi - - -.PHONY: venv -venv: - echo "Setup venv in $(VENV)" - if [ ! -d $(VENV) ]; then $(PYTHON) -m venv --prompt python-docs-fr $(VENV); fi - $(VENV)/bin/python -m pip install -q -r requirements.txt 2> $(VENV)/pip-install.log - if grep -q 'pip install --upgrade pip' $(VENV)/pip-install.log; then \ - $(VENV)/bin/pip install -q --upgrade pip; \ + @if [ -n "$$(git -C $(CPYTHON_PATH) status --porcelain | grep -v locales/)" ]; then \ + echo "Your cpython clone at $(CPYTHON_PATH) is not clean."; \ + echo "In order to avoid breaking things, please clean it first."; \ + exit 1; \ + fi + @if ! (blurb help >/dev/null 2>&1 && sphinx-build --version >/dev/null 2>&1); then \ + echo "You're missing dependencies, please enable a venv and install:"; \ + echo ""; \ + echo " python -m pip install -r requirements.txt -r $(CPYTHON_PATH)/Doc/requirements.txt"; \ + exit 1; \ fi - .PHONY: serve serve: - $(MAKE) -C $(WORKTREE)/Doc/ serve + $(MAKE) -C $(CPYTHON_PATH)/Doc/ serve .PHONY: progress progress: - $(PYTHON) -c 'import sys; print("{:.1%}".format(int(sys.argv[1]) / int(sys.argv[2])))' \ + @$(PYTHON) -c 'import sys; print("{:.1%}".format(int(sys.argv[1]) / int(sys.argv[2])))' \ $(shell msgcat *.po */*.po | msgattrib --translated | grep -c '^msgid') \ $(shell msgcat *.po */*.po | grep -c '^msgid') .PHONY: todo -todo: venv - $(VENV)/bin/potodo --exclude $(VENV) $(EXCLUDED) +todo: ensure_prerequisites + potodo --exclude venv .venv $(EXCLUDED) .PHONY: wrap -wrap: venv - echo "Verify wrapping" - $(VENV)/bin/powrap --check --quiet *.po **/*.po +wrap: ensure_prerequisites + @echo "Verify wrapping" + powrap --check --quiet *.po **/*.po SRCS = $(shell git diff --name-only $(BRANCH) | grep '.po$$') # foo/bar.po => $(POSPELL_TMP_DIR)/foo/bar.po.out DESTS = $(addprefix $(POSPELL_TMP_DIR)/,$(addsuffix .out,$(SRCS))) .PHONY: spell -spell: venv $(DESTS) +spell: ensure_prerequisites $(DESTS) $(POSPELL_TMP_DIR)/%.po.out: %.po dict - echo "Pospell checking $<..." + @echo "Pospell checking $<..." mkdir -p $(@D) - $(VENV)/bin/pospell -p dict -l fr_FR $< && touch $@ + pospell -p dict -l fr_FR $< && touch $@ .PHONY: fuzzy -fuzzy: venv - $(VENV)/bin/potodo -f --exclude $(VENV) $(EXCLUDED) +fuzzy: ensure_prerequisites + potodo -f --exclude venv .venv $(EXCLUDED) .PHONY: verifs verifs: wrap spell .PHONY: merge -merge: setup - echo "Merge from $(UPSTREAM)" - git -C $(CPYTHON_PATH) fetch $(UPSTREAM) - rm -fr $(WORKTREES)/$(BRANCH) - git -C $(CPYTHON_PATH) worktree prune - git -C $(CPYTHON_PATH) worktree add $(WORKTREES)/$(BRANCH) $(word 1,$(shell git -C $(CPYTHON_PATH) remote -v | grep python/cpython))/$(BRANCH) - $(MAKE) -C $(WORKTREES)/$(BRANCH)/Doc/ VENVDIR=$(WORKTREES)/$(BRANCH)/Doc/venv/ PYTHON=$(PYTHON) venv; - (cd $(WORKTREES)/$(BRANCH)/Doc; $(WORKTREES)/$(BRANCH)/Doc/venv/bin/sphinx-build -Q -b gettext -D gettext_compact=0 . ../pot) - find $(WORKTREES)/$(BRANCH) -name '*.pot' |\ - while read -r POT;\ - do\ - PO="./$$(echo "$$POT" | sed "s#$(WORKTREES)/$(BRANCH)/pot/##; s#\.pot\$$#.po#")";\ - mkdir -p "$$(dirname "$$PO")";\ - if [ -f "$$PO" ];\ - then\ - case "$$POT" in\ - *whatsnew*) msgmerge --backup=off --force-po --no-fuzzy-matching -U "$$PO" "$$POT" ;;\ - *) msgmerge --backup=off --force-po -U "$$PO" "$$POT" ;;\ - esac\ - else\ - msgcat -o "$$PO" "$$POT";\ - fi\ +merge: ensure_prerequisites + @echo "Merge from $(UPSTREAM)" + git -C $(CPYTHON_PATH) checkout $(BRANCH) + git -C $(CPYTHON_PATH) pull --ff-only + (cd $(CPYTHON_PATH)/Doc; sphinx-build -Q -b gettext -D gettext_compact=0 . ../pot) + find $(CPYTHON_PATH)/pot/ -name '*.pot' |\ + while read -r POT; \ + do \ + PO="./$$(echo "$$POT" | sed "s#$(CPYTHON_PATH)/pot/##; s#\.pot\$$#.po#")"; \ + mkdir -p "$$(dirname "$$PO")"; \ + if [ -f "$$PO" ]; \ + then \ + msgmerge --backup=off --force-po -U "$$PO" "$$POT"; \ + else \ + msgcat -o "$$PO" "$$POT"; \ + fi \ done - echo "Replacing CPYTHON_CURRENT_COMMIT Makefile by: " $(shell git -C $(WORKTREES)/$(BRANCH) rev-parse HEAD) - sed -i 's/^CPYTHON_CURRENT_COMMIT :=.*/CPYTHON_CURRENT_COMMIT := $(shell git -C $(WORKTREES)/$(BRANCH) rev-parse HEAD)/' Makefile - rm -fr $(WORKTREES)/$(BRANCH) - git -C $(CPYTHON_PATH) worktree prune + rm -fr $(CPYTHON_PATH)/pot/ + @echo "Replacing CPYTHON_CURRENT_COMMIT in Makefile by: " $(shell git -C $(CPYTHON_PATH) rev-parse HEAD) + sed -i 's/^CPYTHON_CURRENT_COMMIT :=.*/CPYTHON_CURRENT_COMMIT := $(shell git -C $(CPYTHON_PATH) rev-parse HEAD)/' Makefile sed -i 's|^#: .*Doc/|#: |' *.po */*.po - -$(VENV)/bin/powrap -m - printf 'To add, you can use:\n git status -s | grep "^ M .*\.po" | cut -d" " -f3 | while read -r file; do if [ $$(git diff "$$file" | wc -l) -gt 13 ]; then git add "$$file"; fi ; done' + powrap -m + @printf 'To add, you can use:\n git status -s | grep "^ M .*\.po" | cut -d" " -f3 | while read -r file; do if [ $$(git diff "$$file" | wc -l) -gt 13 ]; then git add "$$file"; fi ; done' .PHONY: clean clean: - echo "Cleaning *.mo, $(VENV), and $(POSPELL_TMP_DIR)" - rm -fr $(VENV) $(POSPELL_TMP_DIR) + echo "Cleaning *.mo and $(POSPELL_TMP_DIR)" + rm -fr $(POSPELL_TMP_DIR) find -name '*.mo' -delete diff --git a/c-api/arg.po b/c-api/arg.po index 9c42af945..82c7982aa 100644 --- a/c-api/arg.po +++ b/c-api/arg.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Python 3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-01 16:00+0200\n" -"PO-Revision-Date: 2018-10-04 12:14+0200\n" +"PO-Revision-Date: 2020-12-10 16:23+0100\n" "Last-Translator: Julien Palard \n" "Language-Team: FRENCH \n" "Language: fr\n" @@ -688,7 +688,7 @@ msgstr "``n`` (:class:`int`) [``Py_ssize_t``]" #: c-api/arg.rst:292 msgid "Convert a Python integer to a C :c:type:`Py_ssize_t`." -msgstr "Convertit un entier Python en un :c:type:`short int` C." +msgstr "Convertit un entier Python en un :c:type:`Py_ssize_t`." #: c-api/arg.rst:299 msgid "``c`` (:class:`bytes` or :class:`bytearray` of length 1) [char]" diff --git a/requirements.txt b/requirements.txt index 387b1e4ec..c2b021dfb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -poutils==0.10.0 +poutils==0.9.0 From 2e29d8b242882343168911c1f506cd2db45ddb6c Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Fri, 11 Dec 2020 14:06:36 +0100 Subject: [PATCH 02/17] =?UTF-8?q?Enfin=20bon=20il=20sera=20bien=20sur=20Py?= =?UTF-8?q?PI=20soon=E2=84=A2,=20laissons=20le.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c2b021dfb..387b1e4ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -poutils==0.9.0 +poutils==0.10.0 From fc6f38a13cd4c2d5896758c3a88e75795ee2976e Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Fri, 11 Dec 2020 14:10:45 +0100 Subject: [PATCH 03/17] Garde fou. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index faecfffdc..a2f788c76 100644 --- a/Makefile +++ b/Makefile @@ -171,6 +171,6 @@ merge: ensure_prerequisites .PHONY: clean clean: - echo "Cleaning *.mo and $(POSPELL_TMP_DIR)" - rm -fr $(POSPELL_TMP_DIR) + @echo "Cleaning *.mo and $(POSPELL_TMP_DIR)" + [ -n "$(POSPELL_TMP_DIR)" ] && rm -fr $(POSPELL_TMP_DIR) find -name '*.mo' -delete From fe5dc5db8f21addb2018ca143c6ea8cdefe88044 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 13 Dec 2020 23:30:59 +0100 Subject: [PATCH 04/17] Useless, as rm -fr without argument removes nothing. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a2f788c76..53df6ea82 100644 --- a/Makefile +++ b/Makefile @@ -172,5 +172,5 @@ merge: ensure_prerequisites .PHONY: clean clean: @echo "Cleaning *.mo and $(POSPELL_TMP_DIR)" - [ -n "$(POSPELL_TMP_DIR)" ] && rm -fr $(POSPELL_TMP_DIR) + rm -fr $(POSPELL_TMP_DIR) find -name '*.mo' -delete From 42e023db1ea497b6a87ece129d176cac4a3b26e7 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Wed, 16 Dec 2020 15:59:56 +0100 Subject: [PATCH 05/17] Don't remove locales/. --- .gitignore | 1 + Makefile | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 935e4f6a4..947bfb4ae 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ venv/ .DS_Store .pospell/ .potodo/ +locales/ \ No newline at end of file diff --git a/Makefile b/Makefile index 53df6ea82..095aaa465 100644 --- a/Makefile +++ b/Makefile @@ -59,21 +59,18 @@ endif .PHONY: all all: ensure_prerequisites git -C $(CPYTHON_PATH) checkout $(CPYTHON_CURRENT_COMMIT) - mkdir -p $(CPYTHON_PATH)/locales/$(LANGUAGE)/LC_MESSAGES/ - $(CP_CMD) -uv --parents *.po */*.po $(CPYTHON_PATH)/locales/$(LANGUAGE)/LC_MESSAGES/ | cut -d"'" -f2 - $(MAKE) -C $(CPYTHON_PATH)/Doc/ \ - SPHINXOPTS='-qW -j$(JOBS) \ - -D locale_dirs=../locales \ - -D language=$(LANGUAGE) \ - -D gettext_compact=0 \ - -D latex_engine=xelatex \ - -D latex_elements.inputenc= \ - -D latex_elements.fontenc=' \ + mkdir -p locales/$(LANGUAGE)/LC_MESSAGES/ + $(CP_CMD) -u --parents *.po */*.po locales/$(LANGUAGE)/LC_MESSAGES/ | cut -d"'" -f2 + $(MAKE) -C $(CPYTHON_PATH)/Doc/ \ + SPHINXOPTS='-qW -j$(JOBS) \ + -D locale_dirs=$(abspath locales) \ + -D language=$(LANGUAGE) \ + -D gettext_compact=0 \ + -D latex_engine=xelatex \ + -D latex_elements.inputenc= \ + -D latex_elements.fontenc=' \ $(MODE) - # Cleanup git -C $(CPYTHON_PATH) checkout - - rm -fr $(CPYTHON_PATH)/locales/ - # Info @echo "Build success, open file://$(abspath $(CPYTHON_PATH))/Doc/build/html/index.html or run 'make serve' to see them." @@ -92,7 +89,7 @@ ensure_prerequisites: echo " git clone $(UPSTREAM) $(CPYTHON_PATH)"; \ exit 1; \ fi - @if [ -n "$$(git -C $(CPYTHON_PATH) status --porcelain | grep -v locales/)" ]; then \ + @if [ -n "$$(git -C $(CPYTHON_PATH) status --porcelain)" ]; then \ echo "Your cpython clone at $(CPYTHON_PATH) is not clean."; \ echo "In order to avoid breaking things, please clean it first."; \ exit 1; \ From e79169b6b14b457e2c825d81505140537dfe7286 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Wed, 16 Dec 2020 16:03:40 +0100 Subject: [PATCH 06/17] Newline at end of file --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 947bfb4ae..34ccc22d7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ venv/ .DS_Store .pospell/ .potodo/ -locales/ \ No newline at end of file +locales/ From 423d8edd0f69c8bceca946a09e4acc7e57aef550 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 13:20:08 +0100 Subject: [PATCH 07/17] I don't get what's happening here. --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3aee66bc9..b1d358740 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -81,6 +81,8 @@ jobs: cp -uv --parents *.po */*.po ~/locales/fr/LC_MESSAGES/ git -C ~/cpython checkout b30934e9afb0af3f8e2e5f0992445be775b3c630 - name: Prepare venv - run: make -C $HOME/cpython/Doc venv + run: | + [ -d $HOME/cpython/doc/venv/bin/ ] && ls -lah $HOME/cpython/doc/venv/bin/ + make -C $HOME/cpython/Doc venv - name: sphinx-build run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html From 819b1e98274b21b44ce9e31411a4cf568ed088e2 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 13:22:22 +0100 Subject: [PATCH 08/17] Still don't get it. --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b1d358740..b666b8e71 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -82,7 +82,7 @@ jobs: git -C ~/cpython checkout b30934e9afb0af3f8e2e5f0992445be775b3c630 - name: Prepare venv run: | - [ -d $HOME/cpython/doc/venv/bin/ ] && ls -lah $HOME/cpython/doc/venv/bin/ - make -C $HOME/cpython/Doc venv + ls -lah $HOME/cpython/doc/venv/bin/ + make --debug -C $HOME/cpython/Doc venv - name: sphinx-build run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html From 3f86a79bb81eeeb6b6d4af6f4233516f57f367c3 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 13:24:37 +0100 Subject: [PATCH 09/17] I was not sure it was mandatory, now I am. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b666b8e71..768416c2c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -82,7 +82,7 @@ jobs: git -C ~/cpython checkout b30934e9afb0af3f8e2e5f0992445be775b3c630 - name: Prepare venv run: | - ls -lah $HOME/cpython/doc/venv/bin/ + [ -d $HOME/cpython/doc/venv/bin/ ] && ls -lah $HOME/cpython/doc/venv/bin/ make --debug -C $HOME/cpython/Doc venv - name: sphinx-build run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html From db9045586fe5616868e632fd40b3ba1cd7b3f2a3 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 13:27:01 +0100 Subject: [PATCH 10/17] Ohh my debug was not debugging. --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 768416c2c..66b92f398 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -82,7 +82,8 @@ jobs: git -C ~/cpython checkout b30934e9afb0af3f8e2e5f0992445be775b3c630 - name: Prepare venv run: | - [ -d $HOME/cpython/doc/venv/bin/ ] && ls -lah $HOME/cpython/doc/venv/bin/ + [ -d $HOME/cpython/Doc/venv/bin/ ] && ls -lah $HOME/cpython/Doc/venv/bin/ make --debug -C $HOME/cpython/Doc venv + - name: sphinx-build run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html From 7d61026721fc96900a8c660e79015fd7d0308c14 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 13:28:50 +0100 Subject: [PATCH 11/17] WTF --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 66b92f398..b8df113de 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -82,6 +82,7 @@ jobs: git -C ~/cpython checkout b30934e9afb0af3f8e2e5f0992445be775b3c630 - name: Prepare venv run: | + ls -lahtrR /opt/hostedtoolcache/Python/ [ -d $HOME/cpython/Doc/venv/bin/ ] && ls -lah $HOME/cpython/Doc/venv/bin/ make --debug -C $HOME/cpython/Doc venv From b687d1e44965c3b18a8b67b5c97f29f7db476007 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 13:47:43 +0100 Subject: [PATCH 12/17] Ok, it's a Python upgrade... --- .github/workflows/tests.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b8df113de..e6951bac8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -82,9 +82,10 @@ jobs: git -C ~/cpython checkout b30934e9afb0af3f8e2e5f0992445be775b3c630 - name: Prepare venv run: | - ls -lahtrR /opt/hostedtoolcache/Python/ - [ -d $HOME/cpython/Doc/venv/bin/ ] && ls -lah $HOME/cpython/Doc/venv/bin/ - make --debug -C $HOME/cpython/Doc venv + # If the venv exists but is broken, drop it (happens on Python upgrades): + # see https://github.com/actions/setup-python/issues/170 + [ -d $HOME/cpython/Doc/venv/bin/ -a ! -e $HOME/cpython/Doc/venv/bin/python ] && rm -fr $HOME/cpython/Doc/venv + make -C $HOME/cpython/Doc venv - name: sphinx-build run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html From 76073e05d2bbeb62f4c9623a980cf956bf72a4e1 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 15:47:47 +0100 Subject: [PATCH 13/17] Update .github/workflows/tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e6951bac8..a9d3c8cb8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -88,4 +88,4 @@ jobs: make -C $HOME/cpython/Doc venv - name: sphinx-build - run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html + run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=true" autobuild-dev-html From c2217e1b554f3e9ffc96cbb55977381e28f04742 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 15:48:10 +0100 Subject: [PATCH 14/17] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 095aaa465..2844ff2b9 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ all: ensure_prerequisites SPHINXOPTS='-qW -j$(JOBS) \ -D locale_dirs=$(abspath locales) \ -D language=$(LANGUAGE) \ - -D gettext_compact=0 \ + -D gettext_compact=true \ -D latex_engine=xelatex \ -D latex_elements.inputenc= \ -D latex_elements.fontenc=' \ From 11a2764e7816295caea19c5333bdb551911141bb Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 15:59:24 +0100 Subject: [PATCH 15/17] Update .github/workflows/tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a9d3c8cb8..e6951bac8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -88,4 +88,4 @@ jobs: make -C $HOME/cpython/Doc venv - name: sphinx-build - run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=true" autobuild-dev-html + run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html From 00ead4ca8df328153380ad3218fe78cec9ce3048 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Thu, 17 Dec 2020 15:59:41 +0100 Subject: [PATCH 16/17] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2844ff2b9..b3d27cefb 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ all: ensure_prerequisites SPHINXOPTS='-qW -j$(JOBS) \ -D locale_dirs=$(abspath locales) \ -D language=$(LANGUAGE) \ - -D gettext_compact=true \ + -D gettext_compact=0 \ -D latex_engine=xelatex \ -D latex_elements.inputenc= \ -D latex_elements.fontenc=' \ From c69978822534d5464c7e98c6539f4cd15e98af69 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Wed, 27 Jan 2021 18:49:28 +0100 Subject: [PATCH 17/17] No longer needed. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2738a1691..003cae332 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ endif all: ensure_prerequisites git -C $(CPYTHON_PATH) checkout $(CPYTHON_CURRENT_COMMIT) mkdir -p locales/$(LANGUAGE)/LC_MESSAGES/ - $(CP_CMD) -u --parents *.po */*.po locales/$(LANGUAGE)/LC_MESSAGES/ | cut -d"'" -f2 + $(CP_CMD) -u --parents *.po */*.po locales/$(LANGUAGE)/LC_MESSAGES/ $(MAKE) -C $(CPYTHON_PATH)/Doc/ \ SPHINXOPTS='-qW -j$(JOBS) \ -D locale_dirs=$(abspath locales) \