[gtk-osx] Revert "Rename PYENV_VERSION to PYENV_PYTHON_VERSION"

[John Ralls <jralls src gnome org>]

commit 1a8dd8730f4ca395b3bb23762cf61bdff165513f
Author: John Ralls <jralls ceridwen us>
Date:   Fri Feb 18 11:01:08 2022 -0800

    Revert "Rename PYENV_VERSION to PYENV_PYTHON_VERSION"
    
    This reverts commit 18cd0e12797859eb8224e46429688f51208025e0 because
    PYENV_VERSION is defined by pyenv and using something else breaks pyenv.

 gtk-osx-setup.sh  | 11 +++++++----
 jhbuildrc-gtk-osx |  5 ++++-
 2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/gtk-osx-setup.sh b/gtk-osx-setup.sh
index 38bf202..a0717d1 100755
--- a/gtk-osx-setup.sh
+++ b/gtk-osx-setup.sh
@@ -57,6 +57,7 @@ envvar DEV_SRC_ROOT "$DEVROOT/Source"
 envvar PYENV_INSTALL_ROOT "$DEV_SRC_ROOT/pyenv"
 envvar PYENV_ROOT "$DEVPREFIX/share/pyenv"
 envvar PIP_CONFIG_DIR "$HOME/.config/pip"
+envvar PYTHON_VERSION 3.10.0
 
 export PYTHONWARNINGS=ignore:DEPRECATION::pip._internal.cli.base_command
 
@@ -96,8 +97,10 @@ fi
 #doesn't include a usable libpython for libxml2 to link against.
 
 export PYTHON_CONFIGURE_OPTS="--enable-shared"
-export PYENV_PYTHON_VERSION=3.10.0
-$PYENV install -v $PYENV_PYTHON_VERSION
+#This really means pyenv's *python* version. It's poorly named but
+#it's defined by pyenv so it can't be changed.
+export PYENV_VERSION=$PYTHON_VERSION
+$PYENV install -v $PYENV_VERSION
 PIP="$PYENV_ROOT/shims/pip3"
 
 $PIP install --upgrade --user pip
@@ -156,7 +159,7 @@ if test ! -d "$DEVPREFIX/etc" ; then
     mkdir -p "$DEVPREFIX/etc"
 fi
 
-PYENV_MINOR_VERSION=$(echo $PYENV_PYTHON_VERSION | cut -d . -f 1,2)
+PYENV_MINOR_VERSION=$(echo $PYENV_VERSION | cut -d . -f 1,2)
 cat  <<EOF > "$DEVPREFIX/etc/Pipfile"
 [[source]]
 url = "https://pypi.python.org/simple";
@@ -188,7 +191,7 @@ export PYTHONUSERBASE="$PYTHONUSERBASE"
 export PIPENV_DOTENV_LOCATION="$DEVPREFIX/etc/pipenv-env"
 export PIPENV_PIPFILE="$DEVPREFIX/etc/Pipfile"
 export PYENV_ROOT="$PYENV_ROOT"
-export PYENV_PYTHON_VERSION="$PYENV_PYTHON_VERSION"
+export PYENV_VERSION="$PYENV_VERSION"
 export PATH="$PYENV_ROOT/shims:\$PATH"
 export CARGO_HOME="$CARGO_HOME"
 export RUSTUP_HOME="$RUSTUP_HOME"
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 1002bc6..2e864fa 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -616,6 +616,9 @@ if not _ran_recursively and _gtk_osx_prompt_prefix:
 # the built python is a different major + minor version from the
 # virtenv one.
 
+# Note that PYENV_VERSION sets the version of python that pyenv uses,
+# not pyenv's own version. It's defined by pyenv and can't be changed.
+
 if ('python3' in modules or 'meta-gtk-osx-python3' in modules or
     'pygments' in modules):
     os.environ['PYTHON'] = os.path.join(prefix, 'bin', 'python3')
@@ -628,7 +631,7 @@ else:
                        '--with-python-install-dir=' + _python_install_path)
     environ_append('PYTHONPATH', _python_install_path, ':')
     _python_library_path = os.path.join(os.environ['PYENV_ROOT'], 'versions',
-                                       os.environ['PYENV_PYTHON_VERSION'], 'lib')
+                                       os.environ['PYENV_VERSION'], 'lib')
     environ_append('LDFLAGS', '-L' + _python_library_path)
     os.environ['PYTHON'] = sys.executable