From a9701d72187ecfaee4a2f69cf2c2adc0b9d2e54c Mon Sep 17 00:00:00 2001 From: deajan Date: Fri, 14 Mar 2025 16:13:20 +0100 Subject: [PATCH] Bump freesimplegui requirements --- bin/COMPILE.cmd | 6 ------ bin/COMPILE.sh | 3 --- npbackup/requirements.txt | 4 +--- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/bin/COMPILE.cmd b/bin/COMPILE.cmd index fc8f059..39b5653 100644 --- a/bin/COMPILE.cmd +++ b/bin/COMPILE.cmd @@ -17,9 +17,6 @@ SET PYTHONPATH=c:\GIT\npbackup "%PYTHON64%" -m pip install --upgrade pip || GOTO ERROR "%PYTHON64%" -m pip install pytest -:: Uninstall prior versions of Freesimplegui if present so we get to use the git commit version -:: which otherwise would not overwrite existing setup -"%PYTHON64%" -m pip uninstall -y freesimplegui "%PYTHON64%" -m pip install --upgrade -r npbackup/requirements.txt || GOTO ERROR "%PYTHON64%" -m pytest C:\GIT\npbackup\tests || GOTO ERROR @@ -29,9 +26,6 @@ SET PYTHONPATH=c:\GIT\npbackup "%PYTHON32%" -m pip install --upgrade pip || GOTO ERROR "%PYTHON32%" -m pip install pytest -:: Uninstall prior versions of Freesimplegui if present so we get to use the git commit version -:: which otherwise would not overwrite existing setup -"%PYTHON32%" -m pip uninstall -y freesimplegui "%PYTHON32%" -m pip install --upgrade -r npbackup/requirements.txt || GOTO ERROR "%PYTHON32%" -m pytest C:\GIT\npbackup\tests || GOTO ERROR diff --git a/bin/COMPILE.sh b/bin/COMPILE.sh index 7a47a33..1f9e442 100755 --- a/bin/COMPILE.sh +++ b/bin/COMPILE.sh @@ -15,9 +15,6 @@ export PYTHONPATH=/opt/npbackup /opt/npbackup/venv/bin/python -m pip install --upgrade pip || exit 1 /opt/npbackup/venv/bin/python -m pip install pytest ||exit 1 -# Uninstall prior versions of Freesimplegui if present so we get to use the git commit version -# which otherwise would not overwrite existing setup -/opt/npbackup/venv/bin/python -m pip uninstall -y freesimplegui /opt/npbackup/venv/bin/python -m pip install --upgrade -r npbackup/requirements.txt || exit 1 /opt/npbackup/venv/bin/python -m pytest /opt/npbackup/tests || exit 1 diff --git a/npbackup/requirements.txt b/npbackup/requirements.txt index a198c29..31b5124 100644 --- a/npbackup/requirements.txt +++ b/npbackup/requirements.txt @@ -10,10 +10,8 @@ ofunctions.random ofunctions.requestor>=1.2.2 python-pidfile>=3.0.0 # pysimplegui 5 has gone commercial, let's switch to freesimplegui -# we need to stick to freesimplegui 5.1.1 to keep Python 3.6 compat in order compile for elder linuxes -# finally we need freesimplegui with patch #51 since there are no newer releases ATM (2025/03/04) # keep in mind that freesimplegui might higher required python version in the future -freesimplegui @ git+https://github.com/spyoungtech/FreeSimpleGUI@db26fd15f2abec79fcd93d966c9677e1a3464753 +freesimplegui==5.2.0 requests ruamel.yaml psutil