https://github.com/python/cpython/commit/6318ffcba21f8fc155f5558237ab03aa45f0e174
commit: 6318ffcba21f8fc155f5558237ab03aa45f0e174
branch: main
author: Adam Turner <[email protected]>
committer: AA-Turner <[email protected]>
date: 2024-09-25T20:06:54+01:00
summary:
Doc: Use ``major.minor`` for documentation distribution archive filenames
(#124489)
files:
M Doc/tools/extensions/patchlevel.py
M Doc/tools/templates/download.html
diff --git a/Doc/tools/extensions/patchlevel.py
b/Doc/tools/extensions/patchlevel.py
index f2df6db47a2227..53ea1bf47b8fd3 100644
--- a/Doc/tools/extensions/patchlevel.py
+++ b/Doc/tools/extensions/patchlevel.py
@@ -74,4 +74,4 @@ def get_version_info():
if __name__ == "__main__":
- print(format_version_info(get_header_version_info())[1])
+ print(format_version_info(get_header_version_info())[0])
diff --git a/Doc/tools/templates/download.html
b/Doc/tools/templates/download.html
index b4217908cc63c9..c978e61b16a49e 100644
--- a/Doc/tools/templates/download.html
+++ b/Doc/tools/templates/download.html
@@ -1,13 +1,15 @@
{% extends "layout.html" %}
{% set title = _('Download') %}
{% if daily is defined %}
- {% set dlbase = pathto('archives', 1) %}
+ {% set dl_base = pathto('archives', resource=True) %}
+ {% set dl_version = version %}
{% else %}
{#
The link below returns HTTP 404 until the first related alpha release.
This is expected; use daily documentation builds for CPython development.
#}
- {% set dlbase = 'https://www.python.org/ftp/python/doc/' + release %}
+ {% set dl_base = 'https://www.python.org/ftp/python/doc/' + release %}
+ {% set dl_version = release %}
{% endif %}
{% block body %}
@@ -26,27 +28,27 @@ <h1>{% trans %}Download Python {{ release }}
Documentation{% endtrans %}</h1>
</tr>
<tr>
<td>{% trans %}PDF{% endtrans %}</td>
- <td>{% trans download_size="17" %}<a href="{{ dlbase }}/python-{{ release
}}-docs-pdf-a4.zip">Download</a> (ca. {{ download_size }} MiB){% endtrans
%}</td>
- <td>{% trans download_size="17" %}<a href="{{ dlbase }}/python-{{ release
}}-docs-pdf-a4.tar.bz2">Download</a> (ca. {{ download_size }} MiB){% endtrans
%}</td>
+ <td>{% trans download_size="17" %}<a href="{{ dl_base }}/python-{{
dl_version }}-docs-pdf-a4.zip">Download</a> (ca. {{ download_size }} MiB){%
endtrans %}</td>
+ <td>{% trans download_size="17" %}<a href="{{ dl_base }}/python-{{
dl_version }}-docs-pdf-a4.tar.bz2">Download</a> (ca. {{ download_size }} MiB){%
endtrans %}</td>
</tr>
<tr>
<td>{% trans %}HTML{% endtrans %}</td>
- <td>{% trans download_size="13" %}<a href="{{ dlbase }}/python-{{ release
}}-docs-html.zip">Download</a> (ca. {{ download_size }} MiB){% endtrans %}</td>
- <td>{% trans download_size="8" %}<a href="{{ dlbase }}/python-{{ release
}}-docs-html.tar.bz2">Download</a> (ca. {{ download_size }} MiB){% endtrans
%}</td>
+ <td>{% trans download_size="13" %}<a href="{{ dl_base }}/python-{{
dl_version }}-docs-html.zip">Download</a> (ca. {{ download_size }} MiB){%
endtrans %}</td>
+ <td>{% trans download_size="8" %}<a href="{{ dl_base }}/python-{{
dl_version }}-docs-html.tar.bz2">Download</a> (ca. {{ download_size }} MiB){%
endtrans %}</td>
</tr>
<tr>
<td>{% trans %}Plain text{% endtrans %}</td>
- <td>{% trans download_size="4" %}<a href="{{ dlbase }}/python-{{ release
}}-docs-text.zip">Download</a> (ca. {{ download_size }} MiB){% endtrans %}</td>
- <td>{% trans download_size="3" %}<a href="{{ dlbase }}/python-{{ release
}}-docs-text.tar.bz2">Download</a> (ca. {{ download_size }} MiB){% endtrans
%}</td>
+ <td>{% trans download_size="4" %}<a href="{{ dl_base }}/python-{{
dl_version }}-docs-text.zip">Download</a> (ca. {{ download_size }} MiB){%
endtrans %}</td>
+ <td>{% trans download_size="3" %}<a href="{{ dl_base }}/python-{{
dl_version }}-docs-text.tar.bz2">Download</a> (ca. {{ download_size }} MiB){%
endtrans %}</td>
</tr>
<tr>
<td>{% trans %}Texinfo{% endtrans %}</td>
- <td>{% trans download_size="9" %}<a href="{{ dlbase }}/python-{{ release
}}-docs-texinfo.zip">Download</a> (ca. {{ download_size }} MiB){% endtrans
%}</td>
- <td>{% trans download_size="7" %}<a href="{{ dlbase }}/python-{{ release
}}-docs-texinfo.tar.bz2">Download</a> (ca. {{ download_size }} MiB){% endtrans
%}</td>
+ <td>{% trans download_size="9" %}<a href="{{ dl_base }}/python-{{
dl_version }}-docs-texinfo.zip">Download</a> (ca. {{ download_size }} MiB){%
endtrans %}</td>
+ <td>{% trans download_size="7" %}<a href="{{ dl_base }}/python-{{
dl_version }}-docs-texinfo.tar.bz2">Download</a> (ca. {{ download_size }}
MiB){% endtrans %}</td>
</tr>
<tr>
<td>{% trans %}EPUB{% endtrans %}</td>
- <td>{% trans download_size="6" %}<a href="{{ dlbase }}/python-{{ release
}}-docs.epub">Download</a> (ca. {{ download_size }} MiB){% endtrans %}</td>
+ <td>{% trans download_size="6" %}<a href="{{ dl_base }}/python-{{
dl_version }}-docs.epub">Download</a> (ca. {{ download_size }} MiB){% endtrans
%}</td>
<td></td>
</tr>
</table>
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
