From a911a2223fb9c22cf5027a90e821e80cf1aa2fa4 Mon Sep 17 00:00:00 2001
From: laggardkernel <laggardkernel@users.noreply.github.com>
Date: Tue, 11 Oct 2022 01:34:24 +0800
Subject: [PATCH 1/7] Upgrade uninstall hook after pyenv/pyenv#2432 (#438)

---
 etc/pyenv.d/uninstall/envs.bash | 50 ++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/etc/pyenv.d/uninstall/envs.bash b/etc/pyenv.d/uninstall/envs.bash
index c3dc5df..5087370 100644
--- a/etc/pyenv.d/uninstall/envs.bash
+++ b/etc/pyenv.d/uninstall/envs.bash
@@ -2,29 +2,33 @@ resolve_link() {
   $(type -p greadlink readlink | head -1) "$1"
 }
 
-if [ -n "${DEFINITION}" ]; then
-  if [[ "${DEFINITION}" != "${DEFINITION%/envs/*}" ]]; then
-    # Uninstall virtualenv by long name
-    exec pyenv-virtualenv-delete ${FORCE+-f} "${DEFINITION}"
-    exit 128
-  else
-    VERSION_NAME="${VERSION_NAME:-${DEFINITION##*/}}"
-    PREFIX="${PREFIX:-${PYENV_ROOT}/versions/${VERSION_NAME}}"
-    if [ -L "${PREFIX}" ]; then
-      REAL_PREFIX="$(resolve_link "${PREFIX}" 2>/dev/null || true)"
-      REAL_DEFINITION="${REAL_PREFIX#${PYENV_ROOT}/versions/}"
-      if [[ "${REAL_DEFINITION}" != "${REAL_DEFINITION%/envs/*}" ]]; then
-        # Uninstall virtualenv by short name
-        exec pyenv-virtualenv-delete ${FORCE+-f} "${REAL_DEFINITION}"
-        exit 128
-      fi
+uninstall_related_virtual_env() {
+  if [ -n "${DEFINITION}" ]; then
+    if [[ "${DEFINITION}" != "${DEFINITION%/envs/*}" ]]; then
+      # Uninstall virtualenv by long name
+      exec pyenv-virtualenv-delete ${FORCE+-f} "${DEFINITION}"
+      exit 128
     else
-      # Uninstall all virtualenvs inside `envs` directory too
-      shopt -s nullglob
-      for virtualenv in "${PREFIX}/envs/"*; do
-        pyenv-virtualenv-delete ${FORCE+-f} "${DEFINITION}/envs/${virtualenv##*/}"
-      done
-      shopt -u nullglob
+      VERSION_NAME="${VERSION_NAME:-${DEFINITION##*/}}"
+      PREFIX="${PREFIX:-${PYENV_ROOT}/versions/${VERSION_NAME}}"
+      if [ -L "${PREFIX}" ]; then
+        REAL_PREFIX="$(resolve_link "${PREFIX}" 2>/dev/null || true)"
+        REAL_DEFINITION="${REAL_PREFIX#${PYENV_ROOT}/versions/}"
+        if [[ "${REAL_DEFINITION}" != "${REAL_DEFINITION%/envs/*}" ]]; then
+          # Uninstall virtualenv by short name
+          exec pyenv-virtualenv-delete ${FORCE+-f} "${REAL_DEFINITION}"
+          exit 128
+        fi
+      else
+        # Uninstall all virtualenvs inside `envs` directory too
+        shopt -s nullglob
+        for virtualenv in "${PREFIX}/envs/"*; do
+          pyenv-virtualenv-delete ${FORCE+-f} "${DEFINITION}/envs/${virtualenv##*/}"
+        done
+        shopt -u nullglob
+      fi
     fi
   fi
-fi
+}
+
+before_uninstall "uninstall_related_virtual_env"

From 7932bb4cc00e63752f5ff7743aaa72fa72b64f4d Mon Sep 17 00:00:00 2001
From: Joseph Egan <joseph@egan.dev>
Date: Mon, 10 Oct 2022 18:47:19 +0000
Subject: [PATCH 2/7] Stop delete force failing when virtualenv does not exist
 (#330)

---
 bin/pyenv-virtualenv-delete | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/pyenv-virtualenv-delete b/bin/pyenv-virtualenv-delete
index aa21410..5fe1a46 100755
--- a/bin/pyenv-virtualenv-delete
+++ b/bin/pyenv-virtualenv-delete
@@ -75,7 +75,7 @@ else
     if pyenv-virtualenv-prefix "${VERSION_NAME}" 1>/dev/null 2>&1; then
       PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}"
       unset COMPAT_PREFIX
-    else
+    elif [ -z "$FORCE" ]; then
       echo "pyenv-virtualenv: \`${DEFINITION}' is not a virtualenv." 1>&2
       exit 1
     fi

From 057b9be9d88edbd2afb10fe2aa44473410970032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 10 Oct 2022 21:48:29 +0300
Subject: [PATCH 3/7] fix: relative path to pyenv-realpath.dylib (#378)

---
 libexec/pyenv-virtualenv-realpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libexec/pyenv-virtualenv-realpath b/libexec/pyenv-virtualenv-realpath
index 8a70128..de0bf5f 100644
--- a/libexec/pyenv-virtualenv-realpath
+++ b/libexec/pyenv-virtualenv-realpath
@@ -3,7 +3,7 @@
 # Usage: . pyenv-virtualenv-realpath
 
 if ! {
-    enable -f "${BASH_SOURCE%/*}"/../libexec/pyenv-realpath.dylib realpath ||
+    enable -f "${BASH_SOURCE%/*}"/../../../libexec/pyenv-realpath.dylib realpath ||
       type realpath
   } >/dev/null 2>&1; then
   if [ -n "$PYENV_NATIVE_EXT" ]; then

From 3c0edf888ef8798bec2824f3f1a721d879bada3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 10 Oct 2022 21:50:28 +0300
Subject: [PATCH 4/7] Spelling fixes (#352)

---
 CHANGELOG.md         | 2 +-
 bin/pyenv-virtualenv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 769b5f6..cda5b0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 #### 1.1.4
 
 * Support newer conda (#290)
-* Prefer `python3.x` executable if avaialble (#206, #282, #296)
+* Prefer `python3.x` executable if available (#206, #282, #296)
 
 #### 1.1.3
 
diff --git a/bin/pyenv-virtualenv b/bin/pyenv-virtualenv
index b1bb20c..930c211 100755
--- a/bin/pyenv-virtualenv
+++ b/bin/pyenv-virtualenv
@@ -145,7 +145,7 @@ detect_venv() {
     if [ -x "${prefix}/bin/virtualenv" ]; then
       HAS_VIRTUALENV=1
     fi
-    # Prefer `python3.x` executable if avaialble (#206, #282)
+    # Prefer `python3.x` executable if available (#206, #282)
     local python
     for python in "python${PYENV_VERSION%.*}" "python${PYENV_VERSION%%.*}" "python"; do
       if pyenv-exec "${python}" -m venv --help 1>/dev/null 2>&1; then

From 9a57cd77113c4bf36fef44dbef6d2cf0b61cdf03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 11 Oct 2022 22:53:34 +0300
Subject: [PATCH 5/7] Clone bats with --depth=1, gitignore it (#351)

---
 .gitignore  | 1 +
 .travis.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c860e56..75a199c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/bats/
 /libexec/pyenv-virtualenv/*/*.class
 /libexec/pyenv-virtualenv/*/*.pyc
 /libexec/pyenv-virtualenv/*/*.pyo
diff --git a/.travis.yml b/.travis.yml
index 64342c6..b7849da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: false
-install: git clone https://github.com/sstephenson/bats.git
+install: git clone --depth=1 https://github.com/sstephenson/bats.git
 script: bats/bin/bats --tap test
 language: c
 notifications:

From 4054162a1cc1cf3f95baf0cb2c94af47dc5f5341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 12 Oct 2022 07:41:29 +0300
Subject: [PATCH 6/7] Fix errors when `set -u` is set in the user's shell
 (#350)

---
 bin/pyenv-virtualenv-init |  6 +++---
 test/init.bats            | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/pyenv-virtualenv-init b/bin/pyenv-virtualenv-init
index 1a60c53..a24a785 100755
--- a/bin/pyenv-virtualenv-init
+++ b/bin/pyenv-virtualenv-init
@@ -129,7 +129,7 @@ esac
 if [[ "$shell" != "fish" ]]; then
   cat <<EOS
   local ret=\$?
-  if [ -n "\$VIRTUAL_ENV" ]; then
+  if [ -n "\${VIRTUAL_ENV-}" ]; then
     eval "\$(pyenv sh-activate --quiet || pyenv sh-deactivate --quiet || true)" || true
   else
     eval "\$(pyenv sh-activate --quiet || true)" || true
@@ -141,8 +141,8 @@ EOS
   case "$shell" in
   bash )
     cat <<EOS
-if ! [[ "\$PROMPT_COMMAND" =~ _pyenv_virtualenv_hook ]]; then
-  PROMPT_COMMAND="_pyenv_virtualenv_hook;\$PROMPT_COMMAND";
+if ! [[ "\${PROMPT_COMMAND-}" =~ _pyenv_virtualenv_hook ]]; then
+  PROMPT_COMMAND="_pyenv_virtualenv_hook;\${PROMPT_COMMAND-}"
 fi
 EOS
     ;;
diff --git a/test/init.bats b/test/init.bats
index 74b0e2b..ba90b5d 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -6,7 +6,7 @@ load test_helper
   unset PYENV_SHELL
   SHELL=/bin/false run pyenv-virtualenv-init -
   assert_success
-  assert_output_contains '  PROMPT_COMMAND="_pyenv_virtualenv_hook;$PROMPT_COMMAND";'
+  assert_output_contains '  PROMPT_COMMAND="_pyenv_virtualenv_hook;${PROMPT_COMMAND-}"'
 }
 
 @test "detect parent shell from script (sh)" {
@@ -15,7 +15,7 @@ load test_helper
   chmod +x ${TMP}/script.sh
   run ${TMP}/script.sh
   assert_success
-  assert_output_contains_not '  PROMPT_COMMAND="_pyenv_virtualenv_hook;$PROMPT_COMMAND";'
+  assert_output_contains_not '  PROMPT_COMMAND="_pyenv_virtualenv_hook;${PROMPT_COMMAND-}"'
   rm -f "${TMP}/script.sh"
 }
 
@@ -25,7 +25,7 @@ load test_helper
   chmod +x ${TMP}/script.sh
   run ${TMP}/script.sh
   assert_success
-  assert_output_contains '  PROMPT_COMMAND="_pyenv_virtualenv_hook;$PROMPT_COMMAND";'
+  assert_output_contains '  PROMPT_COMMAND="_pyenv_virtualenv_hook;${PROMPT_COMMAND-}"'
   rm -f "${TMP}/script.sh"
 }
 
@@ -54,15 +54,15 @@ export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   local ret=\$?
-  if [ -n "\$VIRTUAL_ENV" ]; then
+  if [ -n "\${VIRTUAL_ENV-}" ]; then
     eval "\$(pyenv sh-activate --quiet || pyenv sh-deactivate --quiet || true)" || true
   else
     eval "\$(pyenv sh-activate --quiet || true)" || true
   fi
   return \$ret
 };
-if ! [[ "\$PROMPT_COMMAND" =~ _pyenv_virtualenv_hook ]]; then
-  PROMPT_COMMAND="_pyenv_virtualenv_hook;\$PROMPT_COMMAND";
+if ! [[ "\${PROMPT_COMMAND-}" =~ _pyenv_virtualenv_hook ]]; then
+  PROMPT_COMMAND="_pyenv_virtualenv_hook;\${PROMPT_COMMAND-}"
 fi
 EOS
 }
@@ -95,7 +95,7 @@ export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   local ret=\$?
-  if [ -n "\$VIRTUAL_ENV" ]; then
+  if [ -n "\${VIRTUAL_ENV-}" ]; then
     eval "\$(pyenv sh-activate --quiet || pyenv sh-deactivate --quiet || true)" || true
   else
     eval "\$(pyenv sh-activate --quiet || true)" || true

From 0a1839d22abb678be1bc469552b2a797f8aa97d3 Mon Sep 17 00:00:00 2001
From: native-api <vano@mail.mipt.ru>
Date: Wed, 12 Oct 2022 21:30:36 +0300
Subject: [PATCH 7/7] Set up Github Actions CI (#440)

* Adjust tests: update Pip URLs, update expected output to match newer code
* Test library: improve failure message to eliminate the illusion of extra leading space in "actual" output
* Use Bats 1.2.0 like Pyenv
* Install greadlink for old MacOS
* Delete duplicate test
---
 .github/workflows/tests.yml | 37 +++++++++++++++++++++++++++++++++++++
 test/deactivate.bats        | 34 ++--------------------------------
 test/init.bats              |  2 ++
 test/pip.bats               |  2 +-
 test/test_helper.bash       |  6 ++++--
 test/virtualenv.bats        | 10 +++++-----
 6 files changed, 51 insertions(+), 40 deletions(-)
 create mode 100644 .github/workflows/tests.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000..59cf7d4
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,37 @@
+name: tests
+on: [pull_request, push]
+jobs:
+  tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-22.04
+          - ubuntu-20.04
+          - macos-12
+          - macos-11
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      # Normally, we would use the superbly maintained...
+      # - uses: actions/setup-python@v2
+      #   with:
+      #    python-version: ${{ matrix.python-version }}
+      # ... but in the repo, we want to test pyenv builds on Ubuntu
+      # - run: |
+          # sudo apt-get install -y build-essential libssl-dev zlib1g-dev libbz2-dev \
+              # libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
+              # xz-utils tk-dev libffi-dev liblzma-dev python-openssl git
+      # https://github.com/pyenv/pyenv#installation
+      #- env:
+      #    PYENV_ROOT: /home/runner/work/pyenv/pyenv
+      #  run: |
+      #    echo $PYENV_ROOT
+      #    echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
+      # macos-11 Github Actions env has an old `readlink` and lacks `greadlink` which causes Bats to break
+      - run: |
+          if [[ $RUNNER_OS == "macOS" ]] && [[ $(sw_vers -productVersion | awk -F. '{print $1}') -lt 12 ]]; then
+            brew install coreutils
+          fi
+      - run: git clone https://github.com/bats-core/bats-core.git --depth=1 -b v1.2.0 bats
+      - run: bats/bin/bats --tap test
diff --git a/test/deactivate.bats b/test/deactivate.bats
index d0b6dea..53ed0cb 100644
--- a/test/deactivate.bats
+++ b/test/deactivate.bats
@@ -1,4 +1,4 @@
-#!/usr/bin/env bats
+  #!/usr/bin/env bats
 
 load test_helper
 
@@ -54,7 +54,7 @@ EOS
   export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
   export PYENV_ACTIVATE_SHELL=
 
-  PYENV_SHELL="bash" run pyenv-sh-deactivate --quit
+  PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet
 
   assert_success
   assert_output <<EOS
@@ -110,36 +110,6 @@ fi;
 EOS
 }
 
-@test "deactivate virtualenv (quiet)" {
-  export PYENV_VIRTUALENV_INIT=1
-  export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-  export PYENV_ACTIVATE_SHELL=
-
-  PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet
-
-  assert_success
-  assert_output <<EOS
-unset PYENV_VIRTUAL_ENV;
-unset VIRTUAL_ENV;
-if [ -n "\${_OLD_VIRTUAL_PATH:-}" ]; then
-  export PATH="\${_OLD_VIRTUAL_PATH}";
-  unset _OLD_VIRTUAL_PATH;
-fi;
-if [ -n "\${_OLD_VIRTUAL_PYTHONHOME:-}" ]; then
-  export PYTHONHOME="\${_OLD_VIRTUAL_PYTHONHOME}";
-  unset _OLD_VIRTUAL_PYTHONHOME;
-fi;
-if [ -n "\${_OLD_VIRTUAL_PS1:-}" ]; then
-  export PS1="\${_OLD_VIRTUAL_PS1}";
-  unset _OLD_VIRTUAL_PS1;
-fi;
-if declare -f deactivate 1>/dev/null 2>&1; then
-  unset -f deactivate;
-fi;
-EOS
-}
-
 @test "deactivate virtualenv (with shell activation)" {
   export PYENV_VIRTUALENV_INIT=1
   export PYENV_VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
diff --git a/test/init.bats b/test/init.bats
index ba90b5d..85f2b42 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -72,6 +72,8 @@ EOS
   run pyenv-virtualenv-init - fish
   assert_success
   assert_output <<EOS
+while set index (contains -i -- "${TMP}/pyenv/plugins/pyenv-virtualenv/shims" \$PATH)
+set -eg PATH[\$index]; end; set -e index
 set -gx PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
 set -gx PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
diff --git a/test/pip.bats b/test/pip.bats
index 491613c..73a402f 100644
--- a/test/pip.bats
+++ b/test/pip.bats
@@ -63,7 +63,7 @@ OUT
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.3.6 python3.3 -m venv ${PYENV_ROOT}/versions/3.3.6/envs/venv
-Installing pip from https://bootstrap.pypa.io/3.3/get-pip.py...
+Installing pip from https://bootstrap.pypa.io/pip/3.3/get-pip.py...
 PYENV_VERSION=3.3.6/envs/venv python -s ${TMP}/pyenv/cache/get-pip.py
 rehashed
 OUT
diff --git a/test/test_helper.bash b/test/test_helper.bash
index 78a4f28..08bcb79 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -74,8 +74,10 @@ assert_failure() {
 
 assert_equal() {
   if [ "$1" != "$2" ]; then
-    { echo "expected: $1"
-      echo "actual:   $2"
+    { echo "expected:"
+      echo "$1"
+      echo "actual:"
+      echo "$2"
     } | flunk
   fi
 }
diff --git a/test/virtualenv.bats b/test/virtualenv.bats
index c22e563..0b6b562 100644
--- a/test/virtualenv.bats
+++ b/test/virtualenv.bats
@@ -38,7 +38,7 @@ unstub_pyenv() {
 
   assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/venv
-Installing pip from https://bootstrap.pypa.io/get-pip.py...
+Installing pip from https://bootstrap.pypa.io/pip/2.7/get-pip.py...
 rehashed
 OUT
   assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
@@ -67,7 +67,7 @@ OUT
 
   assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/venv
-Installing pip from https://bootstrap.pypa.io/get-pip.py...
+Installing pip from https://bootstrap.pypa.io/pip/2.7/get-pip.py...
 rehashed
 OUT
   assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
@@ -97,7 +97,7 @@ OUT
 
   assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/2.7.11/envs/venv
-Installing pip from https://bootstrap.pypa.io/get-pip.py...
+Installing pip from https://bootstrap.pypa.io/pip/2.7/get-pip.py...
 rehashed
 OUT
   assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
@@ -127,7 +127,7 @@ OUT
 
   assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv --verbose --python=${TMP}/python ${PYENV_ROOT}/versions/2.7.11/envs/venv
-Installing pip from https://bootstrap.pypa.io/get-pip.py...
+Installing pip from https://bootstrap.pypa.io/pip/2.7/get-pip.py...
 rehashed
 OUT
   assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/venv/bin/pydoc" ]
@@ -192,7 +192,7 @@ OUT
 
   assert_output <<OUT
 PYENV_VERSION=2.7.11 virtualenv ${PYENV_ROOT}/versions/2.7.11/envs/foo
-Installing pip from https://bootstrap.pypa.io/get-pip.py...
+Installing pip from https://bootstrap.pypa.io/pip/2.7/get-pip.py...
 rehashed
 OUT
   assert [ -x "${PYENV_ROOT}/versions/2.7.11/envs/foo/bin/pydoc" ]