From d6b2da2249665f779f41512d2ea4d28c63ba29b4 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Wed, 8 Jan 2025 11:15:36 +0100 Subject: [PATCH] Update pyenv to 2.5.0 and Python version Updates python to 2.5.0 and sets the Python version to 3.12.8. Furthermore, follows the recommendation in the v2.5.0 release notes to use `pyenv init - ` instead of `pyenv init -` as this should show better performance. --- .github/workflows/ci_linux_x64_asan-libshortfin.yml | 12 ++++++------ docs/developer_guide.md | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_linux_x64_asan-libshortfin.yml b/.github/workflows/ci_linux_x64_asan-libshortfin.yml index 3f2cc0d41..121b236fd 100644 --- a/.github/workflows/ci_linux_x64_asan-libshortfin.yml +++ b/.github/workflows/ci_linux_x64_asan-libshortfin.yml @@ -32,8 +32,8 @@ concurrency: env: PYENV_ROOT: ${{ github.workspace }}/pyenv - PYENV_REF: 96b3fb2fc3bee85650cb22e2cb06c83c24509a6d # v2.4.17 - PYTHON_VER: 3.12.7 + PYENV_REF: 2aff0df76deacd9b6c49de8870f0255d24d3b31b # v2.5.0 + PYTHON_VER: 3.12.8 CACHE_ASAN_VER: 2 CACHE_DEPS_VER: 1 LIBSHORTFIN_DIR: ${{ github.workspace }}/shortfin/ @@ -76,7 +76,7 @@ jobs: working-directory: ${{ env.PYENV_ROOT }} run: | src/configure && make -C src - export PATH=${{ env.PYENV_ROOT }}/bin:$PATH && eval "$(pyenv init -)" + export PATH=${{ env.PYENV_ROOT }}/bin:$PATH && eval "$(pyenv init - bash)" CC=clang-18 CXX=clang++-18 LDFLAGS="-lstdc++" PYTHON_CONFIGURE_OPTS="--with-address-sanitizer" pyenv install -v ${{ env.PYTHON_VER }} pyenv global ${{ env.PYTHON_VER }} @@ -122,7 +122,7 @@ jobs: if: steps.cache-python-deps-restore.outputs.cache-hit != 'true' working-directory: ${{ env.LIBSHORTFIN_DIR }} run: | - eval "$(pyenv init -)" + eval "$(pyenv init - bash)" pip install -r requirements-tests.txt pip install -r ../requirements-iree-pinned.txt pip freeze @@ -138,7 +138,7 @@ jobs: - name: Build shortfin working-directory: ${{ env.LIBSHORTFIN_DIR }} run: | - eval "$(pyenv init -)" + eval "$(pyenv init - bash)" SHORTFIN_ENABLE_ASAN=ON \ SHORTFIN_DEV_MODE=ON \ SHORTFIN_RUN_CTESTS=ON \ @@ -151,5 +151,5 @@ jobs: ASAN_OPTIONS: detect_odr_violation=0 working-directory: ${{ env.LIBSHORTFIN_DIR }} run: | - eval "$(pyenv init -)" + eval "$(pyenv init - bash)" pytest -s --durations=10 --timeout=30 diff --git a/docs/developer_guide.md b/docs/developer_guide.md index 73aee61f7..c347b9dac 100644 --- a/docs/developer_guide.md +++ b/docs/developer_guide.md @@ -40,7 +40,7 @@ Then, make pyenv available by adding the below to your `~/.bashrc`: ```bash export PYENV_ROOT="$HOME/.pyenv" command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init -)" +eval "$(pyenv init - bash)" ``` Finally, install a pyenv-managed version of python