diff --git a/README.md b/README.md index 05a296e5..ca98f84d 100644 --- a/README.md +++ b/README.md @@ -223,7 +223,7 @@ easy to fork and contribute any changes back upstream. run by GUI managers (which typically act as a `sh` login shell). **MacOS note:** If you installed Pyenv with Homebrew, you don't need - to add the `PYENV_ROOT=` and `PATH=` lines. + to add the `PYENV_ROOT=` and `PATH=` lines. You also don't need to add commands into `~/.profile` if your shell doesn't use it. - For **bash**: @@ -320,6 +320,9 @@ easy to fork and contribute any changes back upstream. 4. **Restart your login session for the changes to take effect.** E.g. if you're in a GUI session, you need to fully log out and log back in. + + In MacOS, restarting terminal windows is enough (because MacOS runs shells + in them as login shells by default). 5. [**Install Python build dependencies**](https://github.com/pyenv/pyenv/wiki#suggested-build-environment) before attempting to install a new Python version. diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 42b13e84..cc7f51d6 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1762,6 +1762,13 @@ build_package_verify_py311() { build_package_verify_py310 "$1" "${2:-3.11}" } +# Post-install check for Python 3.x rolling release scripts +# XXX: Will need splitting into project-specific ones if there emerge +# multiple rolling-release scripts with different checks needed +build_package_verify_py3_latest() { + build_package_verify_py311 "$1" "3" +} + # Copy Tools/gdb/libpython.py to pythonX.Y-gdb.py (#1190) build_package_copy_python_gdb() { if [ -e "$BUILD_PATH/$1/Tools/gdb/libpython.py" ]; then diff --git a/plugins/python-build/share/python-build/miniconda3-latest b/plugins/python-build/share/python-build/miniconda3-latest index 4bf0705c..cd85681a 100644 --- a/plugins/python-build/share/python-build/miniconda3-latest +++ b/plugins/python-build/share/python-build/miniconda3-latest @@ -1,12 +1,12 @@ case "$(anaconda_architecture 2>/dev/null || true)" in "Linux-x86" ) - install_script "Miniconda3-latest-Linux-x86" "https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86.sh" "miniconda" verify_py36 + install_script "Miniconda3-latest-Linux-x86" "https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86.sh" "miniconda" verify_py3_latest ;; "Linux-x86_64" ) - install_script "Miniconda3-latest-Linux-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh" "miniconda" verify_py36 + install_script "Miniconda3-latest-Linux-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh" "miniconda" verify_py3_latest ;; "MacOSX-x86_64" ) - install_script "Miniconda3-latest-MacOSX-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh" "miniconda" verify_py36 + install_script "Miniconda3-latest-MacOSX-x86_64" "https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh" "miniconda" verify_py3_latest ;; * ) { echo