diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77d6b2ed48532e29f7f6498884aab9bf1f3a9f64..8b099f428d0891c5ec51cbf096d6e0f928780a90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ variables: # /!\ CI_REGISTRY is overriden to use a private Docker registry mirror in AWS ECR # in GitLab namespaces `nomadic-labs` and `tezos` ## This value MUST be the same as `opam_repository_tag` in `scripts/version.sh` - build_deps_image_version: 74aaa3a741443be2f5ee4d08e6b63898ec99f450 + build_deps_image_version: cf7920c4fe635f92bc703fe7ae6fd38c9b4ba8a3 build_deps_image_name: "${CI_REGISTRY}/tezos/opam-repository" GIT_STRATEGY: fetch GIT_DEPTH: "1" diff --git a/docs/developer/install-python-debian-ubuntu.sh b/docs/developer/install-python-debian-ubuntu.sh index 7b3b9fe59426268f00a7010d92f2b698e7db597d..75357a14ce9f024a75bd4ef84055b5c9d286eb7a 100755 --- a/docs/developer/install-python-debian-ubuntu.sh +++ b/docs/developer/install-python-debian-ubuntu.sh @@ -67,20 +67,20 @@ pyenv --version [ "$PYENV_VIRTUALENV_INIT" = "1" ] ## -## Install python 3.10.11 through pyenv +## Install python 3.10.12 through pyenv ## ## References: ## - https://github.com/pyenv/pyenv#usage # [install python through pyenv] -pyenv install 3.10.11 -pyenv global 3.10.11 +pyenv install 3.10.12 +pyenv global 3.10.12 # [print python version] -python --version # should output 3.10.11 +python --version # should output 3.10.12 # [verify python version] -[ "$(python --version)" = "Python 3.10.11" ] +[ "$(python --version)" = "Python 3.10.12" ] ## ## Install poetry diff --git a/docs/developer/python_environment.rst b/docs/developer/python_environment.rst index cff43db16359db63fe5285f396996009dc973d6d..3218e53c5ec4f2b8cbced4538edfe5109d11a05b 100644 --- a/docs/developer/python_environment.rst +++ b/docs/developer/python_environment.rst @@ -12,7 +12,7 @@ Installation Prerequisites: -- ``python 3.10.11``. It is recommended to use `pyenv +- ``python 3.10.12``. It is recommended to use `pyenv `_ to manage the python versions. If you want to use ``pyenv``: @@ -21,11 +21,11 @@ Prerequisites: has been executed first during the shell session, by adding this line to an environment script sourced automatically. - * You can use then ``pyenv install 3.10.11`` followed by: + * You can use then ``pyenv install 3.10.12`` followed by: - + ``pyenv local 3.10.11`` to use ``python 3.10.11`` only in the current directory (and its subdirectories, unless redefined) - + ``pyenv global 3.10.11`` to set the python version to ``3.10.11`` globally - + ``pyenv shell 3.10.11`` to use ``python 3.10.11`` only in the current shell + + ``pyenv local 3.10.12`` to use ``python 3.10.12`` only in the current directory (and its subdirectories, unless redefined) + + ``pyenv global 3.10.12`` to set the python version to ``3.10.12`` globally + + ``pyenv shell 3.10.12`` to use ``python 3.10.12`` only in the current shell - `poetry `_ to manage the python dependencies and run the tests in a sandboxed python environment. Follow the `installation instructions `__. @@ -39,8 +39,8 @@ A typical installation of the above prerequisites (including their own prerequis # 1. install pyenv # 2. restart shell, to ensure "pyenv init -" has been evaluated # 3. then install python using pyenv: - pyenv install 3.10.11 - pyenv global 3.10.11 + pyenv install 3.10.12 + pyenv global 3.10.12 # 4. install poetry # 5. restart shell, to activate the poetry setup # 6. then install dependencies for Octez using poetry: @@ -88,7 +88,7 @@ executing ``pyenv``: :start-after: [print pyenv version] :end-before: [verify pyenv installation] -Now we can use ``pyenv`` to install Python 3.10.11 and set it as the +Now we can use ``pyenv`` to install Python 3.10.12 and set it as the default version to use: .. literalinclude:: install-python-debian-ubuntu.sh diff --git a/scripts/version.sh b/scripts/version.sh index d03672981b6223fa6ea0fea1c4d6a1da5441f5d9..d50570618a056caab29efd6877dcf5307f891fa1 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -25,7 +25,7 @@ export full_opam_repository_tag=0e89b5b0195c6f2597c95251896e1ef8b199c1d2 ## opam_repository is an additional, tezos-specific opam repository. ## This value MUST be the same as `build_deps_image_version` in `.gitlab-ci.yml` export opam_repository_url=https://gitlab.com/tezos/opam-repository -export opam_repository_tag="${OPAM_REPOSITORY_TAG:-74aaa3a741443be2f5ee4d08e6b63898ec99f450}" +export opam_repository_tag="${OPAM_REPOSITORY_TAG:-cf7920c4fe635f92bc703fe7ae6fd38c9b4ba8a3}" export opam_repository_git="$opam_repository_url.git" export opam_repository="$opam_repository_git"\#"$opam_repository_tag"