Hello community, here is the log from the commit of package pyenv for openSUSE:Factory checked in at 2020-01-20 22:52:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pyenv (Old) and /work/SRC/openSUSE:Factory/.pyenv.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pyenv" Mon Jan 20 22:52:55 2020 rev:6 rq:765693 version:1.2.16 Changes: -------- --- /work/SRC/openSUSE:Factory/pyenv/pyenv.changes 2019-10-24 23:03:12.160104834 +0200 +++ /work/SRC/openSUSE:Factory/.pyenv.new.26092/pyenv.changes 2020-01-20 22:53:13.947292453 +0100 @@ -1,0 +2,35 @@ +Mon Jan 20 08:10:07 UTC 2020 - Tomáš Chvátal <tchva...@suse.com> + +- Fix the tarball url to match reality + +------------------------------------------------------------------- +Thu Jan 16 18:01:35 UTC 2020 - Thomas Schraitle <thomas.schrai...@suse.com> - 1.2.16 + + +- Update to 1.2.16 + * python-build: Add CPython 3.8.1 (#1497) + * python-build: Add CPython 3.7.6 (#1498) + * python-build: Add CPython 3.6.10 (#1499) + * python-build: Add CPython 3.5.9 (#1448) + * python-build: Add PyPy 7.3.0 (1502) + +- Update to 1.2.15 + * python-build: Add CPython 3.7.5 (#1423) + * python-build: Add CPython 2.7.17 (#1433) + * python-build: Add CPython 3.5.8 (#1441) + * python-build: Add PyPy 7.2.0 (#1418) + * python-build: Add anaconda3-2019.10 (#1427) + * pyenv-help: Show text for all pyenv commands in pyenv-help (#1421) + +- Update to 1.2.14 + * python-build: Add CPython 3.8.0 (#1416) + * python-build: Add Anaconda-2019.07 (#1382) + * python-build: Add Micropython 1.11 (#1395) + * python-build: Fix compatibility issues with Homebrew installed Tcl/Tk (#1397) + * pyenv-exec: Do not use exec -a, do not mangle PATH for system Python (#1169) + +- Spec file + * Apply spec-cleaner + * Add version in last changelog entry to avoid rpmlint warnings + +------------------------------------------------------------------- Old: ---- v1.2.13.tar.gz New: ---- v1.2.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pyenv.spec ++++++ --- /var/tmp/diff_new_pack.hnj3TI/_old 2020-01-20 22:53:15.799293165 +0100 +++ /var/tmp/diff_new_pack.hnj3TI/_new 2020-01-20 22:53:15.811293170 +0100 @@ -1,7 +1,7 @@ # # spec file for package pyenv # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define pyenv_dir %{_libexecdir}/pyenv # Name: pyenv -Version: 1.2.13 +Version: 1.2.16 Release: 0 Summary: Python Version Management License: MIT @@ -45,7 +45,7 @@ Summary: Bash completion for %{name} Group: System/Shells Requires: %{name} = %{version} -Supplements: packageand(pyenv:bash-completion) +Supplements: (pyenv and bash-completion) BuildArch: noarch %description bash-completion @@ -55,7 +55,7 @@ Summary: Fish completion for %{name} Group: System/Shells Requires: %{name} = %{version} -Supplements: packageand(pyenv:fish) +Supplements: (pyenv and fish) BuildArch: noarch %description fish-completion @@ -65,7 +65,7 @@ Summary: Zsh completion for %{name} Group: System/Shells Requires: %{name} = %{version} -Supplements: packageand(pyenv:zsh) +Supplements: (pyenv and zsh) BuildArch: noarch %description zsh-completion ++++++ v1.2.13.tar.gz -> v1.2.16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/.travis.yml new/pyenv-1.2.16/.travis.yml --- old/pyenv-1.2.13/.travis.yml 2019-07-09 14:56:34.000000000 +0200 +++ new/pyenv-1.2.16/.travis.yml 2020-01-06 14:06:57.000000000 +0100 @@ -26,8 +26,8 @@ - xcode10.2 env: -- PYTHON_BUILD_VERSION=3.8-dev -- PYTHON_BUILD_VERSION=3.7.2 +- PYTHON_BUILD_VERSION=3.8.0 +- PYTHON_BUILD_VERSION=3.7.5 before_install: - date +%Y-%m-%dT%H:%M:%S @@ -60,7 +60,7 @@ osx_image: xcode10 allow_failures: - - env: PYTHON_BUILD_VERSION=3.8-dev + - env: PYTHON_BUILD_VERSION=3.8.0 stages: - test shell diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/CHANGELOG.md new/pyenv-1.2.16/CHANGELOG.md --- old/pyenv-1.2.13/CHANGELOG.md 2019-07-09 14:56:34.000000000 +0200 +++ new/pyenv-1.2.16/CHANGELOG.md 2020-01-06 14:06:57.000000000 +0100 @@ -1,5 +1,30 @@ ## Version History +## 1.2.16 + +* python-build: Add CPython 3.8.1 (#1497) +* python-build: Add CPython 3.7.6 (#1498) +* python-build: Add CPython 3.6.10 (#1499) +* python-build: Add CPython 3.5.9 (#1448) +* python-build: Add PyPy 7.3.0 (1502) + +## 1.2.15 + +* python-build: Add CPython 3.7.5 (#1423) +* python-build: Add CPython 2.7.17 (#1433) +* python-build: Add CPython 3.5.8 (#1441) +* python-build: Add PyPy 7.2.0 (#1418) +* python-build: Add anaconda3-2019.10 (#1427) +* pyenv-help: Show text for all pyenv commands in pyenv-help (#1421) + +## 1.2.14 + +* python-build: Add CPython 3.8.0 (#1416) +* python-build: Add Anaconda-2019.07 (#1382) +* python-build: Add Micropython 1.11 (#1395) +* python-build: Fix compatibility issues with Homebrew installed Tcl/Tk (#1397) +* pyenv-exec: Do not use `exec -a`, do not mangle PATH for system Python (#1169) + ## 1.2.13 * python-build: Add CPython 3.7.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/README.md new/pyenv-1.2.16/README.md --- old/pyenv-1.2.13/README.md 2019-07-09 14:56:34.000000000 +0200 +++ new/pyenv-1.2.16/README.md 2020-01-06 14:06:57.000000000 +0100 @@ -211,7 +211,7 @@ - **Ubuntu and Fedora note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`. **General warning**: There are some systems where the `BASH_ENV` variable is configured - to point to `.bashrc`. On such systems you should almost certainly put the abovementioned line + to point to `.bashrc`. On such systems you should almost certainly put the above mentioned line `eval "$(pyenv init -)"` into `.bash_profile`, and **not** into `.bashrc`. Otherwise you may observe strange behaviour, such as `pyenv` getting into an infinite loop. See [#264](https://github.com/pyenv/pyenv/issues/264) for details. @@ -367,7 +367,7 @@ `PYENV_DEBUG` | | Outputs debug information.<br>Also as: `pyenv --debug <subcommand>` `PYENV_HOOK_PATH` | [_see wiki_][hooks] | Colon-separated list of paths searched for pyenv hooks. `PYENV_DIR` | `$PWD` | Directory to start searching for `.python-version` files. -`PYTHON_BUILD_ARIA2_OPTS` | | Used to pass additional parameters to [`aria2`](https://aria2.github.io/).<br>if `aria2c` binary is available on PATH, pyenv use `aria2c` instead of `curl` or `wget` to download the Python Source code. If you have an unstable internet connection, you can use this variable to instruct `aria2` to accelerate the download.<br>In most cases, you will only need to use `-x 10 -k 1M` as value to `PYTHON_BUILD_ARIA2_OPTS` environment variable +`PYTHON_BUILD_ARIA2_OPTS` | | Used to pass additional parameters to [`aria2`](https://aria2.github.io/).<br>If the `aria2c` binary is available on PATH, pyenv uses `aria2c` instead of `curl` or `wget` to download the Python Source code. If you have an unstable internet connection, you can use this variable to instruct `aria2` to accelerate the download.<br>In most cases, you will only need to use `-x 10 -k 1M` as value to `PYTHON_BUILD_ARIA2_OPTS` environment variable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/libexec/pyenv---version new/pyenv-1.2.16/libexec/pyenv---version --- old/pyenv-1.2.13/libexec/pyenv---version 2019-07-09 14:56:34.000000000 +0200 +++ new/pyenv-1.2.16/libexec/pyenv---version 2020-01-06 14:06:57.000000000 +0100 @@ -12,7 +12,7 @@ set -e [ -n "$PYENV_DEBUG" ] && set -x -version="1.2.13" +version="1.2.16" 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-1.2.13/libexec/pyenv-exec new/pyenv-1.2.16/libexec/pyenv-exec --- old/pyenv-1.2.13/libexec/pyenv-exec 2019-07-09 14:56:34.000000000 +0200 +++ new/pyenv-1.2.16/libexec/pyenv-exec 2020-01-06 14:06:57.000000000 +0100 @@ -41,7 +41,8 @@ done shift 1 -# CPython's `sys.executable` requires the `PYENV_BIN_PATH` to be at the top of the `PATH`. -# https://github.com/pyenv/pyenv/issues/98 -export PATH="${PYENV_BIN_PATH}:${PATH}" -exec -a "$PYENV_COMMAND" "$PYENV_COMMAND_PATH" "$@" +if [ "${PYENV_BIN_PATH#${PYENV_ROOT}}" != "${PYENV_BIN_PATH}" ]; then + # Only add to $PATH for non-system version. + export PATH="${PYENV_BIN_PATH}:${PATH}" +fi +exec "$PYENV_COMMAND_PATH" "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/libexec/pyenv-help new/pyenv-1.2.16/libexec/pyenv-help --- old/pyenv-1.2.13/libexec/pyenv-help 2019-07-09 14:56:34.000000000 +0200 +++ new/pyenv-1.2.16/libexec/pyenv-help 2020-01-06 14:06:57.000000000 +0100 @@ -151,7 +151,7 @@ [ -z "$usage" ] || exit echo echo "Some useful pyenv commands are:" - print_summaries commands local global shell install uninstall rehash version versions which whence + print_summaries commands $(exec pyenv-commands | sort -u) echo echo "See \`pyenv help <command>' for information on a specific command." echo "For full documentation, see: https://github.com/pyenv/pyenv#readme" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/README.md new/pyenv-1.2.16/plugins/python-build/README.md --- old/pyenv-1.2.13/plugins/python-build/README.md 2019-07-09 14:56:34.000000000 +0200 +++ new/pyenv-1.2.16/plugins/python-build/README.md 2020-01-06 14:06:57.000000000 +0100 @@ -15,8 +15,8 @@ ### Installing as a pyenv plugin (recommended) -You need nothing to do since python-build is bundled with pyenv by -default. +Since python-build is bundled with pyenv by +default, you do not need to do anything. ### Installing as a standalone program (advanced) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/bin/python-build new/pyenv-1.2.16/plugins/python-build/bin/python-build --- old/pyenv-1.2.13/plugins/python-build/bin/python-build 2019-07-09 14:56:34.000000000 +0200 +++ new/pyenv-1.2.16/plugins/python-build/bin/python-build 2020-01-06 14:06:57.000000000 +0100 @@ -799,7 +799,7 @@ build_package_standard_install "$@" } -# Backword Compatibility for standard function +# Backward Compatibility for standard function build_package_standard() { build_package_standard_build "$@" build_package_standard_install "$@" @@ -1008,7 +1008,9 @@ elif [ -z "${MAKE_OPTS+defined}" ]; then MAKE_OPTS="-j $(num_cpu_cores)" fi - { cd ports/unix + { cd mpy-cross + "$MAKE" $MAKE_OPTS + cd ../ports/unix "$MAKE" $MAKE_OPTS axtls "$MAKE" $MAKE_OPTS CFLAGS_EXTRA="-DMICROPY_PY_SYS_PATH_DEFAULT='\"${PREFIX_PATH}/lib/micropython\"'" "$MAKE" install $MAKE_INSTALL_OPTS PREFIX="${PREFIX_PATH}" @@ -1028,6 +1030,7 @@ "ppc64" ) echo "linux-ppc64" ;; "ppc64le" ) echo "linux-ppc64le" ;; "x86_64" ) echo "linux64" ;; + "aarch64" ) echo "linux-aarch64" ;; * ) return 1 ;; esac ;; @@ -2220,6 +2223,19 @@ fi fi +# regex_to_match="(--with-tcltk-libs='([^']+)')" +if [[ "$PYTHON_CONFIGURE_OPTS" =~ (--with-tcltk-libs=\'([^\']+)\') ]]; then + tcltk_match="${BASH_REMATCH[1]}" + tcltk_match_quoted="${tcltk_match//--with-tcltk-libs=/}" + # remove it from PYTHON_CONFIGURE_OPTS since it will mess up compile + PYTHON_CONFIGURE_OPTS="${PYTHON_CONFIGURE_OPTS//$tcltk_match/}" + + # having issues passing the single quoted part, couldnt pass as single var and still work + package_option python configure "--with-tcltk-libs='${tcltk_match_quoted}'" + unset tcltk_match + unset tcltk_match_quoted +fi + # Unset `PIP_REQUIRE_VENV` during build (#216) unset PIP_REQUIRE_VENV unset PIP_REQUIRE_VIRTUALENV diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/2.7.17 new/pyenv-1.2.16/plugins/python-build/share/python-build/2.7.17 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/2.7.17 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/2.7.17 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,8 @@ +#require_gcc +install_package "openssl-1.0.2q" "https://www.openssl.org/source/openssl-1.0.2q.tar.gz#5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684" mac_openssl --if has_broken_mac_openssl +install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline +if has_tar_xz_support; then + install_package "Python-2.7.17" "https://www.python.org/ftp/python/2.7.17/Python-2.7.17.tar.xz#4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41" ldflags_dirs standard verify_py27 copy_python_gdb ensurepip +else + install_package "Python-2.7.17" "https://www.python.org/ftp/python/2.7.17/Python-2.7.17.tgz#f22059d09cdf9625e0a7284d24a13062044f5bf59d93a7f3382190dfa94cecde" ldflags_dirs standard verify_py27 copy_python_gdb ensurepip +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/3.5.8 new/pyenv-1.2.16/plugins/python-build/share/python-build/3.5.8 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/3.5.8 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/3.5.8 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,9 @@ +#require_gcc +prefer_openssl11 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline +if has_tar_xz_support; then + install_package "Python-3.5.8" "https://www.python.org/ftp/python/3.5.8/Python-3.5.8.tar.xz#55a345c78ee3afbc2e60678442aad7bcc384ddea5bb95f8d66edc4868d4847d4" ldflags_dirs standard verify_py35 ensurepip +else + install_package "Python-3.5.8" "https://www.python.org/ftp/python/3.5.8/Python-3.5.8.tgz#18c88dfd260147bc7247e6356010e5d4916dfbfc480f6434917f88e61228177a" ldflags_dirs standard verify_py35 ensurepip +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/3.5.9 new/pyenv-1.2.16/plugins/python-build/share/python-build/3.5.9 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/3.5.9 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/3.5.9 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,9 @@ +#require_gcc +prefer_openssl11 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline +if has_tar_xz_support; then + install_package "Python-3.5.9" "https://www.python.org/ftp/python/3.5.9/Python-3.5.9.tar.xz#c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049" ldflags_dirs standard verify_py35 ensurepip +else + install_package "Python-3.5.9" "https://www.python.org/ftp/python/3.5.9/Python-3.5.9.tgz#67a1d4fc6e4540d6a092cadc488e533afa961b3c9becc74dc3d6b55cb56e0cc1" ldflags_dirs standard verify_py35 ensurepip +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/3.6.10 new/pyenv-1.2.16/plugins/python-build/share/python-build/3.6.10 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/3.6.10 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/3.6.10 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,9 @@ +#require_gcc +prefer_openssl11 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline +if has_tar_xz_support; then + install_package "Python-3.6.10" "https://www.python.org/ftp/python/3.6.10/Python-3.6.10.tar.xz#0a833c398ac8cd7c5538f7232d8531afef943c60495c504484f308dac3af40de" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip +else + install_package "Python-3.6.10" "https://www.python.org/ftp/python/3.6.10/Python-3.6.10.tgz#7034dd7cba98d4f94c74f9edd7345bac71c8814c41672c64d9044fa2f96f334d" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/3.7.5 new/pyenv-1.2.16/plugins/python-build/share/python-build/3.7.5 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/3.7.5 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/3.7.5 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,10 @@ +#require_gcc +prefer_openssl11 +export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline +if has_tar_xz_support; then + install_package "Python-3.7.5" "https://www.python.org/ftp/python/3.7.5/Python-3.7.5.tar.xz#e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip +else + install_package "Python-3.7.5" "https://www.python.org/ftp/python/3.7.5/Python-3.7.5.tgz#8ecc681ea0600bbfb366f2b173f727b205bb825d93d2f0b286bc4e58d37693da" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/3.7.5rc1 new/pyenv-1.2.16/plugins/python-build/share/python-build/3.7.5rc1 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/3.7.5rc1 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/3.7.5rc1 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,10 @@ +#require_gcc +prefer_openssl11 +export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline +if has_tar_xz_support; then + install_package "Python-3.7.5rc1" "https://www.python.org/ftp/python/3.7.5/Python-3.7.5rc1.tar.xz#6aea4110c8cb9c828b149041f03b01a1247497b8b587b39e5857cdc53179373a" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip +else + install_package "Python-3.7.5rc1" "https://www.python.org/ftp/python/3.7.5/Python-3.7.5rc1.tgz#161aa1ae37feadb21a0964bfe02e0136a15e246a9201fca09fbfce63723771ed" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/3.7.6 new/pyenv-1.2.16/plugins/python-build/share/python-build/3.7.6 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/3.7.6 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/3.7.6 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,10 @@ +#require_gcc +prefer_openssl11 +export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline +if has_tar_xz_support; then + install_package "Python-3.7.6" "https://www.python.org/ftp/python/3.7.6/Python-3.7.6.tar.xz#55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip +else + install_package "Python-3.7.6" "https://www.python.org/ftp/python/3.7.6/Python-3.7.6.tgz#aeee681c235ad336af116f08ab6563361a0c81c537072c1b309d6e4050aa2114" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/3.8.0 new/pyenv-1.2.16/plugins/python-build/share/python-build/3.8.0 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/3.8.0 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/3.8.0 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,10 @@ +#require_gcc +prefer_openssl11 +export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline +if has_tar_xz_support; then + install_package "Python-3.8.0" "https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tar.xz#b356244e13fb5491da890b35b13b2118c3122977c2cd825e3eb6e7d462030d84" ldflags_dirs standard verify_py38 copy_python_gdb ensurepip +else + install_package "Python-3.8.0" "https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tgz#f1069ad3cae8e7ec467aa98a6565a62a48ef196cb8f1455a245a08db5e1792df" ldflags_dirs standard verify_py38 copy_python_gdb ensurepip +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/3.8.1 new/pyenv-1.2.16/plugins/python-build/share/python-build/3.8.1 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/3.8.1 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/3.8.1 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,10 @@ +#require_gcc +prefer_openssl11 +export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline +if has_tar_xz_support; then + install_package "Python-3.8.1" "https://www.python.org/ftp/python/3.8.1/Python-3.8.1.tar.xz#75894117f6db7051c1b34f37410168844bbb357c139a8a10a352e9bf8be594e8" ldflags_dirs standard verify_py38 copy_python_gdb ensurepip +else + install_package "Python-3.8.1" "https://www.python.org/ftp/python/3.8.1/Python-3.8.1.tgz#c7cfa39a43b994621b245e029769e9126caa2a93571cee2e743b213cceac35fb" ldflags_dirs standard verify_py38 copy_python_gdb ensurepip +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/anaconda2-2019.07 new/pyenv-1.2.16/plugins/python-build/share/python-build/anaconda2-2019.07 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/anaconda2-2019.07 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/anaconda2-2019.07 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,19 @@ +case "$(anaconda_architecture 2>/dev/null || true)" in +"Linux-ppc64le" ) + install_script "Anaconda2-2019.07-Linux-ppc64le" "https://repo.continuum.io/archive/Anaconda2-2019.07-Linux-ppc64le.sh#ee7f61dab233cdd0acb376ad55e977b16fdc03602f87a98dafb10d5fe9f5a190" "anaconda" verify_py27 + ;; +"Linux-x86_64" ) + install_script "Anaconda2-2019.07-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda2-2019.07-Linux-x86_64.sh#189e16e7adf9ba4b7b7d06ecdc10ce4ad4153e5e3505b9331f3d142243e18e97" "anaconda" verify_py27 + ;; +"MacOSX-x86_64" ) + install_script "Anaconda2-2019.07-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda2-2019.07-MacOSX-x86_64.sh#3e63919eed116826e683ed7d480d06517de79564788fbc27cb8d8879697eb654" "anaconda" verify_py27 + ;; +* ) + { echo + colorize 1 "ERROR" + echo ": The binary distribution of Anaconda3 is not available for $(anaconda_architecture 2>/dev/null || true)." + echo + } >&2 + exit 1 + ;; +esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/anaconda3-2019.07 new/pyenv-1.2.16/plugins/python-build/share/python-build/anaconda3-2019.07 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/anaconda3-2019.07 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/anaconda3-2019.07 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,19 @@ +case "$(anaconda_architecture 2>/dev/null || true)" in +"Linux-ppc64le" ) + install_script "Anaconda3-2019.07-Linux-ppc64le" "https://repo.continuum.io/archive/Anaconda3-2019.07-Linux-ppc64le.sh#e788094f7a18bfe14038accb26c8809a81291ed97f1fce29425f366aa8105548" "anaconda" verify_py37 + ;; +"Linux-x86_64" ) + install_script "Anaconda3-2019.07-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda3-2019.07-Linux-x86_64.sh#69581cf739365ec7fb95608eef694ba959d7d33b36eb961953f2b82cb25bdf5a" "anaconda" verify_py37 + ;; +"MacOSX-x86_64" ) + install_script "Anaconda3-2019.07-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda3-2019.07-MacOSX-x86_64.sh#dcbddbab37c5b5f3873fe24d2617a4325bc7da28c0cd1d23a2edc7f0ebe08b7d" "anaconda" verify_py37 + ;; +* ) + { echo + colorize 1 "ERROR" + echo ": The binary distribution of Anaconda3 is not available for $(anaconda_architecture 2>/dev/null || true)." + echo + } >&2 + exit 1 + ;; +esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/anaconda3-2019.10 new/pyenv-1.2.16/plugins/python-build/share/python-build/anaconda3-2019.10 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/anaconda3-2019.10 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/anaconda3-2019.10 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,19 @@ +case "$(anaconda_architecture 2>/dev/null || true)" in +"Linux-ppc64le" ) + install_script "Anaconda3-2019.10-Linux-ppc64le" "https://repo.continuum.io/archive/Anaconda3-2019.10-Linux-ppc64le.sh#118c579f625555e1b116f0c3fd3842772e8fa0254cb2262c1c94e9eb40ba5160" "anaconda" verify_py37 + ;; +"Linux-x86_64" ) + install_script "Anaconda3-2019.10-Linux-x86_64" "https://repo.continuum.io/archive/Anaconda3-2019.10-Linux-x86_64.sh#46d762284d252e51cd58a8ca6c8adc9da2eadc82c342927b2f66ed011d1d8b53" "anaconda" verify_py37 + ;; +"MacOSX-x86_64" ) + install_script "Anaconda3-2019.10-MacOSX-x86_64" "https://repo.continuum.io/archive/Anaconda3-2019.10-MacOSX-x86_64.sh#4f77299ff4170cda64fdfcc27ac609a37d654c158f36c9ff25048793fe8a3a49" "anaconda" verify_py37 + ;; +* ) + { echo + colorize 1 "ERROR" + echo ": The binary distribution of Anaconda3 is not available for $(anaconda_architecture 2>/dev/null || true)." + echo + } >&2 + exit 1 + ;; +esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/micropython-1.11 new/pyenv-1.2.16/plugins/python-build/share/python-build/micropython-1.11 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/micropython-1.11 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/micropython-1.11 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,5 @@ +#require_gcc +has_tar_xz_support \ + && src="https://micropython.org/resources/source/micropython-1.11.tar.xz#c3d4918149e3b9427a318a8a78efb928f2b724123832f1feb4d7921af490269d" \ + || src="https://github.com/micropython/micropython/releases/download/v1.11/micropython-1.11.tar.gz#2edda4ffe283899af6d7b59dd0a0a59f8b845fe0f26017f1a180661338eca35f" +install_package micropython-1.11 "$src" micropython diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy2.7-7.2.0 new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy2.7-7.2.0 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy2.7-7.2.0 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy2.7-7.2.0 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,47 @@ +case "$(pypy_architecture 2>/dev/null || true)" in +"linux" ) + if require_distro "Ubuntu 12.04" "Ubuntu 14.04" "Ubuntu 16.04" 1>/dev/null 2>&1; then + install_package "pypy2.7-v7.2.0-linux32" "https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.2.0-linux32.tar.bz2#76d666e5aee54b519d6ec1af4ef0cbdc85f7f9276dd554e97deb026adfd0c936" "pypy" verify_py27 ensurepip + else + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." + echo "try 'pypy2.7-7.2.0-src' to build from source." + echo + } >&2 + exit 1 + fi + ;; +"linux64" ) + if require_distro "Ubuntu 12.04" "Ubuntu 14.04" "Ubuntu 16.04" 1>/dev/null 2>&1; then + install_package "pypy2.7-v7.2.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.2.0-linux64.tar.bz2#05acf28e6a243026ecad933b9361d8f74b41f00818071b76b38c4694cc4c9599" "pypy" verify_py27 ensurepip + else + install_package "pypy-7.2.0-linux_x86_64-portable" "https://github.com/squeaky-pl/portable-pypy/releases/download/pypy-7.2.0/pypy-7.2.0-linux_x86_64-portable.tar.bz2#a4f301e7629aafe4691ed1c3e9a39cf2158d86524f6ce584e5b850303e77ad81" "pypy" verify_py27 ensurepip + fi + ;; +"osx64" ) + if require_osx_version "10.13"; then + install_package "pypy2.7-v7.2.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.2.0-osx64.tar.bz2#36aa2f2440e762333569118dd0b3d5371d575c40966effa194d116c5453ddb52" "pypy" verify_py27 ensurepip + else + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13." + echo "try 'pypy2.7-7.2.0-src' to build from source." + echo + } >&2 + exit 1 + fi + ;; +"win32" ) + install_zip "pypy2.7-v7.2.0-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.2.0-win32.zip#956eeaaaac053e5d0917e77a3d2ad1933ab5561eb3e6e71235780b5aa5fd2bb7" "pypy" verify_py27 ensurepip + ;; +* ) + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." + echo "try 'pypy2.7-7.2.0-src' to build from source." + echo + } >&2 + exit 1 + ;; +esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy2.7-7.2.0-src new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy2.7-7.2.0-src --- old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy2.7-7.2.0-src 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy2.7-7.2.0-src 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,4 @@ +#require_gcc +prefer_openssl11 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "pypy2.7-v7.2.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.2.0-src.tar.bz2#55cb7757784fbe3952102447f65b27d80e6c885a464a7af1a9ce264492439dcc" "pypy_builder" verify_py27 ensurepip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy2.7-7.3.0 new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy2.7-7.3.0 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy2.7-7.3.0 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy2.7-7.3.0 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,39 @@ +VERSION='7.3.0' +PYVER='2.7' + +case "$(pypy_architecture 2>/dev/null || true)" in +"linux" ) + install_package "pypy${PYVER}-v${VERSION}-linux32" "https://bitbucket.org/pypy/pypy/downloads/pypy${PYVER}-v${VERSION}-linux32.tar.bz2#eac1308b7d523003a5f6d20f58406d52ab14611bcec750122ae513a5a35110db" "pypy" "verify_py${PYVER//./}" ensurepip + ;; +"linux64" ) + install_package "pypy${PYVER}-v${VERSION}-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy${PYVER}-v${VERSION}-linux64.tar.bz2#f4950a54378ac637da2a6defa52d6ffed96af12fcd5d74e1182fb834883c9826" "pypy" "verify_py${PYVER//./}" ensurepip + ;; +"linux-aarch64" ) + install_package "pypy${PYVER}-v${VERSION}-aarch64" "https://bitbucket.org/pypy/pypy/downloads/pypy${PYVER}-v${VERSION}-aarch64.tar.bz2#a3dd8d5e2a656849fa344dce4679d854a19bc4a096a0cf62b46a1be127a5d56c" "pypy" "verify_py${PYVER//./}" ensurepip + ;; +"osx64" ) + if require_osx_version "10.13"; then + install_package "pypy${PYVER}-v${VERSION}-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy${PYVER}-v${VERSION}-osx64.tar.bz2#ca7b056b243a6221ad04fa7fc8696e36a2fb858396999dcaa31dbbae53c54474" "pypy" "verify_py${PYVER//./}" ensurepip + else + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13." + echo "try 'pypy${PYVER}-${VERSION}-src' to build from source." + echo + } >&2 + exit 1 + fi + ;; +"win32" ) + install_zip "pypy${PYVER}-v${VERSION}-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy${PYVER}-v${VERSION}-win32.zip#a9e3c5c983edba0313a41d3c1ab55b080816c4129e67a6c272c53b9dbcdd97ec" "pypy" "verify_py${PYVER//./}" ensurepip + ;; +* ) + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." + echo "try 'pypy${PYVER}-${VERSION}-src' to build from source." + echo + } >&2 + exit 1 + ;; +esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy2.7-7.3.0-src new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy2.7-7.3.0-src --- old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy2.7-7.3.0-src 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy2.7-7.3.0-src 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,4 @@ +#require_gcc +prefer_openssl11 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "pypy2.7-v7.3.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-src.tar.bz2#b0b25c7f8938ab0fedd8dedf26b9e73c490913b002b484c1b2f19d5844a518de" "pypy_builder" verify_py27 ensurepip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy3.6-7.2.0 new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy3.6-7.2.0 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy3.6-7.2.0 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy3.6-7.2.0 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,47 @@ +case "$(pypy_architecture 2>/dev/null || true)" in +"linux" ) + if require_distro "Ubuntu 12.04" "Ubuntu 14.04" "Ubuntu 16.04" 1>/dev/null 2>&1; then + install_package "pypy3.6-v7.2.0-linux32" "https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.2.0-linux32.tar.bz2#45e99de197cb3e974cfc8d45e0076ad2066852e61e56b3eafd1237efafd2c43e" "pypy" verify_py27 ensurepip + else + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." + echo "try 'pypy3.6-7.2.0-src' to build from source." + echo + } >&2 + exit 1 + fi + ;; +"linux64" ) + if require_distro "Ubuntu 12.04" "Ubuntu 14.04" "Ubuntu 16.04" 1>/dev/null 2>&1; then + install_package "pypy3.6-v7.2.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.2.0-linux64.tar.bz2#aa128e555ad0fe5c4c15104ae0903052bd232b6e3a73f5fe023d27b8fd0d6089" "pypy" verify_py36 ensurepip + else + install_package "pypy3.6-7.2.0-beta-linux_x86_64-portable" "https://github.com/squeaky-pl/portable-pypy/releases/download/pypy3.6-7.2.0/pypy3.6-7.2.0-linux_x86_64-portable.tar.bz2#59099546b4dee56edcde2c9ff706687e35bb2aa94354cd56daa78aca036bd3d8" "pypy" verify_py36 ensurepip + fi + ;; +"osx64" ) + if require_osx_version "10.13"; then + install_package "pypy3.6-v7.2.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.2.0-osx64.tar.bz2#836abb0ec303b90a684533711ed3b8269d3e8c64805b595e410920abdea678ac" "pypy" verify_py36 ensurepip + else + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13." + echo "try 'pypy3.6-7.2.0-src' to build from source." + echo + } >&2 + exit 1 + fi + ;; +"win32" ) + install_zip "pypy3.6-v7.2.0-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.2.0-win32.zip#c926f622bec24a8b348591d631717ace83b3a6c3c2dac02b157b622b97d1fc9c" "pypy" verify_py36 ensurepip + ;; +* ) + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." + echo "try 'pypy3.6-7.2.0-src' to build from source." + echo + } >&2 + exit 1 + ;; +esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy3.6-7.2.0-src new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy3.6-7.2.0-src --- old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy3.6-7.2.0-src 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy3.6-7.2.0-src 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,4 @@ +#require_gcc +prefer_openssl11 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "pypy3.6-v7.2.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.2.0-src.tar.bz2#0d7c707df5041f1593fe82f29c40056c21e4d6cb66554bbd66769bd80bcbfafc" "pypy_builder" verify_py36 ensurepip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy3.6-7.3.0 new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy3.6-7.3.0 --- old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy3.6-7.3.0 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy3.6-7.3.0 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,39 @@ +VERSION='7.3.0' +PYVER='3.6' + +case "$(pypy_architecture 2>/dev/null || true)" in +"linux" ) + install_package "pypy${PYVER}-v${VERSION}-linux32" "https://bitbucket.org/pypy/pypy/downloads/pypy${PYVER}-v${VERSION}-linux32.tar.bz2#7045b295d38ba0b5ee65bd3f078ca249fcf1de73fedeaab2d6ad78de2eab0f0e" "pypy" "verify_py${PYVER//./}" ensurepip + ;; +"linux64" ) + install_package "pypy${PYVER}-v${VERSION}-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy${PYVER}-v${VERSION}-linux64.tar.bz2#d3d549e8f43de820ac3385b698b83fa59b4d7dd6cf3fe34c115f731e26ad8856" "pypy" "verify_py${PYVER//./}" ensurepip + ;; +"linux-aarch64" ) + install_package "pypy${PYVER}-v${VERSION}-aarch64" "https://bitbucket.org/pypy/pypy/downloads/pypy${PYVER}-v${VERSION}-aarch64.tar.bz2#b900241bca7152254c107a632767f49edede99ca6360b9a064141267b47ef598" "pypy" "verify_py${PYVER//./}" ensurepip + ;; +"osx64" ) + if require_osx_version "10.13"; then + install_package "pypy${PYVER}-v${VERSION}-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy${PYVER}-v${VERSION}-osx64.tar.bz2#87b2545dad75fe3027b4b2108aceb9fdadcdd24e61ae312ac48b449fdd452bf3" "pypy" "verify_py${PYVER//./}" ensurepip + else + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13." + echo "try 'pypy${PYVER}-${VERSION}-src' to build from source." + echo + } >&2 + exit 1 + fi + ;; +"win32" ) + install_zip "pypy${PYVER}-v${VERSION}-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy${PYVER}-v${VERSION}-win32.zip#30e6870c4f3d8ef91890a6556a98080758000ba7c207cccdd86a8f5d358998c1" "pypy" "verify_py${PYVER//./}" ensurepip + ;; +* ) + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." + echo "try 'pypy${PYVER}-${VERSION}-src' to build from source." + echo + } >&2 + exit 1 + ;; +esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy3.6-7.3.0-src new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy3.6-7.3.0-src --- old/pyenv-1.2.13/plugins/python-build/share/python-build/pypy3.6-7.3.0-src 1970-01-01 01:00:00.000000000 +0100 +++ new/pyenv-1.2.16/plugins/python-build/share/python-build/pypy3.6-7.3.0-src 2020-01-06 14:06:57.000000000 +0100 @@ -0,0 +1,4 @@ +#require_gcc +prefer_openssl11 +install_package "openssl-1.1.0j" "https://www.openssl.org/source/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl +install_package "pypy3.6-v7.3.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.3.0-src.tar.bz2#48d12c15fbcbcf4a32882a883195e1f922997cde78e7a16d4342b9b521eefcfa" "pypy_builder" verify_py36 ensurepip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/pyenv.d/rehash/conda.d/default.list new/pyenv-1.2.16/pyenv.d/rehash/conda.d/default.list --- old/pyenv-1.2.13/pyenv.d/rehash/conda.d/default.list 2019-07-09 14:56:34.000000000 +0200 +++ new/pyenv-1.2.16/pyenv.d/rehash/conda.d/default.list 2020-01-06 14:06:57.000000000 +0100 @@ -81,3 +81,4 @@ xzgrep xzless xzmore +reset diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyenv-1.2.13/test/exec.bats new/pyenv-1.2.16/test/exec.bats --- old/pyenv-1.2.13/test/exec.bats 2019-07-09 14:56:34.000000000 +0200 +++ new/pyenv-1.2.16/test/exec.bats 2020-01-06 14:06:57.000000000 +0100 @@ -78,32 +78,38 @@ OUT } -@test "supports python -S <cmd>" { - export PYENV_VERSION="3.4" +@test "sys.executable with system version (#98)" { + system_python=$(which python) - # emulate `python -S' behavior - create_executable "python" <<SH -#!$BASH -if [[ \$1 == "-S"* ]]; then - found="\$(PATH="\${PYTHONPATH:-\$PATH}" which \$2)" - # assert that the found executable has python for shebang - if head -1 "\$found" | grep python >/dev/null; then - \$BASH "\$found" - else - echo "python: no Python script found in input (LoadError)" >&2 - exit 1 - fi -else - echo 'python 3.4 (pyenv test)' -fi -SH - - create_executable "fab" <<SH -#!/usr/bin/env python -echo hello fab -SH + PYENV_VERSION="custom" + create_executable "python" "" + unset PYENV_VERSION pyenv-rehash - run python -S fab - assert_success "hello fab" + run pyenv-exec python -c 'import sys; print(sys.executable)' + assert_success "${system_python}" +} + +@test '$PATH is not modified with system Python' { + # Create a wrapper executable that verifies PATH. + PYENV_VERSION="custom" + create_executable "python" '[[ "$PATH" == "${PYENV_TEST_DIR}/root/versions/custom/bin:"* ]] || { echo "unexpected:$PATH"; exit 2;}' + unset PYENV_VERSION + pyenv-rehash + + # Path is not modified with system Python. + run pyenv-exec python -c 'import os; print(os.getenv("PATH"))' + assert_success "$PATH" + + # Path is modified with custom Python. + PYENV_VERSION=custom run pyenv-exec python + assert_success + + # Path is modified with custom:system Python. + PYENV_VERSION=custom:system run pyenv-exec python + assert_success + + # Path is not modified with system:custom Python. + PYENV_VERSION=system:custom run pyenv-exec python -c 'import os; print(os.getenv("PATH"))' + assert_success "$PATH" }