From 99fb90ee17596bc37a78b95b6db31819026a7b69 Mon Sep 17 00:00:00 2001 From: Andrea Alegre Date: Fri, 3 Nov 2023 17:52:15 +0100 Subject: [PATCH 1/4] =?UTF-8?q?Actualization=20de=20notas=20de=20migraci?= =?UTF-8?q?=C3=B3n=20(parte=201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .overrides/faq.rst | 6 ++--- .overrides/progress.rst | 2 +- .overrides/upgrade-python-version.rst | 35 ++++++++++++++++++--------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/.overrides/faq.rst b/.overrides/faq.rst index c8787919d8..11f9a09e63 100644 --- a/.overrides/faq.rst +++ b/.overrides/faq.rst @@ -204,9 +204,9 @@ repositorio principal de la traducción). Se hace de la siguiente manera:: Luego nos vamos a nuestra rama local, confirmamos e impactamos esos cambios:: - git checkout 3.11 - git merge upstream/3.11 - git push origin 3.11 + git checkout 3.12 + git merge upstream/3.12 + git push origin 3.12 ¡Eso es todo! diff --git a/.overrides/progress.rst b/.overrides/progress.rst index 1c7e357a49..f17fb86017 100644 --- a/.overrides/progress.rst +++ b/.overrides/progress.rst @@ -10,7 +10,7 @@ y otras estadísticas. .. note:: - Estas listas se actualiza automáticamente cuando Pull Requests se *mergean* a la rama ``3.11``. + Estas listas se actualiza automáticamente cuando Pull Requests se *mergean* a la rama ``3.12``. En progreso diff --git a/.overrides/upgrade-python-version.rst b/.overrides/upgrade-python-version.rst index 01ae80bf5e..9101d0d227 100644 --- a/.overrides/upgrade-python-version.rst +++ b/.overrides/upgrade-python-version.rst @@ -39,6 +39,12 @@ We are currently in branch 3.11, and we want to update the strings from 3.12. .. note:: This is important, so the later ``make build`` step will not reset the cpython submodule to the previous hash on the old branch. +#. Create a virtual environment and install the dependencies of the project:: + + python -m venv env + source env/bin/activate # Windows: env\Scripts\activate.bat + pip install -r requirements.txt + #. Verify that the docs build with the new versions you changed from ``requirements.txt`` mainly the sphinx version:: @@ -53,7 +59,7 @@ We are currently in branch 3.11, and we want to update the strings from 3.12. #. Clean possible garbage (form previous builds):: - rm -rf _build ../python-docs-es-pot cpython/Doc/CONTRIBUTING.rst cpython/Doc/upgrade-python-version.rst + rm -rf _build ../python-docs-es-pot cpython/Doc/CONTRIBUTING.rst cpython/Doc/upgrade-python-version.rst reviewers-guide.rst .. note:: @@ -61,13 +67,6 @@ We are currently in branch 3.11, and we want to update the strings from 3.12. in the next step. It's included here because it might be a leftover from previous attempts on your machine. -#. Create a virtual environment and install the dependencies of the project:: - - python -m venv env - source env/bin/activate # Windows: env\Scripts\activate.bat - pip install -r requirements.txt - - #. Create the .po files from the new source code. This will generate all the .po files for version 3.11:: SPHINX_GETTEXT=True sphinx-build -j auto -b gettext -d _build/doctrees . ../python-docs-es-pot @@ -114,9 +113,21 @@ We are currently in branch 3.11, and we want to update the strings from 3.12. of the new branch is done. So prepare a cup of any hot beverage and fix them. -Once the process is completely and you are happy with the results, -there are a few extra steps to finish the process:: +**Once the process is completely and you are happy with the results, +there are a few extra steps to finish the process** + +#. Upgrade GitHub Actions to use Python 3.12:: + Something to be done. -#. Upgrade GitHub Actions to use Python 3.12 +#. Update Read the Docs project to use 3.12 in the build and also as default branch/version:: + Update here. + +#. Añadir paso final de commitear todos los archivos generados:: + // TODO + +#. Crear rama 3.12 en el repositorio para hacer el merge ahí:: + // TODO + +#. Cambiar branch por defecto en el repositorio:: + // TODO -#. Update Read the Docs project to use 3.12 in the build and also as default branch/version From aae59789f92637bd19ab24cc2e19f6b73466f5ff Mon Sep 17 00:00:00 2001 From: Andrea Alegre Date: Fri, 3 Nov 2023 18:20:43 +0100 Subject: [PATCH 2/4] Complete instructions for upgrade and update version in github action file --- .github/workflows/main.yml | 4 ++-- .overrides/upgrade-python-version.rst | 15 +++++---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e8e7dd1474..287545966b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - name: Preparar Python v3.11 + - name: Preparar Python v3.12 uses: actions/setup-python@v4 with: - python-version: "3.11" + python-version: "3.12" cache: "pip" - name: Sincronizar con CPython run: | diff --git a/.overrides/upgrade-python-version.rst b/.overrides/upgrade-python-version.rst index 9101d0d227..1f586ef7da 100644 --- a/.overrides/upgrade-python-version.rst +++ b/.overrides/upgrade-python-version.rst @@ -116,18 +116,13 @@ We are currently in branch 3.11, and we want to update the strings from 3.12. **Once the process is completely and you are happy with the results, there are a few extra steps to finish the process** -#. Upgrade GitHub Actions to use Python 3.12:: - Something to be done. +#. Upgrade GitHub Actions to use Python 3.12, by updating Python version to 3.12 in the '.github/workflows/main.yml' file. -#. Update Read the Docs project to use 3.12 in the build and also as default branch/version:: - Update here. +#. Update the *Read the Docs* project to use 3.12 in the build and also as default branch/version. -#. Añadir paso final de commitear todos los archivos generados:: - // TODO +#. Commit all the newly created files locally. -#. Crear rama 3.12 en el repositorio para hacer el merge ahí:: - // TODO +#. Create branch 3.12 in the repository in order to merge changes there. -#. Cambiar branch por defecto en el repositorio:: - // TODO +#. Inside the github project settings, set 3.12 branch as the default branch for the repository. From e12033251419e7e693f1fba0da06344a27ed05c2 Mon Sep 17 00:00:00 2001 From: Andrea Alegre Date: Sat, 4 Nov 2023 22:04:19 +0100 Subject: [PATCH 3/4] Update .overrides/upgrade-python-version.rst Co-authored-by: rtobar --- .overrides/upgrade-python-version.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.overrides/upgrade-python-version.rst b/.overrides/upgrade-python-version.rst index 1f586ef7da..c3f9fd3d2a 100644 --- a/.overrides/upgrade-python-version.rst +++ b/.overrides/upgrade-python-version.rst @@ -116,7 +116,7 @@ We are currently in branch 3.11, and we want to update the strings from 3.12. **Once the process is completely and you are happy with the results, there are a few extra steps to finish the process** -#. Upgrade GitHub Actions to use Python 3.12, by updating Python version to 3.12 in the '.github/workflows/main.yml' file. +#. Upgrade GitHub Actions to use Python 3.12, by updating Python version to 3.12 in the ``.github/workflows/main.yml`` file. #. Update the *Read the Docs* project to use 3.12 in the build and also as default branch/version. From 8a7ac289010eadfa74ede7a0eb3e708529fff352 Mon Sep 17 00:00:00 2001 From: Marcos Medrano <786907+mmmarcos@users.noreply.github.com> Date: Sat, 23 Dec 2023 18:23:10 +0100 Subject: [PATCH 4/4] Apply suggestions from code review --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d38d3ea1e9..f3dfb25fc5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,10 +20,10 @@ jobs: fetch-depth: 2 # Instalación de dependencias - - name: Preparar Python v3.12 + - name: Preparar Python v3.11 uses: actions/setup-python@v4 with: - python-version: "3.12" + python-version: "3.11" cache: "pip" - name: Configura dpkg/apt para ejecutarse de manera eficiente uses: abbbi/github-actions-tune@v1