From a36c12ad5c3610c2650f4e9467551af0787078e8 Mon Sep 17 00:00:00 2001 From: Morgan McMillian Date: Sun, 31 Oct 2021 08:39:41 -0700 Subject: [PATCH] update python version --- dev-build.sh | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/dev-build.sh b/dev-build.sh index 0642c86..766ecfa 100755 --- a/dev-build.sh +++ b/dev-build.sh @@ -6,8 +6,8 @@ TMP_DIR="${PROJECT_DIR}/tmp" OLM_DIR="${PROJECT_DIR}/olm" PANTALAIMON_DIR="${PROJECT_DIR}/pantalaimon" -PYTHON_VERSION_MINOR="3.7" -PYTHON_VERSION_PATCH="7" +PYTHON_VERSION_MINOR="3.8" +PYTHON_VERSION_PATCH="12" PYTHON_VERSION="${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}" PYTHON_DIR="${PROJECT_DIR}/python" PYTHON_SRC_DIR="${TMP_DIR}/Python-${PYTHON_VERSION}" @@ -19,21 +19,6 @@ mkdir -p "${TMP_DIR}" PACKAGES="make cmake build-essential zlibc python3-venv libffi-dev ppa-purge libssl-dev libsqlite3-dev zlib1g-dev rustc cargo libgirepository1.0-dev libdbus-1-dev libcairo2-dev" -PANTALAIMON_PATCH_CONTENT=" -diff --git a/pantalaimon/main.py b/pantalaimon/main.py -index 896d29e..3e0fee8 100644 ---- a/pantalaimon/main.py -+++ b/pantalaimon/main.py -@@ -32,6 +32,7 @@ from pantalaimon.log import logger - from pantalaimon.thread_messages import DaemonResponse - from pantalaimon.ui import UI_ENABLED - -+keyring.core.set_keyring(keyring.core.load_keyring('keyring.backends.SecretService.Keyring')) - - def create_dirs(data_dir, conf_dir): - try: -" - echo "Remounting RootFS writable..." sudo mount -o remount,rw / @@ -102,8 +87,6 @@ CFLAGS=-I${OLM_DIR}/usr/local/include LDFLAGS=-L${OLM_DIR}/usr/local/lib ${PIP} echo "Bundling Pantalaimon..." cd ${PROJECT_DIR} -echo "${PANTALAIMON_PATCH_CONTENT}" > main.patch -# patch ${PYTHON_DIR}/lib/python${PYTHON_VERSION_MINOR}/site-packages/pantalaimon/main.py main.patch ${PYTHON_DIR}/bin/pyinstaller --onefile ${PYTHON_DIR}/bin/pantalaimon ${PYTHON_DIR}/bin/pyinstaller --onefile ${PYTHON_DIR}/bin/panctl