[3.12] Doc: Use `major.minor` for documentation distribution archive filenames (GH-124489) (#124535)

Doc: Use ``major.minor`` for documentation distribution archive filenames (GH-124489)
(cherry picked from commit 6318ffcba2)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2024-09-25 21:25:42 +02:00 committed by GitHub
parent 13565f1580
commit ea5c650704
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 12 deletions

View file

@ -74,4 +74,4 @@ def get_version_info():
if __name__ == "__main__": if __name__ == "__main__":
print(format_version_info(get_header_version_info())[1]) print(format_version_info(get_header_version_info())[0])

View file

@ -1,13 +1,15 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% set title = _('Download') %} {% set title = _('Download') %}
{% if daily is defined %} {% if daily is defined %}
{% set dlbase = pathto('archives', 1) %} {% set dl_base = pathto('archives', resource=True) %}
{% set dl_version = version %}
{% else %} {% else %}
{# {#
The link below returns HTTP 404 until the first related alpha release. The link below returns HTTP 404 until the first related alpha release.
This is expected; use daily documentation builds for CPython development. 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 %} {% endif %}
{% block body %} {% block body %}
@ -26,27 +28,27 @@ Python in one of various formats, follow one of links in this table.{% endtrans
</tr> </tr>
<tr> <tr>
<td>{% trans %}PDF{% endtrans %}</td> <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="{{ dl_base }}/python-{{ dl_version }}-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.tar.bz2">Download</a> (ca. {{ download_size }} MiB){% endtrans %}</td>
</tr> </tr>
<tr> <tr>
<td>{% trans %}HTML{% endtrans %}</td> <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="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="{{ dlbase }}/python-{{ release }}-docs-html.tar.bz2">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>
<tr> <tr>
<td>{% trans %}Plain text{% endtrans %}</td> <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="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="{{ dlbase }}/python-{{ release }}-docs-text.tar.bz2">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>
<tr> <tr>
<td>{% trans %}Texinfo{% endtrans %}</td> <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="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="{{ dlbase }}/python-{{ release }}-docs-texinfo.tar.bz2">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>
<tr> <tr>
<td>{% trans %}EPUB{% endtrans %}</td> <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> <td></td>
</tr> </tr>
</table> </table>