From 4b4ee2732c8979f9d6ac57f44d734d762b98c66b Mon Sep 17 00:00:00 2001 From: stan Date: Sat, 25 Jan 2025 23:16:14 +0000 Subject: [PATCH 1/2] Add .tar.xz distributions --- Doc/Makefile | 6 +++++- Doc/tools/templates/download.html | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Doc/Makefile b/Doc/Makefile index b8896da4a91869..87ba4d053cac79 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -206,6 +206,7 @@ dist-html: cp -pPR build/html dist/python-$(DISTVERSION)-docs-html tar -C dist -cf dist/python-$(DISTVERSION)-docs-html.tar python-$(DISTVERSION)-docs-html bzip2 -9 -k dist/python-$(DISTVERSION)-docs-html.tar + xz -9 -k dist/python-$(DISTVERSION)-docs-html.tar (cd dist; zip -q -r -9 python-$(DISTVERSION)-docs-html.zip python-$(DISTVERSION)-docs-html) rm -r dist/python-$(DISTVERSION)-docs-html rm dist/python-$(DISTVERSION)-docs-html.tar @@ -222,6 +223,7 @@ dist-text: cp -pPR build/text dist/python-$(DISTVERSION)-docs-text tar -C dist -cf dist/python-$(DISTVERSION)-docs-text.tar python-$(DISTVERSION)-docs-text bzip2 -9 -k dist/python-$(DISTVERSION)-docs-text.tar + xz -9 -k dist/python-$(DISTVERSION)-docs-text.tar (cd dist; zip -q -r -9 python-$(DISTVERSION)-docs-text.zip python-$(DISTVERSION)-docs-text) rm -r dist/python-$(DISTVERSION)-docs-text rm dist/python-$(DISTVERSION)-docs-text.tar @@ -239,9 +241,10 @@ dist-pdf: # as otherwise the full latexmk process is run twice. # ($$ is needed to escape the $; https://www.gnu.org/software/make/manual/make.html#Basics-of-Variable-References) -sed -i 's/: all-$$(FMT)/:/' build/latex/Makefile - (cd build/latex; $(MAKE) clean && $(MAKE) --jobs=$$((`nproc`+1)) --output-sync LATEXMKOPTS='-quiet' all-pdf && $(MAKE) FMT=pdf zip bz2) + (cd build/latex; $(MAKE) clean && $(MAKE) --jobs=$$((`nproc`+1)) --output-sync LATEXMKOPTS='-quiet' all-pdf && $(MAKE) FMT=pdf zip bz2 xz) cp build/latex/docs-pdf.zip dist/python-$(DISTVERSION)-docs-pdf-a4.zip cp build/latex/docs-pdf.tar.bz2 dist/python-$(DISTVERSION)-docs-pdf-a4.tar.bz2 + cp build/latex/docs-pdf.tar.xz dist/python-$(DISTVERSION)-docs-pdf-a4.tar.xz @echo "Build finished and archived!" .PHONY: dist-epub @@ -267,6 +270,7 @@ dist-texinfo: cp -pPR build/texinfo dist/python-$(DISTVERSION)-docs-texinfo tar -C dist -cf dist/python-$(DISTVERSION)-docs-texinfo.tar python-$(DISTVERSION)-docs-texinfo bzip2 -9 -k dist/python-$(DISTVERSION)-docs-texinfo.tar + xz -9 -k dist/python-$(DISTVERSION)-docs-texinfo.tar (cd dist; zip -q -r -9 python-$(DISTVERSION)-docs-texinfo.zip python-$(DISTVERSION)-docs-texinfo) rm -r dist/python-$(DISTVERSION)-docs-texinfo rm dist/python-$(DISTVERSION)-docs-texinfo.tar diff --git a/Doc/tools/templates/download.html b/Doc/tools/templates/download.html index 45ec436fee72d7..912c8a348c28c6 100644 --- a/Doc/tools/templates/download.html +++ b/Doc/tools/templates/download.html @@ -25,26 +25,31 @@

{% trans %}Download Python {{ dl_version }} Documentation{% endtrans %}

{% trans %}Format{% endtrans %} {% trans %}Packed as .zip{% endtrans %} {% trans %}Packed as .tar.bz2{% endtrans %} + {% trans %}Packed as .tar.xz{% endtrans %} {% trans %}PDF{% endtrans %} {% trans download_size="17" %}Download (ca. {{ download_size }} MiB){% endtrans %} {% trans download_size="17" %}Download (ca. {{ download_size }} MiB){% endtrans %} + {% trans download_size="17" %}Download (ca. {{ download_size }} MiB){% endtrans %} {% trans %}HTML{% endtrans %} {% trans download_size="13" %}Download (ca. {{ download_size }} MiB){% endtrans %} - {% trans download_size="8" %}Download (ca. {{ download_size }} MiB){% endtrans %} + {% trans download_size="10" %}Download (ca. {{ download_size }} MiB){% endtrans %} + {% trans download_size="8" %}Download (ca. {{ download_size }} MiB){% endtrans %} {% trans %}Plain text{% endtrans %} {% trans download_size="4" %}Download (ca. {{ download_size }} MiB){% endtrans %} {% trans download_size="3" %}Download (ca. {{ download_size }} MiB){% endtrans %} + {% trans download_size="3" %}Download (ca. {{ download_size }} MiB){% endtrans %} {% trans %}Texinfo{% endtrans %} {% trans download_size="9" %}Download (ca. {{ download_size }} MiB){% endtrans %} {% trans download_size="7" %}Download (ca. {{ download_size }} MiB){% endtrans %} + {% trans download_size="7" %}Download (ca. {{ download_size }} MiB){% endtrans %} {% trans %}EPUB{% endtrans %} From 88571600b3104f3cab7663148ced4f639cedc973 Mon Sep 17 00:00:00 2001 From: stan Date: Sat, 25 Jan 2025 23:24:44 +0000 Subject: [PATCH 2/2] Add NEWS --- .../next/Build/2025-01-25-23-22-00.gh-issue-64940.abh812.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Build/2025-01-25-23-22-00.gh-issue-64940.abh812.rst diff --git a/Misc/NEWS.d/next/Build/2025-01-25-23-22-00.gh-issue-64940.abh812.rst b/Misc/NEWS.d/next/Build/2025-01-25-23-22-00.gh-issue-64940.abh812.rst new file mode 100644 index 00000000000000..79215c338adcae --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-01-25-23-22-00.gh-issue-64940.abh812.rst @@ -0,0 +1 @@ +Add the format .tar.xz to documentation build distributions.