Skip to content

Commit ba3c701

Browse files
jcaalzagojcaalzago
authored
Merge branch '3.12' into division_a_la_baja_1
2 parents c0430ff + fc3aa91 commit ba3c701

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3392
-2313
lines changed

‎.github/workflows/main.yml

Lines changed: 6 additions & 2 deletions
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: |
@@ -48,7 +52,7 @@ jobs:
4852
- name: Obtiene la lista de archivos .po con cambios (sólo en PRs)
4953
if: github.event_name == 'pull_request'
5054
id: changed-po-files
51-
uses: tj-actions/changed-files@v40
55+
uses: tj-actions/changed-files@v41
5256
with:
5357
files: |
5458
**/*.po

‎.github/workflows/pr-comment.yml

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,41 @@ 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:
13-
ref: ${{ github.event.pull_request.merge_commit_sha }}
19+
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
25-
uses: tj-actions/changed-files@v40
40+
uses: tj-actions/changed-files@v41
2641
with:
2742
files: |
2843
**/*.po
@@ -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

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

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: 5 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)
@@ -120,6 +121,7 @@ Jimmy Tzuc (@JimmyTzuc)
120121
Jonathan Aguilar (@drawsoek)
121122
Jorge Luis McDonald Stevens (@jmaxter)
122123
Jorge Maldonado Ventura (@jorgesumle)
124+
José Carlos Álvarez González (@jcaalzago)
123125
José Daniel Gonzalez (@jdgc14)
124126
Jose Ignacio Riaño Chico
125127
José Luis Cantilo (@jcantilo)
@@ -157,6 +159,7 @@ Lis
157159
Lucas Miranda
158160
Luciano Bovio (@lbovio)
159161
Luis A. Gonzalez (@sublian)
162+
Luis Enriquez Torres (@lenriquezt)
160163
Luis Llave (@llaveluis)
161164
Luis Sánchez (@LuisAISanchez)
162165
Maia
@@ -177,6 +180,7 @@ María José Molina Contreras (@mjmolina)
177180
María Saiz Muñoz (@mariasm87)
178181
Martín Gaitán (@mgaitan)
179182
Martín Ramírez (@tinchoram)
183+
Mateo Cámara (@MateoCamara)
180184
Matias Bordese (@matiasb)
181185
Melissa Escobar Gutiérrez (@MelissaEscobar)
182186
Miguel Ángel
@@ -237,4 +241,4 @@ Xavi Francisco (@srxavi)
237241
Xavi Rambla Centellas (@xavirambla)
238242
Yennifer Paola Herrera Ariza (@Yenniferh)
239243
Yohanna Padrino (@Yo-hanaPR)
240-
zejiran
244+
zejiran

‎about.po

Lines changed: 9 additions & 10 deletions
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: 2022-10-25 19:47+0200\n"
14-
"PO-Revision-Date: 2019-12-22 12:23+0100\n"
15-
"Last-Translator: \n"
16-
"Language: es\n"
14+
"PO-Revision-Date: 2023-11-26 19:02+0100\n"
15+
"Last-Translator: Marcos Medrano <marcosmedrano0@gmail.com>\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.10.3\n"
23+
"X-Generator: Poedit 3.4.1\n"
2324

2425
#: ../Doc/about.rst:3
2526
msgid "About these documents"
@@ -59,22 +60,20 @@ msgstr ""
5960
"herramientas de Python y escritor de gran parte del contenido;"
6061

6162
#: ../Doc/about.rst:24
62-
#, fuzzy
6363
msgid ""
6464
"the `Docutils <https://docutils.sourceforge.io/>`_ project for creating "
6565
"reStructuredText and the Docutils suite;"
6666
msgstr ""
67-
"el proyecto `Docutils <http://docutils.sourceforge.net/>`_ para creación de "
68-
"reStructuredText y el juego de Utilidades de Documentación;"
67+
"el proyecto `Docutils <https://docutils.sourceforge.io/>`_ para creación de "
68+
"reStructuredText y la suite Docutils;"
6969

7070
#: ../Doc/about.rst:26
71-
#, fuzzy
7271
msgid ""
7372
"Fredrik Lundh for his Alternative Python Reference project from which Sphinx "
7473
"got many good ideas."
7574
msgstr ""
76-
"Fredrik Lundh por su proyecto `Referencia Alternativa de Python <http://"
77-
"effbot.org/zone/pyref.htm>`_ para la cual Sphinx tuvo muchas ideas."
75+
"Fredrik Lundh por su proyecto Referencia Alternativa de Python del que "
76+
"Sphinx obtuvo muchas buenas ideas."
7877

7978
#: ../Doc/about.rst:31
8079
msgid "Contributors to the Python Documentation"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy