Parcourir la source

Add a version-neutral verify fn for rolling-release scripts

E.g. "*-latest"
May need splitting into project-specific ones if there emerge projects with different check needed

Closes https://github.com/pyenv/pyenv/issues/1559
pull/1936/head
Ivan Pozdeev il y a 5 ans
Parent
révision
fdbcdd38f1
3 fichiers modifiés avec 14 ajouts et 4 suppressions
  1. +4
    -1
      README.md
  2. +7
    -0
      plugins/python-build/bin/python-build
  3. +3
    -3
      plugins/python-build/share/python-build/miniconda3-latest

+ 4
- 1
README.md Voir le fichier

@ -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.

+ 7
- 0
plugins/python-build/bin/python-build Voir le fichier

@ -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

+ 3
- 3
plugins/python-build/share/python-build/miniconda3-latest Voir le fichier

@ -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

Chargement…
Annuler
Enregistrer