mirror of
https://github.com/YunoHost-Apps/django-for-runners_ynh.git
synced 2024-09-03 18:26:16 +02:00
Merge pull request #53 from YunoHost-Apps/dev
Install newer Python version
This commit is contained in:
commit
55264fd551
1 changed files with 96 additions and 1 deletions
|
@ -38,12 +38,107 @@ log_file="${log_path}/${app}.log"
|
||||||
# HELPERS
|
# HELPERS
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
|
|
||||||
|
#==================================================================================
|
||||||
|
# myynh_install_python() Borrowed from:
|
||||||
|
# https://github.com/YunoHost-Apps/homeassistant_ynh/blob/master/scripts/_common.sh
|
||||||
|
# Until we get a newer Python in YunoHost, see:
|
||||||
|
# https://forum.yunohost.org/t/use-newer-python-than-3-9/22568
|
||||||
|
#==================================================================================
|
||||||
|
py_required_major=3.11
|
||||||
|
py_required_version=$(curl -Ls https://www.python.org/ftp/python/ \
|
||||||
|
| grep '>'$py_required_major | cut -d '/' -f 2 \
|
||||||
|
| cut -d '>' -f 2 | sort -rV | head -n 1) #3.11.8
|
||||||
|
|
||||||
|
myynh_install_python() {
|
||||||
|
# Declare an array to define the options of this helper.
|
||||||
|
local legacy_args=u
|
||||||
|
local -A args_array=( [p]=python= )
|
||||||
|
local python
|
||||||
|
# Manage arguments with getopts
|
||||||
|
ynh_handle_getopts_args "$@"
|
||||||
|
|
||||||
|
# Check python version from APT
|
||||||
|
local py_apt_version=$(python3 --version | cut -d ' ' -f 2)
|
||||||
|
|
||||||
|
# Usefull variables
|
||||||
|
local python_major=${python%.*}
|
||||||
|
|
||||||
|
# Check existing built version of python in /usr/local/bin
|
||||||
|
if [ -e "/usr/local/bin/python$python_major" ]
|
||||||
|
then
|
||||||
|
local py_built_version=$(/usr/local/bin/python$python_major --version \
|
||||||
|
| cut -d ' ' -f 2)
|
||||||
|
else
|
||||||
|
local py_built_version=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Compare version
|
||||||
|
if $(dpkg --compare-versions $py_apt_version ge $python)
|
||||||
|
then
|
||||||
|
# APT >= Required
|
||||||
|
ynh_print_info --message="Using provided python3..."
|
||||||
|
|
||||||
|
py_app_version="python3"
|
||||||
|
|
||||||
|
else
|
||||||
|
# Either python already built or to build
|
||||||
|
if $(dpkg --compare-versions $py_built_version ge $python)
|
||||||
|
then
|
||||||
|
# Built >= Required
|
||||||
|
ynh_print_info --message="Using already used python3 built version..."
|
||||||
|
|
||||||
|
py_app_version="/usr/local/bin/python${py_built_version%.*}"
|
||||||
|
|
||||||
|
else
|
||||||
|
# APT < Minimal & Actual < Minimal => Build & install Python into /usr/local/bin
|
||||||
|
ynh_print_info --message="Building python (may take a while)..."
|
||||||
|
|
||||||
|
# Store current direcotry
|
||||||
|
local MY_DIR=$(pwd)
|
||||||
|
|
||||||
|
# Create a temp direcotry
|
||||||
|
tmpdir="$(mktemp --directory)"
|
||||||
|
cd "$tmpdir"
|
||||||
|
|
||||||
|
# Download
|
||||||
|
wget --output-document="Python-$python.tar.xz" \
|
||||||
|
"https://www.python.org/ftp/python/$python/Python-$python.tar.xz" 2>&1
|
||||||
|
|
||||||
|
# Extract
|
||||||
|
tar xf "Python-$python.tar.xz"
|
||||||
|
|
||||||
|
# Install
|
||||||
|
cd "Python-$python"
|
||||||
|
./configure --enable-optimizations
|
||||||
|
ynh_exec_warn_less make -j4
|
||||||
|
ynh_exec_warn_less make altinstall
|
||||||
|
|
||||||
|
# Go back to working directory
|
||||||
|
cd "$MY_DIR"
|
||||||
|
|
||||||
|
# Clean
|
||||||
|
ynh_secure_remove "$tmpdir"
|
||||||
|
|
||||||
|
# Set version
|
||||||
|
py_app_version="/usr/local/bin/python$python_major"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
# Save python version in settings
|
||||||
|
ynh_app_setting_set --app=$app --key=python --value="$python"
|
||||||
|
}
|
||||||
|
#==================================================================================
|
||||||
|
#==================================================================================
|
||||||
|
|
||||||
myynh_setup_python_venv() {
|
myynh_setup_python_venv() {
|
||||||
# Always recreate everything fresh with current python version
|
# Always recreate everything fresh with current python version
|
||||||
ynh_secure_remove "$data_dir/venv"
|
ynh_secure_remove "$data_dir/venv"
|
||||||
|
|
||||||
|
myynh_install_python --python="$py_required_version"
|
||||||
|
|
||||||
|
# Create a virtualenv with python installed by myynh_install_python():
|
||||||
# Skip pip because of: https://github.com/YunoHost/issues/issues/1960
|
# Skip pip because of: https://github.com/YunoHost/issues/issues/1960
|
||||||
python3 -m venv --without-pip "$data_dir/venv"
|
$py_app_version -m venv --without-pip "$data_dir/venv"
|
||||||
|
|
||||||
chown -c -R "$app:" "$data_dir"
|
chown -c -R "$app:" "$data_dir"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue