Skip to content

Commit 749912e

Browse files
JuanPerdomo00JuanPerdomo00
authored
Merge branch '3.12' into traduccion-types
2 parents abc32d3 + 13a6418 commit 749912e

31 files changed

+2707
-1527
lines changed

‎.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Obtiene la lista de archivos .po con cambios (sólo en PRs)
5353
if: github.event_name == 'pull_request'
5454
id: changed-po-files
55-
uses: tj-actions/changed-files@v40
55+
uses: tj-actions/changed-files@v41
5656
with:
5757
files: |
5858
**/*.po

‎.github/workflows/pr-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
python -m pip install -r base-branch/requirements.txt
3838
- name: Obtiene lista de archivos con cambios
3939
id: changed-files
40-
uses: tj-actions/changed-files@v40
40+
uses: tj-actions/changed-files@v41
4141
with:
4242
files: |
4343
**/*.po

‎.overrides/faq.rst

Lines changed: 3 additions & 3 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 18 additions & 12 deletions
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

Lines changed: 4 additions & 1 deletion
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
@@ -178,6 +180,7 @@ María José Molina Contreras (@mjmolina)
178180
María Saiz Muñoz (@mariasm87)
179181
Martín Gaitán (@mgaitan)
180182
Martín Ramírez (@tinchoram)
183+
Mateo Cámara (@MateoCamara)
181184
Matias Bordese (@matiasb)
182185
Melissa Escobar Gutiérrez (@MelissaEscobar)
183186
Miguel Ángel
@@ -238,4 +241,4 @@ Xavi Francisco (@srxavi)
238241
Xavi Rambla Centellas (@xavirambla)
239242
Yennifer Paola Herrera Ariza (@Yenniferh)
240243
Yohanna Padrino (@Yo-hanaPR)
241-
zejiran
244+
zejiran

‎dictionaries/glossary.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
serializarla
12
suscripto

‎dictionaries/library_sys.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
memoryview
2-
nan
31
cachés
4-
pycache
52
codifíquelo
6-
replace
3+
enumerador
4+
fronzenset
5+
memoryview
6+
nan
77
pth
8+
pycache
89
pydebug
10+
replace
11+
sandbox
912
surrogateescape
10-
enumerador
11-
fronzenset

‎dictionaries/whatsnew_3.12.txt

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
preinstala
2+
override
3+
hasheable
4+
Badaracco
5+
Bhat
6+
Bower
7+
Bradshaw
8+
Braun
9+
Carlton
10+
Chan
11+
Chhina
12+
Cristián
13+
Domenico
14+
Donghee
15+
Firebird
16+
Franek
17+
Fredes
18+
Frost
19+
Galeon
20+
Ganguly
21+
Gao
22+
Gedam
23+
Georgi
24+
Gibson
25+
Goergens
26+
Grail
27+
Iarygin
28+
Iceape
29+
Jacob
30+
Jakob
31+
Julien
32+
Machalow
33+
Macías
34+
Magiera
35+
Maureira
36+
Modzelewski
37+
Mosaic
38+
Neumaier
39+
Ofey
40+
Palard
41+
Pradyun
42+
Pranav
43+
Ragusa
44+
Roshan
45+
Skipstone
46+
Soumendra
47+
Spearman
48+
Stanislav
49+
Thulasiram
50+
Tian
51+
Troxler
52+
Varsovia
53+
Walls
54+
Wenyang
55+
Wenzel
56+
Zmiev
57+
Zorin
58+
aclocal
59+
adáptelo
60+
bools
61+
conmutatividad
62+
pbd
63+
pseudoinstrucciones
64+
pseudoinstrucción
65+
tokenizarlo
66+
tríada

0 commit comments

Comments
 (0)