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-09 20:06:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pyenv (Old) and /work/SRC/openSUSE:Factory/.pyenv.new.2080 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pyenv" Tue Jul 9 20:06:04 2024 rev:42 rq:1186414 version:2.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/pyenv/pyenv.changes 2024-07-05 19:49:32.298752579 +0200 +++ /work/SRC/openSUSE:Factory/.pyenv.new.2080/pyenv.changes 2024-07-09 20:06:39.646536077 +0200 @@ -1,0 +2,11 @@ +Fri Jul 5 04:56:59 UTC 2024 - Thomas Schraitle <thomas.schrai...@suse.com> - 2.4.6 + +- Update to 2.4.6: + - CI: push MacOS jobs to MacOS 13 and 14 in #3002 + - Add 3.13.0b3t and exclude it from pyenv latest in #3001 + - Speed up pyenv prefix by not constructing advice text when + it would be discarded in #3005 + +Full Changelog: https://github.com/pyenv/pyenv/compare/v2.4.5...v2.4.6 + +------------------------------------------------------------------- Old: ---- pyenv-2.4.5.tar.gz New: ---- pyenv-2.4.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pyenv.spec ++++++ --- /var/tmp/diff_new_pack.f8tjRK/_old 2024-07-09 20:06:42.466638834 +0200 +++ /var/tmp/diff_new_pack.f8tjRK/_new 2024-07-09 20:06:42.470638979 +0200 @@ -19,7 +19,7 @@ %define pyenv_dir %{_libexecdir}/pyenv # Name: pyenv -Version: 2.4.5 +Version: 2.4.6 Release: 0 Summary: Python Version Management License: MIT ++++++ pyenv-2.4.5.tar.gz -> pyenv-2.4.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.5/.github/workflows/macos_build.yml new/pyenv-2.4.6/.github/workflows/macos_build.yml --- old/pyenv-2.4.5/.github/workflows/macos_build.yml 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/.github/workflows/macos_build.yml 2024-07-05 05:57:48.000000000 +0200 @@ -15,7 +15,7 @@ - "3.10" - "3.11" - "3.12" - runs-on: macos-11 + runs-on: macos-14 steps: - uses: actions/checkout@v4 # Normally, we would use the superbly maintained... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.5/.github/workflows/modified_scripts_build.yml new/pyenv-2.4.6/.github/workflows/modified_scripts_build.yml --- old/pyenv-2.4.5/.github/workflows/modified_scripts_build.yml 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/.github/workflows/modified_scripts_build.yml 2024-07-05 05:57:48.000000000 +0200 @@ -30,7 +30,7 @@ fail-fast: false matrix: python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions)}} - os: ["macos-11", "macos-12"] + os: ["macos-13", "macos-14"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.5/.github/workflows/pyenv_tests.yml new/pyenv-2.4.6/.github/workflows/pyenv_tests.yml --- old/pyenv-2.4.5/.github/workflows/pyenv_tests.yml 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/.github/workflows/pyenv_tests.yml 2024-07-05 05:57:48.000000000 +0200 @@ -12,8 +12,8 @@ os: - ubuntu-22.04 - ubuntu-20.04 - - macos-12 - - macos-11 + - macos-14 + - macos-13 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.5/CHANGELOG.md new/pyenv-2.4.6/CHANGELOG.md --- old/pyenv-2.4.5/CHANGELOG.md 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/CHANGELOG.md 2024-07-05 05:57:48.000000000 +0200 @@ -1,5 +1,13 @@ # Version History +## Release v2.4.6 +* CI: push MacOS jobs to MacOS 13 and 14 by @native-api in https://github.com/pyenv/pyenv/pull/3002 +* Add 3.13.0b3t and exclude it from `pyenv latest` by @colesbury in https://github.com/pyenv/pyenv/pull/3001 +* Speed up `pyenv prefix` by not constructing advice text when it would be discarded by @Erotemic in https://github.com/pyenv/pyenv/pull/3005 + +## Release v2.4.5 +* Add CPython 3.13.0b3 by @edgarrmondragon in https://github.com/pyenv/pyenv/pull/2996 + ## Release v2.4.4 * Add support for miniconda3 24.5.0-0 with py3.12, py3.11, py3.10, py3.9 by @binbjz in https://github.com/pyenv/pyenv/pull/2994 * Add support for free-threaded Python by @colesbury in https://github.com/pyenv/pyenv/pull/2995 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.5/libexec/pyenv---version new/pyenv-2.4.6/libexec/pyenv---version --- old/pyenv-2.4.5/libexec/pyenv---version 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/libexec/pyenv---version 2024-07-05 05:57:48.000000000 +0200 @@ -12,7 +12,7 @@ set -e [ -n "$PYENV_DEBUG" ] && set -x -version="2.4.4" +version="2.4.6" 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.5/libexec/pyenv-latest new/pyenv-2.4.6/libexec/pyenv-latest --- old/pyenv-2.4.5/libexec/pyenv-latest 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/libexec/pyenv-latest 2024-07-05 05:57:48.000000000 +0200 @@ -50,7 +50,7 @@ DEFINITION_CANDIDATES=(\ $(printf '%s\n' "${DEFINITION_CANDIDATES[@]}" | \ - sed -E -e '/-dev$/d' -e '/-src$/d' -e '/-latest$/d' -e '/(a|b|rc)[0-9]+$/d')); + sed -E -e '/-dev$/d' -e '/-src$/d' -e '/-latest$/d' -e '/(a|b|rc)[0-9]+$/d' -e '/[0-9]+t$/d')); # Compose a sorting key, followed by | and original value DEFINITION_CANDIDATES=(\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.5/libexec/pyenv-prefix new/pyenv-2.4.6/libexec/pyenv-prefix --- old/pyenv-2.4.5/libexec/pyenv-prefix 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/libexec/pyenv-prefix 2024-07-05 05:57:48.000000000 +0200 @@ -30,9 +30,9 @@ { IFS=: for version in ${PYENV_VERSION}; do if [ "$version" = "system" ]; then - if PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python 2>/dev/null)" || \ - PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python3 2>/dev/null)" || \ - PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python2 2>/dev/null)"; then + if PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python --skip-advice 2>/dev/null)" || \ + PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python3 --skip-advice 2>/dev/null)" || \ + PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python2 --skip-advice 2>/dev/null)"; then shopt -s extglob # In some distros (Arch), Python can be found in sbin as well as bin PYENV_PREFIX_PATH="${PYTHON_PATH%/?(s)bin/*}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.5/libexec/pyenv-versions new/pyenv-2.4.6/libexec/pyenv-versions --- old/pyenv-2.4.5/libexec/pyenv-versions 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/libexec/pyenv-versions 2024-07-05 05:57:48.000000000 +0200 @@ -128,9 +128,9 @@ # Include "system" in the non-bare output, if it exists if [ -n "$include_system" ] && \ - (PYENV_VERSION=system pyenv-which python >/dev/null 2>&1 || \ - PYENV_VERSION=system pyenv-which python3 >/dev/null 2>&1 || \ - PYENV_VERSION=system pyenv-which python2 >/dev/null 2>&1) ; then + (PYENV_VERSION=system pyenv-which python --skip-advice >/dev/null 2>&1 || \ + PYENV_VERSION=system pyenv-which python3 --skip-advice >/dev/null 2>&1 || \ + PYENV_VERSION=system pyenv-which python2 --skip-advice >/dev/null 2>&1) ; then print_version system "/" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.5/libexec/pyenv-which new/pyenv-2.4.6/libexec/pyenv-which --- old/pyenv-2.4.5/libexec/pyenv-which 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/libexec/pyenv-which 2024-07-05 05:57:48.000000000 +0200 @@ -2,13 +2,14 @@ # # Summary: Display the full path to an executable # -# Usage: pyenv which <command> [--nosystem] +# Usage: pyenv which <command> [--nosystem] [--skip-advice] # # Displays the full path to the executable that pyenv will invoke when # you run the given command. # Use --nosystem argument in case when you don't need to search command in the # system environment. -# +# Internal switch --skip-advice used to skip printing an error message on a +# failed search. set -e [ -n "$PYENV_DEBUG" ] && set -x @@ -18,11 +19,27 @@ exec pyenv-shims --short fi -if [ "$2" = "--nosystem" ]; then - system="" -else - system="system" -fi +system="system" +SKIP_ADVICE="" +PYENV_COMMAND="$1" + +while [[ $# -gt 0 ]] +do + case "$1" in + --skip-advice) + SKIP_ADVICE=1 + shift + ;; + --nosystem) + system="" + shift + ;; + *) + shift + ;; + esac +done + remove_from_path() { local path_to_remove="$1" @@ -36,8 +53,6 @@ echo "${result#:}" } -PYENV_COMMAND="$1" - if [ -z "$PYENV_COMMAND" ]; then pyenv-help --usage which >&2 exit 1 @@ -85,16 +100,17 @@ fi echo "pyenv: $PYENV_COMMAND: command not found" >&2 - - versions="$(pyenv-whence "$PYENV_COMMAND" || true)" - if [ -n "$versions" ]; then - { echo - echo "The \`$1' command exists in these Python versions:" - echo "$versions" | sed 's/^/ /g' - echo - echo "Note: See 'pyenv help global' for tips on allowing both" - echo " python2 and python3 to be found." - } >&2 + if [ -z "$SKIP_ADVICE" ]; then + versions="$(pyenv-whence "$PYENV_COMMAND" || true)" + if [ -n "$versions" ]; then + { echo + echo "The \`$PYENV_COMMAND' command exists in these Python versions:" + echo "$versions" | sed 's/^/ /g' + echo + echo "Note: See 'pyenv help global' for tips on allowing both" + echo " python2 and python3 to be found." + } >&2 + fi fi exit 127 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.5/plugins/python-build/share/python-build/3.13.0b3t new/pyenv-2.4.6/plugins/python-build/share/python-build/3.13.0b3t --- old/pyenv-2.4.5/plugins/python-build/share/python-build/3.13.0b3t 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-2.4.6/plugins/python-build/share/python-build/3.13.0b3t 2024-07-05 05:57:48.000000000 +0200 @@ -0,0 +1,2 @@ +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.5/pyenv.d/install/latest.bash new/pyenv-2.4.6/pyenv.d/install/latest.bash --- old/pyenv-2.4.5/pyenv.d/install/latest.bash 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/pyenv.d/install/latest.bash 2024-07-05 05:57:48.000000000 +0200 @@ -10,7 +10,7 @@ $(python-build --definitions | \ grep -F "${DEFINITION_PREFIX}" | \ grep "^${DEFINITION_TYPE}" | \ - sed -E -e '/-dev$/d' -e '/-src$/d' -e '/(b|rc)[0-9]+$/d' | \ + sed -E -e '/-dev$/d' -e '/-src$/d' -e '/(b|rc)[0-9]+$/d' -e '/[0-9]+t$/d' | \ sort -t. -k1,1r -k 2,2nr -k 3,3nr \ || true)) DEFINITION="${DEFINITION_CANDIDATES}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.5/test/latest.bats new/pyenv-2.4.6/test/latest.bats --- old/pyenv-2.4.5/test/latest.bats 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/test/latest.bats 2024-07-05 05:57:48.000000000 +0200 @@ -103,6 +103,9 @@ echo 3.8.5a2 echo 3.8.5b3 echo 3.8.5rc2 +echo 3.8.5t +echo 3.8.5b3t +echo 3.8.5rc2t echo 3.8.1 echo 3.8.1/envs/foo ! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-2.4.5/test/which.bats new/pyenv-2.4.6/test/which.bats --- old/pyenv-2.4.5/test/which.bats 2024-06-30 19:55:53.000000000 +0200 +++ new/pyenv-2.4.6/test/which.bats 2024-07-05 05:57:48.000000000 +0200 @@ -155,3 +155,15 @@ PYENV_VERSION=3.4 run pyenv-which python assert_success "version=3.4.2" } + +@test "skip advice supresses error messages" { + create_executable "2.7" "python" + create_executable "3.3" "py.test" + create_executable "3.4" "py.test" + + PYENV_VERSION=2.7 run pyenv-which py.test --skip-advice + assert_failure + assert_output <<OUT +pyenv: py.test: command not found +OUT +}
