From a6ef1e70baa7b4b9a6a04fb7eab41007fdf769ef Mon Sep 17 00:00:00 2001 From: macayu17 Date: Sat, 8 Aug 2026 22:41:11 +0530 Subject: [PATCH] Resolve version prefixes in package names --- .../pyenv-binary/libexec/pyenv-binary-package-name | 2 ++ plugins/pyenv-binary/test/package-name.bats | 11 ++++++++--- plugins/pyenv-binary/test/package.bats | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/pyenv-binary/libexec/pyenv-binary-package-name b/plugins/pyenv-binary/libexec/pyenv-binary-package-name index 7fbd9bf3..649c9925 100755 --- a/plugins/pyenv-binary/libexec/pyenv-binary-package-name +++ b/plugins/pyenv-binary/libexec/pyenv-binary-package-name @@ -28,6 +28,8 @@ case "$version" in ;; esac +version="$(pyenv-latest -f -k "$version")" + os="$(uname -s)" arch="$(uname -m)" distro="" diff --git a/plugins/pyenv-binary/test/package-name.bats b/plugins/pyenv-binary/test/package-name.bats index dadb4caf..dcd66089 100644 --- a/plugins/pyenv-binary/test/package-name.bats +++ b/plugins/pyenv-binary/test/package-name.bats @@ -2,6 +2,10 @@ load test_helper +_setup() { + create_stub pyenv-latest '[ "$1" = "-f" ] && [ "$2" = "-k" ] && shift 2 && echo "$*"' +} + @test "completion lists installable versions" { create_stub pyenv-install \ '[ "$*" = "--list --bare" ] && echo 3.13.14' @@ -40,12 +44,13 @@ load test_helper assert_success "3.13.14-macos-15.5-arm64" } -@test "generates a package name for FreeBSD" { +@test "resolves a version prefix when generating a package name" { + create_stub pyenv-latest '[ "$*" = "-f -k 3" ] && echo 3.14.7' create_stub uname \ 'case "$1" in -s) echo FreeBSD;; -m) echo amd64;; -r) echo 14.2-RELEASE-p3;; esac' - run pyenv-binary-package-name 3.13.14 - assert_success "3.13.14-freebsd-14.2-release-p3-amd64" + run pyenv-binary-package-name 3 + assert_success "3.14.7-freebsd-14.2-release-p3-amd64" } @test "rejects an invalid version name" { diff --git a/plugins/pyenv-binary/test/package.bats b/plugins/pyenv-binary/test/package.bats index a3d7ceb1..6262a8c3 100644 --- a/plugins/pyenv-binary/test/package.bats +++ b/plugins/pyenv-binary/test/package.bats @@ -7,6 +7,7 @@ load test_helper # `generate-installer' behave the same on any test host. stub_build_environment() { create_stub pyenv-install 'mkdir -p "${PYENV_ROOT}/versions/${1##*:}/bin"' + create_stub pyenv-latest '[ "$1" = "-f" ] && [ "$2" = "-k" ] && shift 2 && echo "$*"' create_stub uname 'case "$1" in -s) echo Linux;; -m) echo x86_64;; esac' create_stub getconf 'echo "glibc 2.17"' }