Skip to content

Commit 89d23ae

Browse files
SublianSublian
authored
Merge branch 'python:3.12' into traduccion-library-fcntl
2 parents c4c8b79 + aabd070 commit 89d23ae

14 files changed

+249
-146
lines changed

‎.github/workflows/main.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- 3.*
77
pull_request:
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
test:
1114
name: Test
@@ -21,7 +24,7 @@ jobs:
2124

2225
# Instalación de dependencias
2326
- name: Preparar Python v3.11
24-
uses: actions/setup-python@v4
27+
uses: actions/setup-python@v5
2528
with:
2629
python-version: "3.11"
2730
cache: "pip"
@@ -31,6 +34,7 @@ jobs:
3134
run: sudo sed -i '/postgresql-common/d' /var/lib/dpkg/triggers/File
3235
- name: Instalar dependencias de sistema
3336
run: |
37+
sudo apt-get update
3438
sudo apt-get install -y hunspell hunspell-es gettext language-pack-es locales-all
3539
- name: Instalar dependencias de Python
3640
run: |

‎.github/workflows/pr-comment.yml

+29-6
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,38 @@ name: Agrega comentario a PR
33
on:
44
pull_request_target:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
7-
pr-comment:
10+
define-comment:
811
name: Entradas sin traducción
912
runs-on: ubuntu-22.04
13+
outputs:
14+
any_changed: ${{ steps.changed-files.outputs.any_changed }}
15+
comment: ${{ steps.create-pr-comment.outputs.comment }}
1016
steps:
1117
- uses: actions/checkout@v4
1218
with:
1319
ref: ${{ github.event.pull_request.head.sha }}
1420
persist-credentials: false
1521
- name: Preparar Python v3.11
16-
uses: actions/setup-python@v4
22+
uses: actions/setup-python@v5
1723
with:
1824
python-version: "3.11"
1925
cache: "pip"
26+
# checkout these files from the base branch to guarantee they haven't been
27+
# modified by the PR
28+
- uses: actions/checkout@v4
29+
with:
30+
path: base-branch
31+
sparse-checkout-cone-mode: false
32+
sparse-checkout: |
33+
requirements.txt
34+
scripts/list_missing_entries.py
2035
- name: Instalar dependencias
2136
run: |
22-
python -m pip install -r requirements.txt
37+
python -m pip install -r base-branch/requirements.txt
2338
- name: Obtiene lista de archivos con cambios
2439
id: changed-files
2540
uses: tj-actions/changed-files@v40
@@ -34,12 +49,20 @@ jobs:
3449
run: |
3550
{
3651
echo 'comment<<EOF'
37-
python scripts/list_missing_entries.py --github $CHANGED_PO_FILES
52+
python base-branch/scripts/list_missing_entries.py --github $CHANGED_PO_FILES
3853
echo EOF
3954
} >> "$GITHUB_OUTPUT"
55+
56+
write-comment:
57+
runs-on: ubuntu-22.04
58+
needs: [define-comment]
59+
if: needs.define-comment.outputs.any_changed == 'true'
60+
permissions:
61+
issues: write
62+
pull-requests: write
63+
steps:
4064
- name: Agregar comentario con entradas faltantes
41-
if: steps.changed-files.outputs.any_changed == 'true'
4265
uses: thollander/actions-comment-pull-request@v2
4366
with:
44-
message: ${{ steps.create-pr-comment.outputs.comment }}
67+
message: ${{ needs.define-comment.outputs.comment }}
4568
comment_tag: missing-entries

‎.github/workflows/stale.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,17 @@ on:
33
schedule:
44
- cron: '30 1 * * *'
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
stale:
811
runs-on: ubuntu-latest
12+
permissions:
13+
issues: write
14+
pull-requests: write
915
steps:
10-
- uses: actions/stale@v8
16+
- uses: actions/stale@v9
1117
with:
1218
stale-pr-label: 'needs decision'
1319
stale-issue-label: 'stale'

‎.overrides/faq.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ repositorio principal de la traducción). Se hace de la siguiente manera::
204204

205205
Luego nos vamos a nuestra rama local, confirmamos e impactamos esos cambios::
206206

207-
git checkout 3.11
208-
git merge upstream/3.11
209-
git push origin 3.11
207+
git checkout 3.12
208+
git merge upstream/3.12
209+
git push origin 3.12
210210

211211
¡Eso es todo!
212212

‎.overrides/progress.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ y otras estadísticas.
1010

1111
.. note::
1212

13-
Estas listas se actualiza automáticamente cuando Pull Requests se *mergean* a la rama ``3.11``.
13+
Estas listas se actualiza automáticamente cuando Pull Requests se *mergean* a la rama ``3.12``.
1414

1515

1616
En progreso

‎.overrides/upgrade-python-version.rst

+18-12
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ We are currently in branch 3.11, and we want to update the strings from 3.12.
3939
.. note:: This is important, so the later ``make build`` step will not reset
4040
the cpython submodule to the previous hash on the old branch.
4141

42+
#. Create a virtual environment and install the dependencies of the project::
43+
44+
python -m venv env
45+
source env/bin/activate # Windows: env\Scripts\activate.bat
46+
pip install -r requirements.txt
47+
4248
#. Verify that the docs build with the new versions you changed from
4349
``requirements.txt`` mainly the sphinx version::
4450

@@ -53,21 +59,14 @@ We are currently in branch 3.11, and we want to update the strings from 3.12.
5359

5460
#. Clean possible garbage (form previous builds)::
5561

56-
rm -rf _build ../python-docs-es-pot cpython/Doc/CONTRIBUTING.rst cpython/Doc/upgrade-python-version.rst
62+
rm -rf _build ../python-docs-es-pot cpython/Doc/CONTRIBUTING.rst cpython/Doc/upgrade-python-version.rst reviewers-guide.rst
5763

5864
.. note::
5965

6066
The 'python-docs-es-pot' is a temporary directory that is created
6167
in the next step. It's included here because it might be a leftover
6268
from previous attempts on your machine.
6369

64-
#. Create a virtual environment and install the dependencies of the project::
65-
66-
python -m venv env
67-
source env/bin/activate # Windows: env\Scripts\activate.bat
68-
pip install -r requirements.txt
69-
70-
7170
#. Create the .po files from the new source code. This will generate all the .po files for version 3.11::
7271

7372
SPHINX_GETTEXT=True sphinx-build -j auto -b gettext -d _build/doctrees . ../python-docs-es-pot
@@ -114,9 +113,16 @@ We are currently in branch 3.11, and we want to update the strings from 3.12.
114113
of the new branch is done. So prepare a cup of any hot beverage
115114
and fix them.
116115

117-
Once the process is completely and you are happy with the results,
118-
there are a few extra steps to finish the process::
116+
**Once the process is completely and you are happy with the results,
117+
there are a few extra steps to finish the process**
118+
119+
#. Upgrade GitHub Actions to use Python 3.12, by updating Python version to 3.12 in the ``.github/workflows/main.yml`` file.
119120

120-
#. Upgrade GitHub Actions to use Python 3.12
121+
#. Update the *Read the Docs* project to use 3.12 in the build and also as default branch/version.
122+
123+
#. Commit all the newly created files locally.
124+
125+
#. Create branch 3.12 in the repository in order to merge changes there.
126+
127+
#. Inside the github project settings, set 3.12 branch as the default branch for the repository.
121128

122-
#. Update Read the Docs project to use 3.12 in the build and also as default branch/version

‎TRANSLATORS

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Carlos Bernad (@carlos-bernad)
4343
Carlos Enrique Carrasco Varas (@KrlitosForever)
4444
Carlos Joel Delgado Pizarro (@c0x6a)
4545
Carlos Martel Lamas (@Letram)
46+
Carlos Mena Pérez (@carlosm00)
4647
Catalina Arrey Amunátegui (@CatalinaArrey)
4748
Claudia Millán Nebot (@clacri @cheshireminima)
4849
Constanza Areal (@geekcoty)
@@ -158,6 +159,7 @@ Lis
158159
Lucas Miranda
159160
Luciano Bovio (@lbovio)
160161
Luis A. Gonzalez (@sublian)
162+
Luis Enriquez Torres (@lenriquezt)
161163
Luis Llave (@llaveluis)
162164
Luis Sánchez (@LuisAISanchez)
163165
Maia
@@ -238,4 +240,4 @@ Xavi Francisco (@srxavi)
238240
Xavi Rambla Centellas (@xavirambla)
239241
Yennifer Paola Herrera Ariza (@Yenniferh)
240242
Yohanna Padrino (@Yo-hanaPR)
241-
zejiran
243+
zejiran

‎library/audioop.po

+8-7
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ msgstr ""
1111
"Project-Id-Version: Python 3.8\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2023-10-12 19:43+0200\n"
14-
"PO-Revision-Date: 2022-11-21 16:07-0300\n"
14+
"PO-Revision-Date: 2023-12-22 11:47+0100\n"
1515
"Last-Translator: Sofía Denner <sofi.denner@gmail.com>\n"
16-
"Language: es\n"
1716
"Language-Team: python-doc-es\n"
18-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17+
"Language: es\n"
1918
"MIME-Version: 1.0\n"
2019
"Content-Type: text/plain; charset=utf-8\n"
2120
"Content-Transfer-Encoding: 8bit\n"
21+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2222
"Generated-By: Babel 2.13.0\n"
23+
"X-Generator: Poedit 3.1.1\n"
2324

2425
#: ../Doc/library/audioop.rst:2
2526
msgid ":mod:`audioop` --- Manipulate raw audio data"
@@ -446,16 +447,16 @@ msgstr ""
446447

447448
#: ../Doc/library/audioop.rst:24
448449
msgid "Intel/DVI ADPCM"
449-
msgstr ""
450+
msgstr "Intel/DVI ADPCM"
450451

451452
#: ../Doc/library/audioop.rst:24
452453
msgid "ADPCM, Intel/DVI"
453-
msgstr ""
454+
msgstr "ADPCM, Intel/DVI"
454455

455456
#: ../Doc/library/audioop.rst:24
456457
msgid "a-LAW"
457-
msgstr ""
458+
msgstr "a-LAW"
458459

459460
#: ../Doc/library/audioop.rst:24
460461
msgid "u-LAW"
461-
msgstr ""
462+
msgstr "u-LAW"

‎library/binascii.po

+8-7
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ msgstr ""
1111
"Project-Id-Version: Python 3.8\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2023-10-12 19:43+0200\n"
14-
"PO-Revision-Date: 2022-10-28 17:49-0500\n"
14+
"PO-Revision-Date: 2023-12-11 17:00+0100\n"
1515
"Last-Translator: José Luis Salgado Banda\n"
16-
"Language: es_CO\n"
1716
"Language-Team: python-doc-es\n"
18-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17+
"Language: es_CO\n"
1918
"MIME-Version: 1.0\n"
2019
"Content-Type: text/plain; charset=utf-8\n"
2120
"Content-Transfer-Encoding: 8bit\n"
21+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2222
"Generated-By: Babel 2.13.0\n"
23+
"X-Generator: Poedit 3.0.1\n"
2324

2425
#: ../Doc/library/binascii.rst:2
2526
msgid ":mod:`binascii` --- Convert between binary and ASCII"
@@ -106,6 +107,7 @@ msgstr ""
106107
"Si *strict_mode* es verdadero, solo se convertirán los datos en base64 "
107108
"válidos. Los datos en base64 no válidos lanzarán :exc:`binascii.Error`."
108109

110+
# la traducción es correcta
109111
#: ../Doc/library/binascii.rst:64
110112
msgid "Valid base64:"
111113
msgstr "base64 válido:"
@@ -318,13 +320,12 @@ msgstr ""
318320

319321
#: ../Doc/library/binascii.rst:8
320322
msgid "module"
321-
msgstr ""
323+
msgstr "module"
322324

323325
#: ../Doc/library/binascii.rst:8
324326
msgid "uu"
325-
msgstr ""
327+
msgstr "uu"
326328

327329
#: ../Doc/library/binascii.rst:8
328-
#, fuzzy
329330
msgid "base64"
330-
msgstr "base64 válido:"
331+
msgstr "base64"

‎library/collections.abc.po

+17-13
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ msgstr ""
1111
"Project-Id-Version: Python 3.8\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2023-10-12 19:43+0200\n"
14-
"PO-Revision-Date: 2022-12-08 16:15-0300\n"
14+
"PO-Revision-Date: 2023-12-11 20:13+0100\n"
1515
"Last-Translator: Sofía Denner <sofi.denner@gmail.com>\n"
16-
"Language: es_AR\n"
1716
"Language-Team: python-doc-es\n"
18-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17+
"Language: es_AR\n"
1918
"MIME-Version: 1.0\n"
2019
"Content-Type: text/plain; charset=utf-8\n"
2120
"Content-Transfer-Encoding: 8bit\n"
21+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2222
"Generated-By: Babel 2.13.0\n"
23+
"X-Generator: Poedit 3.0.1\n"
2324

2425
#: ../Doc/library/collections.abc.rst:2
2526
msgid ":mod:`collections.abc` --- Abstract Base Classes for Containers"
@@ -35,15 +36,14 @@ msgid "**Source code:** :source:`Lib/_collections_abc.py`"
3536
msgstr "**Código fuente:** :source:`Lib/_collections_abc.py`"
3637

3738
#: ../Doc/library/collections.abc.rst:23
38-
#, fuzzy
3939
msgid ""
4040
"This module provides :term:`abstract base classes <abstract base class>` "
4141
"that can be used to test whether a class provides a particular interface; "
4242
"for example, whether it is :term:`hashable` or whether it is a mapping."
4343
msgstr ""
4444
"Este módulo proporciona :term:`clases base abstractas <abstract base class>` "
4545
"que pueden usarse para probar si una clase proporciona una interfaz "
46-
"específica; por ejemplo, si es hashable o si es un mapeo."
46+
"específica; por ejemplo, si es :term:`hashable` o si es un mapeo."
4747

4848
#: ../Doc/library/collections.abc.rst:27
4949
msgid ""
@@ -459,14 +459,12 @@ msgid "``aclose``, ``__aiter__``, ``__anext__``"
459459
msgstr "``aclose``, ``__aiter__``, ``__anext__``"
460460

461461
#: ../Doc/library/collections.abc.rst:180
462-
#, fuzzy
463462
msgid ":class:`Buffer` [1]_"
464-
msgstr ":class:`Iterator` [1]_"
463+
msgstr ":class:`Buffer` [1]_"
465464

466465
#: ../Doc/library/collections.abc.rst:180
467-
#, fuzzy
468466
msgid "``__buffer__``"
469-
msgstr "``__iter__``"
467+
msgstr "``__buffer__``"
470468

471469
#: ../Doc/library/collections.abc.rst:185
472470
msgid "Footnotes"
@@ -599,6 +597,10 @@ msgid ""
599597
"union, like ``bytes | bytearray``, or :class:`collections.abc.Buffer`. For "
600598
"use as an ABC, prefer :class:`Sequence` or :class:`collections.abc.Buffer`."
601599
msgstr ""
600+
"La ABC :class:`ByteString` está obsoleta. Para usar con ``type hints``, "
601+
"mejor use una unión del tipo ``bytes | bytearray``, o :class:`collections."
602+
"abc.Buffer`. Para usar como una ABC, mejor use :class:`Sequence` o :class:"
603+
"`collections.abc.Buffer`."
602604

603605
#: ../Doc/library/collections.abc.rst:285
604606
msgid "ABCs for read-only and mutable sets."
@@ -701,6 +703,8 @@ msgid ""
701703
"ABC for classes that provide the :meth:`~object.__buffer__` method, "
702704
"implementing the :ref:`buffer protocol <bufferobjects>`. See :pep:`688`."
703705
msgstr ""
706+
"ABC para clases que proveen el método :meth:`~object.__buffer__`, "
707+
"implementando el :ref:`protocolo búfer <bufferobjects>`. Ver :pep:`688`."
704708

705709
#: ../Doc/library/collections.abc.rst:364
706710
msgid "Examples and Recipes"
@@ -769,7 +773,6 @@ msgstr ""
769773
"las otras operaciones seguirán automáticamente su ejemplo."
770774

771775
#: ../Doc/library/collections.abc.rst:421
772-
#, fuzzy
773776
msgid ""
774777
"The :class:`Set` mixin provides a :meth:`_hash` method to compute a hash "
775778
"value for the set; however, :meth:`__hash__` is not defined because not all "
@@ -779,9 +782,10 @@ msgid ""
779782
msgstr ""
780783
"El mixin :class:`Set` proporciona un método :meth:`_hash` para calcular un "
781784
"valor hash para el conjunto; sin embargo, :meth:`__hash__` no está definido "
782-
"porque no todos los conjuntos son encadenados o inmutables. Para agregar "
783-
"capacidad de encadenamiento en conjuntos que usan mixin, herede de ambos :"
784-
"meth:`Set` y :meth:`Hashable`, luego defina ``__hash__ = Set._hash``."
785+
"porque no todos los conjuntos son :term:`hashable` o inmutables. Para "
786+
"agregar la capacidad de encadenamiento en conjuntos usando métodos mixin, "
787+
"herede de ambos :meth:`Set` y :meth:`Hashable`, luego defina ``__hash__ = "
788+
"Set._hash``."
785789

786790
#: ../Doc/library/collections.abc.rst:429
787791
msgid ""

0 commit comments

Comments
 (0)