From 387cbd0d17fc1f3a7cfd9d283a7bb31bc0242ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C4=81rlis=20Se=C5=86ko?= Date: Sat, 12 Dec 2020 13:17:52 +0200 Subject: [PATCH] More python verison updates. --- dist/appbundle_embed_python.sh | 4 ++-- scripts/appimage_embed_python.sh | 2 +- scripts/prepare_python_macos.sh | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/appbundle_embed_python.sh b/dist/appbundle_embed_python.sh index 1267a7c2..c41159f2 100755 --- a/dist/appbundle_embed_python.sh +++ b/dist/appbundle_embed_python.sh @@ -5,7 +5,7 @@ if ! [[ $# -eq 3 ]]; then exit 1 fi -python_version=python3.6 +python_version=python3.9 py_framework=$1 appbundle=$2 @@ -22,7 +22,7 @@ install_name_tool -change `otool -L "$executable" | sed -n "s/^[[:blank:]]*\([^[ echo "Cleaning up embedded Python Framework" cd "$appbundle/Contents/Frameworks/Python.framework" || exit 1 find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf || exit 1 -rm -r Versions/Current/Resources/* Versions/Current/lib/python3.6/test Versions/Current/lib/python3.6/idlelib Versions/Current/lib/python3.6/curses Versions/Current/lib/python3.6/lib2to3 || exit 1 +rm -r Versions/Current/Resources/* Versions/Current/lib/$python_version/test Versions/Current/lib/$python_version/idlelib Versions/Current/lib/$python_version/curses Versions/Current/lib/$python_version/lib2to3 || exit 1 echo "Checking if PySide2 is available" diff --git a/scripts/appimage_embed_python.sh b/scripts/appimage_embed_python.sh index 6715ed40..a7a98f03 100755 --- a/scripts/appimage_embed_python.sh +++ b/scripts/appimage_embed_python.sh @@ -5,7 +5,7 @@ if ! [[ $# -eq 1 ]]; then exit 1 fi -python_version=python3.6 +python_version=python3.9 python_prefix=$(pkg-config --variable=prefix python3) appdir=$1 diff --git a/scripts/prepare_python_macos.sh b/scripts/prepare_python_macos.sh index 94bcc484..126621e8 100755 --- a/scripts/prepare_python_macos.sh +++ b/scripts/prepare_python_macos.sh @@ -4,12 +4,12 @@ SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")") mkdir python && cd python -wget "https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz" || exit 1 -tar -xf Python-3.6.4.tar.xz || exit 1 +wget "https://www.python.org/ftp/python/3.9.1/Python-3.9.1.tar.xz" || exit 1 +tar -xf Python-3.9.1.tar.xz || exit 1 export PYTHON_FRAMEWORK_DIR="`pwd`/framework" -cd Python-3.6.4 || exit 1 +cd Python-3.9.1 || exit 1 CPPFLAGS="-I$(brew --prefix openssl)/include" LDFLAGS="-L$(brew --prefix openssl)/lib" ./configure --enable-framework=$PYTHON_FRAMEWORK_DIR || exit 1