Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pyenv for openSUSE:Factory checked in at 2024-07-25 15:40:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pyenv (Old) and /work/SRC/openSUSE:Factory/.pyenv.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pyenv" Thu Jul 25 15:40:04 2024 rev:44 rq:1189588 version:2.4.8 Changes: -------- --- /work/SRC/openSUSE:Factory/pyenv/pyenv.changes 2024-07-18 19:16:49.876290655 +0200 +++ /work/SRC/openSUSE:Factory/.pyenv.new.1882/pyenv.changes 2024-07-25 15:54:32.196183850 +0200 @@ -1,0 +2,26 @@ +Tue Jul 23 10:35:09 UTC 2024 - Thomas Schraitle <thomas.schraitle@suse.com> - 2.4.8 + +- Spec change + For the %check section, don't run "make test" but use specific + tests. Upstream uses them in their GitHub Action workflow. What's + good for them, is also good for us. + => This simplifies the overall error and no patches are needed. + +------------------------------------------------------------------- +Mon Jul 22 18:45:30 UTC 2024 - Matej Cepl <mcepl@cepl.eu> + +- Almost working testing. + +------------------------------------------------------------------- +Mon Jul 22 08:11:10 UTC 2024 - Thomas Schraitle <thomas.schraitle@suse.com> - 2.4.8 + +- Update to 2.4.8: + - Fix pyenv-uninstall not having the debug tracing invocation in #3020 + - Add CPython 3.13.0b4 and 3.13.0b4t in #3019 + - README: Remove reference to Fig in #3018 + - Fix tests failing if plugins are installed in #3022 + - pyenv-latest: replace -q with -b and -f, document as internal in #3021 + +Full Changelog: https://github.com/pyenv/pyenv/compare/v2.4.7...v2.4.8 + +------------------------------------------------------------------- Old: ---- pyenv-2.4.7.tar.gz New: ---- pyenv-2.4.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pyenv.spec ++++++ --- /var/tmp/diff_new_pack.ZNEHtH/_old 2024-07-25 15:54:32.796207242 +0200 +++ /var/tmp/diff_new_pack.ZNEHtH/_new 2024-07-25 15:54:32.800207397 +0200 @@ -19,7 +19,7 @@ %define pyenv_dir %{_libexecdir}/pyenv # Name: pyenv -Version: 2.4.7 +Version: 2.4.8 Release: 0 Summary: Python Version Management License: MIT @@ -28,6 +28,7 @@ Source: https://github.com/pyenv/pyenv/archive/refs/tags/v%{version}.tar.gz#/pyenv-%{version}.tar.gz # BuildRequires: bash-completion +BuildRequires: bats BuildRequires: fdupes BuildRequires: fish BuildRequires: gcc @@ -145,6 +146,10 @@ %fdupes %{buildroot}%{pyenv_dir} +%check +export PATH="$PATH:%{buildroot}%{_libexecdir}/pyenv/libexec" +bats test/{pyenv,hooks,versions}.bats + %files %doc CHANGELOG.md COMMANDS.md README.md %license LICENSE ++++++ pyenv-2.4.7.tar.gz -> pyenv-2.4.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/CHANGELOG.md new/pyenv-2.4.8/CHANGELOG.md --- old/pyenv-2.4.7/CHANGELOG.md 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/CHANGELOG.md 2024-07-21 06:02:45.000000000 +0200 @@ -1,5 +1,12 @@ # Version History +## Release v2.4.8 +* Fix pyenv-uninstall not having the debug tracing invocation by @native-api in https://github.com/pyenv/pyenv/pull/3020 +* Add CPython 3.13.0b4 and 3.13.0b4t by @edgarrmondragon in https://github.com/pyenv/pyenv/pull/3019 +* README: Remove reference to Fig by @ThomasHaz in https://github.com/pyenv/pyenv/pull/3018 +* Fix tests failing if plugins are installed by @native-api in https://github.com/pyenv/pyenv/pull/3022 +* pyenv-latest: replace -q with -b and -f, document as internal by @native-api in https://github.com/pyenv/pyenv/pull/3021 + ## Release v2.4.7 * Add support for anaconda3-2024.06-1 by @binbjz in https://github.com/pyenv/pyenv/pull/3009 * Fix debug build for X.Yt-dev by @native-api in https://github.com/pyenv/pyenv/pull/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/README.md new/pyenv-2.4.8/README.md --- old/pyenv-2.4.7/README.md 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/README.md 2024-07-21 06:02:45.000000000 +0200 @@ -367,12 +367,6 @@ **Proxy note**: If you use a proxy, export `http_proxy` and `https_proxy`, too. - In MacOS, you might also want to install [Fig](https://fig.io/) which -provides alternative shell completions for many command line tools with an -IDE-like popup interface in the terminal window. -(Note that their completions are independent from Pyenv's codebase -so they might be slightly out of sync for bleeding-edge interface changes.) - ### Restart your shell for the `PATH` changes to take effect. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/libexec/pyenv---version new/pyenv-2.4.8/libexec/pyenv---version --- old/pyenv-2.4.7/libexec/pyenv---version 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/libexec/pyenv---version 2024-07-21 06:02:45.000000000 +0200 @@ -12,7 +12,7 @@ set -e [ -n "$PYENV_DEBUG" ] && set -x -version="2.4.7" +version="2.4.8" git_revision="" if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/libexec/pyenv-latest new/pyenv-2.4.8/libexec/pyenv-latest --- old/pyenv-2.4.7/libexec/pyenv-latest 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/libexec/pyenv-latest 2024-07-21 06:02:45.000000000 +0200 @@ -1,9 +1,11 @@ #!/usr/bin/env bash # Summary: Print the latest installed or known version with the given prefix -# Usage: pyenv latest [-k|--known] [-q|--quiet] <prefix> +# Usage: pyenv latest [-k|--known] <prefix> # # -k/--known Select from all known versions instead of installed -# -q/--quiet Do not print an error message on resolution failure +# -b/--bypass (internal) On a resolution failure, do not print an error message +# but rather print the argument unchanged +# -f/--force (internal) Same as -b but also do not return a failure exit code set -e [ -n "$PYENV_DEBUG" ] && set -x @@ -15,8 +17,13 @@ FROM_KNOWN=1 shift ;; - -q|--quiet) - QUIET=1 + -b|--bypass) + BYPASS=1 + shift + ;; + -f|--force) + FORCE=1 + BYPASS=1 shift ;; *) @@ -71,10 +78,14 @@ if [[ -n "$DEFINITION" ]]; then echo "$DEFINITION" else - if [[ -z $QUIET ]]; then + if [[ -z $BYPASS ]]; then echo "pyenv: no $([[ -z $FROM_KNOWN ]] && echo installed || echo known) versions match the prefix \`$prefix'" >&2 + else + echo "$prefix" + fi + if [[ -z $FORCE ]]; then + exitcode=1 fi - exitcode=1 fi exit $exitcode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/libexec/pyenv-prefix new/pyenv-2.4.8/libexec/pyenv-prefix --- old/pyenv-2.4.7/libexec/pyenv-prefix 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/libexec/pyenv-prefix 2024-07-21 06:02:45.000000000 +0200 @@ -42,7 +42,7 @@ exit 1 fi else - version="$(pyenv-latest -q "$version" || echo "$version")" + version="$(pyenv-latest -f "$version")" PYENV_PREFIX_PATH="${PYENV_ROOT}/versions/${version}" fi if [ -d "$PYENV_PREFIX_PATH" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/libexec/pyenv-version-name new/pyenv-2.4.8/libexec/pyenv-version-name --- old/pyenv-2.4.7/libexec/pyenv-version-name 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/libexec/pyenv-version-name 2024-07-21 06:02:45.000000000 +0200 @@ -34,7 +34,7 @@ versions=("${versions[@]}" "${version}") elif version_exists "${version#python-}"; then versions=("${versions[@]}" "${version#python-}") - elif resolved_version="$(pyenv-latest -q "$version")"; then + elif resolved_version="$(pyenv-latest -b "$version")"; then versions=("${versions[@]}" "${resolved_version}") else echo "pyenv: version \`$version' is not installed (set by $(pyenv-version-origin))" >&2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/plugins/python-build/bin/pyenv-install new/pyenv-2.4.8/plugins/python-build/bin/pyenv-install --- old/pyenv-2.4.7/plugins/python-build/bin/pyenv-install 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/plugins/python-build/bin/pyenv-install 2024-07-21 06:02:45.000000000 +0200 @@ -158,7 +158,7 @@ # Try to resolve a prefix if user indeed gave a prefix. # We install the version under the resolved name # and hooks also see the resolved name - DEFINITION="$(pyenv-latest -q -k "$DEFINITION" || echo "$DEFINITION")" + DEFINITION="$(pyenv-latest -f -k "$DEFINITION")" # Set VERSION_NAME from $DEFINITION. Then compute the installation prefix. VERSION_NAME="${DEFINITION##*/}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/plugins/python-build/bin/pyenv-uninstall new/pyenv-2.4.8/plugins/python-build/bin/pyenv-uninstall --- old/pyenv-2.4.7/plugins/python-build/bin/pyenv-uninstall 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/plugins/python-build/bin/pyenv-uninstall 2024-07-21 06:02:45.000000000 +0200 @@ -11,6 +11,7 @@ # See `pyenv versions` for a complete list of installed versions. # set -e +[ -n "$PYENV_DEBUG" ] && set -x # Provide pyenv completions if [ "$1" = "--complete" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/plugins/python-build/share/python-build/3.13.0b3 new/pyenv-2.4.8/plugins/python-build/share/python-build/3.13.0b3 --- old/pyenv-2.4.7/plugins/python-build/share/python-build/3.13.0b3 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/plugins/python-build/share/python-build/3.13.0b3 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -prefer_openssl3 -export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 -install_package "openssl-3.3.1" "https://www.openssl.org/source/openssl-3.3.1.tar.gz#777cd596284c883375a2a7a1..." mac_openssl --if has_broken_mac_openssl -install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca1..." mac_readline --if has_broken_mac_readline -if has_tar_xz_support; then - install_package "Python-3.13.0b3" "https://www.python.org/ftp/python/3.13.0/Python-3.13.0b3.tar.xz#3be094ad08b1..." standard verify_py313 copy_python_gdb ensurepip -else - install_package "Python-3.13.0b3" "https://www.python.org/ftp/python/3.13.0/Python-3.13.0b3.tgz#5e9c01cdb3e2fb1..." standard verify_py313 copy_python_gdb ensurepip -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/plugins/python-build/share/python-build/3.13.0b3t new/pyenv-2.4.8/plugins/python-build/share/python-build/3.13.0b3t --- old/pyenv-2.4.7/plugins/python-build/share/python-build/3.13.0b3t 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/plugins/python-build/share/python-build/3.13.0b3t 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -export PYTHON_BUILD_FREE_THREADING=1 -source "$(dirname "${BASH_SOURCE[0]}")"/3.13.0b3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/plugins/python-build/share/python-build/3.13.0b4 new/pyenv-2.4.8/plugins/python-build/share/python-build/3.13.0b4 --- old/pyenv-2.4.7/plugins/python-build/share/python-build/3.13.0b4 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-2.4.8/plugins/python-build/share/python-build/3.13.0b4 2024-07-21 06:02:45.000000000 +0200 @@ -0,0 +1,9 @@ +prefer_openssl3 +export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 +install_package "openssl-3.3.1" "https://www.openssl.org/source/openssl-3.3.1.tar.gz#777cd596284c883375a2a7a1..." mac_openssl --if has_broken_mac_openssl +install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca1..." mac_readline --if has_broken_mac_readline +if has_tar_xz_support; then + install_package "Python-3.13.0b4" "https://www.python.org/ftp/python/3.13.0/Python-3.13.0b4.tar.xz#b2aa557c3c87..." standard verify_py313 copy_python_gdb ensurepip +else + install_package "Python-3.13.0b4" "https://www.python.org/ftp/python/3.13.0/Python-3.13.0b4.tgz#6f387984d028686..." standard verify_py313 copy_python_gdb ensurepip +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/plugins/python-build/share/python-build/3.13.0b4t new/pyenv-2.4.8/plugins/python-build/share/python-build/3.13.0b4t --- old/pyenv-2.4.7/plugins/python-build/share/python-build/3.13.0b4t 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-2.4.8/plugins/python-build/share/python-build/3.13.0b4t 2024-07-21 06:02:45.000000000 +0200 @@ -0,0 +1,2 @@ +export PYTHON_BUILD_FREE_THREADING=1 +source "$(dirname "${BASH_SOURCE[0]}")"/3.13.0b4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/plugins/python-build/test/build.bats new/pyenv-2.4.8/plugins/python-build/test/build.bats --- old/pyenv-2.4.7/plugins/python-build/test/build.bats 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/plugins/python-build/test/build.bats 2024-07-21 06:02:45.000000000 +0200 @@ -888,54 +888,6 @@ assert_success "hello world" } -@test "mruby strategy overwrites non-writable files" { - # nop -} - -@test "mruby strategy fetches rake if missing" { - # nop -} - -@test "rbx uses bundle then rake" { - # nop -} - -@test "fixes rbx binstubs" { - # nop -} - -@test "JRuby build" { - # nop -} - -@test "JRuby+Graal does not install launchers" { - # nop -} - -@test "JRuby Java 7 missing" { - # nop -} - -@test "JRuby Java is outdated" { - # nop -} - -@test "JRuby Java 7 up-to-date" { - # nop -} - -@test "Java version string not on first line" { - # nop -} - -@test "Java version string on OpenJDK" { - # nop -} - -@test "JRuby Java 9 version string" { - # nop -} - @test "non-writable TMPDIR aborts build" { export TMPDIR="${TMP}/build" mkdir -p "$TMPDIR" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/plugins/python-build/test/hooks.bats new/pyenv-2.4.8/plugins/python-build/test/hooks.bats --- old/pyenv-2.4.7/plugins/python-build/test/hooks.bats 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/plugins/python-build/test/hooks.bats 2024-07-21 06:02:45.000000000 +0200 @@ -15,9 +15,10 @@ OUT stub pyenv-hooks "install : echo '$HOOK_PATH'/install.bash" stub pyenv-rehash "echo rehashed" - stub pyenv-latest false definition="${TMP}/3.6.2" + stub pyenv-latest "echo $definition" + cat > "$definition" <<<"echo python-build" run pyenv-install "$definition" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/plugins/python-build/test/pyenv.bats new/pyenv-2.4.8/plugins/python-build/test/pyenv.bats --- old/pyenv-2.4.7/plugins/python-build/test/pyenv.bats 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/plugins/python-build/test/pyenv.bats 2024-07-21 06:02:45.000000000 +0200 @@ -18,7 +18,7 @@ stub_python_build() { stub_python_build_no_latest "$@" - stub pyenv-latest false + stub pyenv-latest '-f -k * : shift 2; echo "$@"' } @test "install a single version" { @@ -65,9 +65,9 @@ stub_python_build_lib for i in {1..3}; do stub_python_build_no_latest; done stub pyenv-latest \ - '-q -k 3.4 : echo 3.4.2' \ - '-q -k 3.5.1 : false' \ - '-q -k 3.5 : echo 3.5.2' + '-r -k 3.4 : echo 3.4.2' \ + '-r -k 3.5.1 : false' \ + '-r -k 3.5 : echo 3.5.2' run pyenv-install 3.4 3.5.1 3.5 assert_success <<OUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/test/latest.bats new/pyenv-2.4.8/test/latest.bats --- old/pyenv-2.4.7/test/latest.bats 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/test/latest.bats 2024-07-21 06:02:45.000000000 +0200 @@ -115,3 +115,25 @@ 3.8.1 ! } + +@test "falls back to argument with -b" { + create_executable pyenv-versions <<! +#!$BASH +! + run pyenv-latest -b nonexistent + assert_failure + assert_output <<! +nonexistent +! +} + +@test "falls back to argument and succeeds with -f" { + create_executable pyenv-versions <<! +#!$BASH +! + run pyenv-latest -f nonexistent + assert_success + assert_output <<! +nonexistent +! +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.7/test/pyenv.bats new/pyenv-2.4.8/test/pyenv.bats --- old/pyenv-2.4.7/test/pyenv.bats 2024-07-06 03:44:35.000000000 +0200 +++ new/pyenv-2.4.8/test/pyenv.bats 2024-07-21 06:02:45.000000000 +0200 @@ -46,12 +46,7 @@ assert_output "pyenv: cannot change working directory to \`$dir'" } -@test "adds its own libexec to PATH" { - run pyenv echo "PATH" - assert_success "${BATS_TEST_DIRNAME%/*}/libexec:${BATS_TEST_DIRNAME%/*}/plugins/python-build/bin:$PATH" -} - -@test "adds plugin bin dirs to PATH" { +@test "adds its own libexec and plugin bin dirs to PATH" { mkdir -p "$PYENV_ROOT"/plugins/python-build/bin mkdir -p "$PYENV_ROOT"/plugins/pyenv-each/bin run pyenv echo -F: "PATH"