From 330e3fc130cd464a012a0b06d8c1ea41447956eb Mon Sep 17 00:00:00 2001 From: native-api Date: Sun, 22 Dec 2024 23:38:58 +0300 Subject: [PATCH 1/3] CI: use Ubuntu 24.04; use ubuntu-latest for the ubuntu_build check (#3144) Now that ubuntu-24 is out of beta at Github Since for ubuntu_build, we only use one OS version and the changes between versions are not as drastic as with MacOS, it seems safe to have it upgrade automatically. --- .github/workflows/modified_scripts_build.yml | 4 ++-- .github/workflows/pyenv_tests.yml | 1 + .github/workflows/ubuntu_build.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/modified_scripts_build.yml b/.github/workflows/modified_scripts_build.yml index 1bef9cbd..a9cd75a8 100644 --- a/.github/workflows/modified_scripts_build.yml +++ b/.github/workflows/modified_scripts_build.yml @@ -157,7 +157,7 @@ jobs: fail-fast: false matrix: python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions)}} - os: ["ubuntu-20.04", "ubuntu-22.04"] + os: ["ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -215,7 +215,7 @@ jobs: fail-fast: false matrix: python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions_cpython_only)}} - os: ["ubuntu-20.04", "ubuntu-22.04"] + os: ["ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pyenv_tests.yml b/.github/workflows/pyenv_tests.yml index aa8f4959..8cead600 100644 --- a/.github/workflows/pyenv_tests.yml +++ b/.github/workflows/pyenv_tests.yml @@ -10,6 +10,7 @@ jobs: fail-fast: false matrix: os: + - ubuntu-24.04 - ubuntu-22.04 - ubuntu-20.04 - macos-14 diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml index 71c23dff..b8b08e2b 100644 --- a/.github/workflows/ubuntu_build.yml +++ b/.github/workflows/ubuntu_build.yml @@ -15,7 +15,7 @@ jobs: - "3.11" - "3.12" - "3.13" - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 # Normally, we would use the superbly maintained... From 4c6b0e9c3b33c0315becb94272841468f71a8f37 Mon Sep 17 00:00:00 2001 From: Christian Fredrik Johnsen Date: Mon, 23 Dec 2024 18:58:54 +0100 Subject: [PATCH 2/3] Fix: mistake in configuration hints in `pyenv init` and manpage. (#3145) --- libexec/pyenv-init | 2 +- man/man1/pyenv.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/pyenv-init b/libexec/pyenv-init index 19d3ce1a..3892ec65 100755 --- a/libexec/pyenv-init +++ b/libexec/pyenv-init @@ -159,7 +159,7 @@ function help_() { echo echo 'export PYENV_ROOT="$HOME/.pyenv"' echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' - echo 'eval "$(pyenv init -'$shell')"' + echo 'eval "$(pyenv init - '$shell')"' ;; esac echo diff --git a/man/man1/pyenv.1 b/man/man1/pyenv.1 index c3d2de1b..106c2574 100644 --- a/man/man1/pyenv.1 +++ b/man/man1/pyenv.1 @@ -14,7 +14,7 @@ pyenv lets you easily switch between multiple versions of Python\. It's simple, .RS 15 .nf if command -v pyenv 1>/dev/null 2>&1; then\n - eval "$(pyenv init -)" \n + eval "$(pyenv init - bash)" \n fi .fi .RE From 850a74c5cd2cac8990008864b94254d6acfcd6c6 Mon Sep 17 00:00:00 2001 From: Jay Bazuzi Date: Sat, 4 Jan 2025 08:43:09 -0800 Subject: [PATCH 3/3] README: Add recommended curl arguments to suggested installer invocation (#3155) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c3e0763..134341ea 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ The Homebrew option from the [MacOS section below](#macos) would also work if yo ##### 1. Automatic installer (Recommended) ```bash -curl https://pyenv.run | bash +curl -fsSL https://pyenv.run | bash ``` For more details visit our other project: