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..c3f9fd3d2a 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,16 @@ 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, by updating Python version to 3.12 in the ``.github/workflows/main.yml`` file. -#. Upgrade GitHub Actions to use Python 3.12 +#. Update the *Read the Docs* project to use 3.12 in the build and also as default branch/version. + +#. Commit all the newly created files locally. + +#. Create branch 3.12 in the repository in order to merge changes there. + +#. Inside the github project settings, set 3.12 branch as the default branch for the repository. -#. Update Read the Docs project to use 3.12 in the build and also as default branch/version