Skip to content

Commit d38fcbd

Browse files
authored
Merge branch 'main' into windows-certificate-revocation-criteria
2 parents 5dfdd5b + 87c99bc commit d38fcbd

File tree

4 files changed

+81
-23
lines changed

4 files changed

+81
-23
lines changed

core-team/experts.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ xmlrpc
251251
zipapp pfmoore
252252
zipfile alanmcintyre^, serhiy-storchaka, Yhg1s, gpshead
253253
zipimport Yhg1s*
254+
zoneinfo pganssle
254255
==================== =============================================
255256

256257

documentation/translations/coordinating.rst

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ Communication/help channels
1212
===========================
1313

1414
Discussions about translations occur on the Python Docs Discord
15-
`#translations channel <https://discord.gg/h3qDwgyzga>`_, `translation
16-
mailing list <translation_ml_>`_, and the
15+
`#translations channel <https://discord.gg/h3qDwgyzga>`_ and the
1716
`translations category <trans_disc_>`_ of the Python Discourse.
1817

1918
For administrative issues, ping ``@python/editorial-board``.
@@ -175,9 +174,7 @@ Translating Sphinx
175174
Some messages that appear in the docs must be translated in the
176175
`Sphinx project <https://www.sphinx-doc.org/en/master/internals/contributing.html#translations>`__
177176
(`sphinx-doc on Transifex <https://app.transifex.com/sphinx-doc/>`__) or in
178-
the `python-docs-theme <https://github.com/python/python-docs-theme>`_
179-
(currently this is not possible; see this
180-
`issue <https://github.com/python/python-docs-theme/issues/194>`__).
177+
the :ref:`Python Docs Sphinx Theme <python-docs-theme-i18n>`.
181178
Coordinators should direct some translators there, so that the documentation
182179
is fully translated.
183180

@@ -226,7 +223,8 @@ How is a coordination team chosen?
226223
Each translation team will decide on the number of coordinators.
227224
We recommend two or three coordinators, though you may begin with one.
228225

229-
- Coordinator requests are to be public on the `translation mailing list <translation_ml_>`_.
226+
- Coordinator requests are to be public in the `translations category of the
227+
Python Discourse <trans_disc_>`_.
230228
- If the given language has a native core team member, they have input
231229
on the coordinator request.
232230
- Anyone who wants to become coordinator for their native language and shows
@@ -235,8 +233,8 @@ We recommend two or three coordinators, though you may begin with one.
235233
- We expect the local community to self-organize coordinators and contributors.
236234
If you have questions, please ask on the mailing list or Discourse.
237235
- If a coordinator becomes inactive or unreachable for a long
238-
period of time, someone else can ask to be added as a primary coordinator on
239-
the `translation mailing list <translation_ml_>`_.
236+
period of time, someone else can ask to be added as a primary coordinator in
237+
the `translations category of the Python Discourse <trans_disc_>`_.
240238
As a community resource, we aim to keep translations up to date with active
241239
contributors, including coordinators.
242240

@@ -296,6 +294,5 @@ for updates.
296294

297295

298296
.. _EB: https://python.github.io/editorial-board/
299-
.. _translation_ml: https://mail.python.org/mailman3/lists/translation.python.org/
300297
.. _trans_disc: https://discuss.python.org/c/documentation/translations/
301298
.. _docsbuild-scripts: https://github.com/python/docsbuild-scripts

documentation/translations/translating.rst

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,8 @@ If there is already a repository for your language team (there may be links to
125125
Telegrams/Discords in the ``README``), join and introduce
126126
yourself. Your fellow translators will be more than happy to help!
127127
General discussions about translations occur on the Python Docs Discord
128-
`#translations channel <https://discord.gg/h3qDwgyzga>`_, `translation
129-
mailing list <translation_ml_>`_, and the `translations category <discourse_>`_
130-
of the Python Discourse.
128+
`#translations channel <https://discord.gg/h3qDwgyzga>`_ and the
129+
`translations category <discourse_>`_ of the Python Discourse.
131130

132131
.. _translation-style-guide:
133132

@@ -209,7 +208,7 @@ Some general guidelines for deciding on a translation:
209208
Dialects
210209
--------
211210

212-
Some translation receive contributions from people of several different dialects,
211+
Some translations receive contributions from people of several different dialects,
213212
understandably the language will differ. It is recommended however that
214213
translators try to keep files and sections consistent.
215214

@@ -234,14 +233,16 @@ is provided below:
234233
print(kw, ":", keywords[kw])
235234
236235
236+
.. _transifex-use:
237+
237238
Transifex
238239
=========
239240

240241
.. important::
241242

242243
There are many translations in the `python-doc organization on Transifex <tx_>`_,
243244
some of which, however, are not used or do not have a coordination team.
244-
Confirm this is not the case before you begin translating.
245+
Confirm that a coordination team exists before you begin translating.
245246

246247
Several language projects use Transifex as their translation interface.
247248
Translations on Transifex are carried out via a web interface, similar to Weblate.
@@ -258,6 +259,9 @@ through the following resources from the Transifex documentation:
258259
- `Starting with the basics <https://help.transifex.com/en/collections/3441044-starting-with-the-basics>`__:
259260
A group of documents with basic information.
260261

262+
Within the organization, a project for translating the
263+
:github:`Python Docs Sphinx Theme <python/python-docs-theme>` can also be
264+
found.
261265
For further information about Transifex see our `documentation <https://python-docs-transifex-automation.readthedocs.io/>`_.
262266

263267

@@ -287,6 +291,45 @@ be the latest non-alpha branch), the translations should then be propagated by
287291
your languages coordination team.
288292

289293

294+
.. _python-docs-theme-i18n:
295+
296+
How do I translate the Python Docs Sphinx Theme?
297+
------------------------------------------------
298+
299+
The Sphinx theme for the Python documentation supports localization.
300+
301+
You can translate either on
302+
`Transifex <https://explore.transifex.com/python-doc/python-docs-theme/>`_
303+
(see :ref:`translating on Transifex <transifex-use>` for more information)
304+
or locally by following the steps outlined below.
305+
306+
To translate locally, clone the :github:`Python Docs Sphinx Theme repository <python/python-docs-theme>` and run the following
307+
commands to generate the PO files. Replace ``LANG`` with the same language code
308+
that is used for the docs translation:
309+
310+
.. code-block:: bash
311+
312+
python babel_runner.py extract
313+
python babel_runner.py init -l LANG
314+
315+
The file can then be found at:
316+
317+
.. code-block:: text
318+
319+
python-docs-theme/locale/LANG/LC_MESSAGES/python-docs-theme.po
320+
321+
After translating, submit your PO file via a pull request to the
322+
:github:`repository <python/python-docs-theme>`.
323+
See our :ref:`git-boot-camp` for more information about using Git.
324+
325+
To update an existing translation after source changes, run:
326+
327+
.. code-block:: bash
328+
329+
python babel_runner.py update # To update source for all languages
330+
python babel_runner.py update -l LANG # To update source just for LANG
331+
332+
290333
The coordination team for my language is inactive, what do I do?
291334
----------------------------------------------------------------
292335

@@ -295,6 +338,5 @@ If you would like to coordinate, open a pull request in the
295338
at the top of this page, and ping ``@python/editorial-board``.
296339

297340

298-
.. _translation_ml: https://mail.python.org/mailman3/lists/translation.python.org/
299341
.. _discourse: https://discuss.python.org/c/documentation/translations/
300342
.. _tx: https://explore.transifex.com/python-doc/python-newest/

getting-started/setup-building.rst

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -511,13 +511,26 @@ The simplest way to install the Emscripten compiler is:
511511
512512
# Install Emscripten
513513
git clone https://github.com/emscripten-core/emsdk
514-
./emsdk/emsdk install 4.0.5
515-
./emsdk/emsdk activate 4.0.5
514+
./emsdk/emsdk install 4.0.12
515+
./emsdk/emsdk activate 4.0.12
516516
source ./emsdk/emsdk_env.sh
517517
518-
Updating the Emscripten compiler version often causes breakages. For the best
519-
compatibility, use the Emscripten version suggested in the cpython repository in
520-
``Tools/wasm/README.md``.
518+
Updating the Emscripten compiler version can cause breakages. For the best
519+
compatibility, use the appropriate Emscripten version based on the version of
520+
CPython you're building:
521+
522+
* For building CPython 3.14, use ``emsdk`` version ``4.0.12``.
523+
* For building the main branch of the CPython repository, you may wish to use
524+
``latest`` instead of a specific version.
525+
526+
It is possible (but not necessary) to enable ``ccache`` for Emscripten builds
527+
by setting the ``EM_COMPILER_WRAPPER`` environment, but this step will only
528+
take effect if it is done **after** ``emsdk_env.sh`` is sourced (otherwise, the
529+
sourced script removes the environment variable):
530+
531+
.. code-block:: sh
532+
533+
export EM_COMPILER_WRAPPER=ccache
521534
522535
Building for Emscripten requires doing a cross-build where you have a *build*
523536
Python to help produce an Emscripten build of CPython. This means you build
@@ -526,8 +539,8 @@ another that's the build you ultimately care about (that is, the build Python is
526539
not meant for use by you directly, only the build system).
527540

528541
The easiest way to get a debug build of CPython for Emscripten is to use the
529-
``Tools/wasm/emscripten build`` command (which should be run with a recent
530-
version of Python you have installed on your machine):
542+
``Tools/wasm/emscripten build`` command, which should be run with a recent
543+
version of Python (3.13 or newer) already installed on your machine:
531544

532545
.. code-block:: shell
533546
@@ -545,6 +558,7 @@ is a convenience wrapper around the following commands:
545558
python Tools/wasm/emscripten configure-build-python --quiet -- --config-cache --with-pydebug
546559
python Tools/wasm/emscripten make-build-python --quiet
547560
python Tools/wasm/emscripten make-libffi --quiet
561+
python Tools/wasm/emscripten make-mpdec --quiet
548562
python Tools/wasm/emscripten configure-host --quiet -- --config-cache
549563
python Tools/wasm/emscripten make-host --quiet
550564
@@ -572,6 +586,9 @@ used in ``python.sh``:
572586
573587
make -C cross-build/wasm32-emscripten/build/python/ test
574588
589+
Additional instructions for running the resulting builds (through Node.js and/or
590+
through web browsers) are available in the CPython repository at
591+
:cpy-file:`Tools/wasm/README.md`.
575592

576593
.. _Emscripten: https://emscripten.org/
577594
.. _WebAssembly: https://webassembly.org
@@ -797,7 +814,8 @@ some of CPython's modules (for example, ``zlib``).
797814
$ sudo apt-get install build-essential gdb lcov pkg-config \
798815
libbz2-dev libffi-dev libgdbm-dev libgdbm-compat-dev liblzma-dev \
799816
libncurses5-dev libreadline6-dev libsqlite3-dev libssl-dev \
800-
lzma lzma-dev tk-dev uuid-dev zlib1g-dev libmpdec-dev libzstd-dev
817+
lzma lzma-dev tk-dev uuid-dev zlib1g-dev libmpdec-dev libzstd-dev \
818+
inetutils-inetd
801819

802820
Note that Debian 12 and Ubuntu 24.04 do not have the ``libmpdec-dev``
803821
package. You can safely remove it from the install list above and the

0 commit comments

Comments
 (0)