Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit701c347

Browse files
authored
Merge branch '3.12' into traduccion-introduction.po
2 parents6b29ddb +a761633 commit701c347

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

+1176
-840
lines changed

‎.github/workflows/main.yml

Lines changed: 53 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,77 @@ jobs:
1111
name:Test
1212
runs-on:ubuntu-22.04
1313
steps:
14+
# Obtención del código
1415
-uses:actions/checkout@v4
16+
with:
17+
submodules:'true'
18+
# Necesario para que tj-actions/changed-files se ejecute
19+
# dentro de un tiempo adecuado
20+
fetch-depth:2
21+
22+
# Instalación de dependencias
1523
-name:Preparar Python v3.11
1624
uses:actions/setup-python@v4
1725
with:
1826
python-version:"3.11"
1927
cache:"pip"
20-
-name:Sincronizar con CPython
28+
-name:Configura dpkg/apt para ejecutarse de manera eficiente
29+
uses:abbbi/github-actions-tune@v1
30+
-name:Deshabilita triggers de postgresql-common
31+
run:sudo sed -i '/postgresql-common/d' /var/lib/dpkg/triggers/File
32+
-name:Instalar dependencias de sistema
2133
run:|
22-
git submodule update --init --depth=1 cpython
23-
-name:Instalar dependencias
34+
sudo apt-get install -y hunspell hunspell-es gettext language-pack-es locales-all
35+
-name:Instalar dependencias de Python
2436
run:|
25-
sudo apt-get update
26-
sudo apt-get install -y hunspell hunspell-es gettext language-pack-es
2737
python -m pip install -r requirements.txt
38+
-name:Listar paquetes y versiones
39+
run:|
2840
pip list
2941
pospell --version
3042
powrap --version
43+
44+
# Cálculo de los archivos .po a verificar.
45+
# En el caso de un PR, sólo se chequean los .po que se están editando,
46+
# mientras que en caseo de un push a las ramas 3.* queremos revisar
47+
# todos los archivos
48+
-name:Obtiene la lista de archivos .po con cambios (sólo en PRs)
49+
if:github.event_name == 'pull_request'
50+
id:changed-po-files
51+
uses:tj-actions/changed-files@v40
52+
with:
53+
files:|
54+
**/*.po
55+
-name:Calcula lista de archivos .po a revisar
56+
id:po-files-to-check
57+
env:
58+
PO_FILES_TO_CHECK:${{ steps.changed-po-files.conclusion == 'skipped' && '**/*.po' || steps.changed-po-files.outputs.all_changed_files }}
59+
run:|
60+
echo "po_files_to_check=$PO_FILES_TO_CHECK" >> $GITHUB_OUTPUT
61+
echo "any_po_files_to_check=`test -n \"$PO_FILES_TO_CHECK\" && echo true || echo false`" >> $GITHUB_OUTPUT
62+
-name:Muestra outputs de steps anteriores para debugueo
63+
env:
64+
CHANGED_PO_FILES:${{ toJson(steps.changed-po-files) }}
65+
PO_FILES_TO_CHECK:${{ toJson(steps.po-files-to-check) }}
66+
run:|
67+
echo "steps.changed-po-files=$PO_FILES_TO_CHECK"
68+
echo "steps.po-files-to-change.$CHANGED_PO_FILES"
69+
70+
# Chequeos a realizar
3171
-name:TRANSLATORS
3272
run:|
3373
diff -Naur TRANSLATORS <(LANG=es python scripts/sort.py < TRANSLATORS)
3474
-name:Powrap
35-
run:powrap --check --quiet **/*.po
75+
if:steps.po-files-to-check.outputs.any_po_files_to_check == 'true'
76+
run:powrap --check --quiet ${{ steps.po-files-to-check.outputs.po_files_to_check }}
3677
-name:Sphinx lint
37-
run:|
38-
sphinx-lint*/*.po
78+
if:steps.po-files-to-check.outputs.any_po_files_to_check == 'true'
79+
run:sphinx-lint${{ steps.po-files-to-check.outputs.po_files_to_check }}
3980
-name:Pospell
40-
run:|
41-
python scripts/check_spell.py
81+
if:steps.po-files-to-check.outputs.any_po_files_to_check == 'true'
82+
run:python scripts/check_spell.py ${{ steps.po-files-to-check.outputs.po_files_to_check }}
83+
84+
# Construcción de la documentación
4285
-name:Construir documentación
4386
run:|
4487
# FIXME: Relative paths for includes in 'cpython'

‎.github/workflows/pr-comment.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name:Agrega comentario a PR
2+
3+
on:
4+
pull_request_target:
5+
6+
jobs:
7+
pr-comment:
8+
name:Entradas sin traducción
9+
runs-on:ubuntu-22.04
10+
steps:
11+
-uses:actions/checkout@v4
12+
with:
13+
ref:${{ github.event.pull_request.merge_commit_sha }}
14+
persist-credentials:false
15+
-name:Preparar Python v3.11
16+
uses:actions/setup-python@v4
17+
with:
18+
python-version:"3.11"
19+
cache:"pip"
20+
-name:Instalar dependencias
21+
run:|
22+
python -m pip install -r requirements.txt
23+
-name:Obtiene lista de archivos con cambios
24+
id:changed-files
25+
uses:tj-actions/changed-files@v40
26+
with:
27+
files:|
28+
**/*.po
29+
-name:Calcular entradas faltantes
30+
if:steps.changed-files.outputs.any_changed == 'true'
31+
id:create-pr-comment
32+
env:
33+
CHANGED_PO_FILES:${{ steps.changed-files.outputs.all_changed_files }}
34+
run:|
35+
{
36+
echo 'comment<<EOF'
37+
python scripts/list_missing_entries.py --github $CHANGED_PO_FILES
38+
echo EOF
39+
} >> "$GITHUB_OUTPUT"
40+
-name:Agregar comentario con entradas faltantes
41+
if:steps.changed-files.outputs.any_changed == 'true'
42+
uses:thollander/actions-comment-pull-request@v2
43+
with:
44+
message:${{ steps.create-pr-comment.outputs.comment }}
45+
comment_tag:missing-entries

‎.overrides/upgrade-python-version.rst

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,32 @@
33
How to update to a new Python version
44
=====================================
55

6-
We are currently in branch 3.10, and we want to update the strings from 3.11.
6+
We are currently in branch 3.11, and we want to update the strings from 3.12.
77

8+
#. Make sure you are in a clean state of the branch 3.11
89

9-
#. Make sure you are in a clean state of the branch 3.10
10-
11-
#. Create a new branch called ``3.11``
10+
#. Create a new branch called ``3.12``
1211

1312
#. Initialize the submodules::
1413

1514
git submodule init
1615
git submodule update
1716

18-
#. Fetch the `latest commit of 3.11 branch<https://github.com/python/cpython/commit/b3cafb60afeb2300002af9982d43703435b8302d>`_::
17+
#. Fetch the `latest commit of 3.12 branch<https://github.com/python/cpython/commit/0fb18b02c8ad56299d6a2910be0bab8ad601ef24>`_::
1918

2019
cd cpython/
21-
git fetch --depth 1 originb3cafb60afeb2300002af9982d43703435b8302d
20+
git fetch --depth 1 origin0fb18b02c8ad56299d6a2910be0bab8ad601ef24
2221

2322
.. note:: you could also base the hash on the 'git tag' from the desired
24-
version: ``git checkout tags/v3.11.0 -b 3.11`` considering that
25-
``3.11`` doesn't exist locally.
23+
version: ``git checkout tags/v3.12.0 -b 3.12`` considering that
24+
``3.12`` doesn't exist locally.
2625

2726
#. Checkout that commit locally::
2827

29-
git checkoutb3cafb60afeb2300002af9982d43703435b8302d
28+
git checkout0fb18b02c8ad56299d6a2910be0bab8ad601ef24
3029

3130
#. Update the branch on the ``Makefile`` and check the ``requirements.txt`` from
32-
thecpython repository, to see if upgrades on the modules like sphinx is
31+
``./cpython/Doc`` directory, to see if upgrades on the modules like sphinx is
3332
needed.
3433

3534
#. Commit the update of the submodule change::
@@ -43,7 +42,7 @@ We are currently in branch 3.10, and we want to update the strings from 3.11.
4342
#. Verify that the docs build with the new versions you changed from
4443
``requirements.txt`` mainly the sphinx version::
4544

46-
makehtml
45+
makebuild
4746

4847
..note::
4948

@@ -75,7 +74,7 @@ We are currently in branch 3.10, and we want to update the strings from 3.11.
7574

7675
.. note::
7776

78-
In ``../python-docs-es-pot`` directory, we will have the new .pot files with new strings from 3.11 branch.
77+
In ``../python-docs-es-pot`` directory, we will have the new .pot files with new strings from 3.12 branch.
7978
All these strings will be *untranslated* at this point.
8079

8180
#. Now, we update our translated files form the source language (English) with new strings::
@@ -85,8 +84,8 @@ We are currently in branch 3.10, and we want to update the strings from 3.11.
8584
#. At this point, all the ``.po`` files will have a different comment on each translation phrase,
8685
for example::
8786

88-
-#: ../python-docs-es/cpython/Doc/whatsnew/3.11.rst:3
89-
+#: ../Doc/whatsnew/3.11.rst:3
87+
-#: ../python-docs-es/cpython/Doc/whatsnew/3.12.rst:3
88+
+#: ../Doc/whatsnew/3.12.rst:3
9089

9190
As you can see, it added the path of the local repository, but you can
9291
remove it from it with this regular expression::
@@ -115,10 +114,9 @@ We are currently in branch 3.10, and we want to update the strings from 3.11.
115114
of the new branch is done. So prepare a cup of any hot beverage
116115
and fix them.
117116

118-
119117
Once the process is completely and you are happy with the results,
120118
there are a few extra steps to finish the process::
121119

122-
#. Upgrade GitHub Actions to use Python 3.11
120+
#. Upgrade GitHub Actions to use Python 3.12
123121

124-
#. Update Read the Docs project to use 3.11 in the build and also as default branch/version
122+
#. Update Read the Docs project to use 3.12 in the build and also as default branch/version
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
monitorean
2+
monitorearse
3+
monitoreado
4+
monitoreen
5+
monitorean
6+
monitoreados
7+
stopiteration

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp