From 3f29617b4bb8c8b1a64cd3960f8388820426add3 Mon Sep 17 00:00:00 2001 From: Hydrus Network Developer Date: Tue, 8 Oct 2024 21:28:06 -0500 Subject: [PATCH 1/6] Updating requests and setuptools --- requirements.txt | 4 +-- setup_venv.bat | 18 +++++------ setup_venv.command | 30 +++++++++---------- setup_venv.sh | 30 +++++++++---------- static/build_files/linux/requirements.txt | 4 +-- static/build_files/macos/requirements.txt | 4 +-- static/build_files/windows/requirements.txt | 4 +-- .../advanced/requirements_other_normal.txt | 4 +-- 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/requirements.txt b/requirements.txt index 65760a046..83606df85 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,5 +30,5 @@ mpv==1.0.6 QtPy==2.4.1 PySide6==6.6.3.1 -requests==2.31.0 -setuptools==69.1.1 +requests==2.32.3 +setuptools==70.3.0 diff --git a/setup_venv.bat b/setup_venv.bat index f93b7b0f2..a426cae59 100644 --- a/setup_venv.bat +++ b/setup_venv.bat @@ -180,15 +180,15 @@ goto :parse_fail set future=n REM comment this guy out if no special stuff going on -ECHO -------- -ECHO Future Libraries -ECHO: -ECHO There is a future test of requests and setuptools. Want to try it? -SET /P future="(y)es/(n)o? " - -IF "%future%" == "y" goto :question_future_done -IF "%future%" == "n" goto :question_future_done -goto :parse_fail +REM ECHO -------- +REM ECHO Future Libraries +REM ECHO: +REM ECHO There is a future test of requests and setuptools. Want to try it? +REM SET /P future="(y)es/(n)o? " + +REM IF "%future%" == "y" goto :question_future_done +REM IF "%future%" == "n" goto :question_future_done +REM goto :parse_fail :question_future_done diff --git a/setup_venv.command b/setup_venv.command index b8b159c22..363dc40dd 100755 --- a/setup_venv.command +++ b/setup_venv.command @@ -152,21 +152,21 @@ elif [ "$install_type" = "a" ]; then future=n # comment this guy out if no special stuff going on - echo "--------" - echo "Future Libraries" - echo - echo "There is a test of new requests and setuptools. Want to try it?" - echo "(y)es/(n)o? " - read -r future - if [ "$future" = "y" ]; then - : - elif [ "$future" = "n" ]; then - : - else - echo "Sorry, did not understand that input!" - popd || exit 1 - exit 1 - fi + # echo "--------" + # echo "Future Libraries" + # echo + # echo "There is a test of new requests and setuptools. Want to try it?" + # echo "(y)es/(n)o? " + # read -r future + # if [ "$future" = "y" ]; then + # : + # elif [ "$future" = "n" ]; then + # : + # else + # echo "Sorry, did not understand that input!" + # popd || exit 1 + # exit 1 + # fi else echo "Sorry, did not understand that input!" popd || exit 1 diff --git a/setup_venv.sh b/setup_venv.sh index 0d8bafb89..fdb81e522 100755 --- a/setup_venv.sh +++ b/setup_venv.sh @@ -154,21 +154,21 @@ elif [ "$install_type" = "a" ]; then future=n # comment this guy out if no special stuff going on - echo "--------" - echo "Future Libraries" - echo - echo "There is a test of new requests and setuptools. Want to try it?" - echo "(y)es/(n)o? " - read -r future - if [ "$future" = "y" ]; then - : - elif [ "$future" = "n" ]; then - : - else - echo "Sorry, did not understand that input!" - popd || exit 1 - exit 1 - fi + # echo "--------" + # echo "Future Libraries" + # echo + # echo "There is a test of new requests and setuptools. Want to try it?" + # echo "(y)es/(n)o? " + # read -r future + # if [ "$future" = "y" ]; then + # : + # elif [ "$future" = "n" ]; then + # : + # else + # echo "Sorry, did not understand that input!" + # popd || exit 1 + # exit 1 + # fi else echo "Sorry, did not understand that input!" popd || exit 1 diff --git a/static/build_files/linux/requirements.txt b/static/build_files/linux/requirements.txt index 2345d839d..55ff73747 100644 --- a/static/build_files/linux/requirements.txt +++ b/static/build_files/linux/requirements.txt @@ -30,8 +30,8 @@ mpv==1.0.6 QtPy==2.4.1 PySide6==6.6.3.1 -requests==2.31.0 -setuptools==69.1.1 +requests==2.32.3 +setuptools==70.3.0 pyinstaller==6.2 mkdocs-material diff --git a/static/build_files/macos/requirements.txt b/static/build_files/macos/requirements.txt index e402ed58d..298423c16 100644 --- a/static/build_files/macos/requirements.txt +++ b/static/build_files/macos/requirements.txt @@ -31,8 +31,8 @@ QtPy==2.4.1 PyQt6==6.6.0 PyQt6-Qt6==6.6.0 -requests==2.31.0 -setuptools==69.1.1 +requests==2.32.3 +setuptools==70.3.0 pyobjc-core>=10.1 pyobjc-framework-Cocoa>=10.1 diff --git a/static/build_files/windows/requirements.txt b/static/build_files/windows/requirements.txt index d023f5702..d1bdff96d 100644 --- a/static/build_files/windows/requirements.txt +++ b/static/build_files/windows/requirements.txt @@ -30,8 +30,8 @@ mpv==1.0.6 QtPy==2.4.1 PySide6==6.6.3.1 -requests==2.31.0 -setuptools==69.1.1 +requests==2.32.3 +setuptools==70.3.0 pyinstaller==6.2 mkdocs-material diff --git a/static/requirements/advanced/requirements_other_normal.txt b/static/requirements/advanced/requirements_other_normal.txt index a77cc3beb..029c2ca0d 100644 --- a/static/requirements/advanced/requirements_other_normal.txt +++ b/static/requirements/advanced/requirements_other_normal.txt @@ -1,2 +1,2 @@ -requests==2.31.0 -setuptools==69.1.1 +requests==2.32.3 +setuptools==70.3.0 From d1879a6f045e70e3b3ff57ea1ef18adf95151d7a Mon Sep 17 00:00:00 2001 From: Hydrus Network Developer Date: Tue, 15 Oct 2024 14:20:33 -0500 Subject: [PATCH 2/6] New PyInstaller Test --- static/build_files/linux/requirements.txt | 2 +- static/build_files/windows/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/static/build_files/linux/requirements.txt b/static/build_files/linux/requirements.txt index 55ff73747..d751915fa 100644 --- a/static/build_files/linux/requirements.txt +++ b/static/build_files/linux/requirements.txt @@ -33,5 +33,5 @@ PySide6==6.6.3.1 requests==2.32.3 setuptools==70.3.0 -pyinstaller==6.2 +pyinstaller==6.5 mkdocs-material diff --git a/static/build_files/windows/requirements.txt b/static/build_files/windows/requirements.txt index d1bdff96d..132936536 100644 --- a/static/build_files/windows/requirements.txt +++ b/static/build_files/windows/requirements.txt @@ -33,7 +33,7 @@ PySide6==6.6.3.1 requests==2.32.3 setuptools==70.3.0 -pyinstaller==6.2 +pyinstaller==6.5 mkdocs-material PyWin32 From 16feb1e546c5bf41816947ef93ea58d1760debb4 Mon Sep 17 00:00:00 2001 From: Hydrus Network Developer Date: Tue, 15 Oct 2024 14:52:08 -0500 Subject: [PATCH 3/6] Trying to remove setuptools entirely --- requirements.txt | 1 - static/build_files/linux/requirements.txt | 1 - static/build_files/macos/requirements.txt | 1 - static/build_files/windows/requirements.txt | 1 - static/requirements/advanced/requirements_other_normal.txt | 1 - 5 files changed, 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 83606df85..727670827 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,4 +31,3 @@ QtPy==2.4.1 PySide6==6.6.3.1 requests==2.32.3 -setuptools==70.3.0 diff --git a/static/build_files/linux/requirements.txt b/static/build_files/linux/requirements.txt index d751915fa..62f5acfdf 100644 --- a/static/build_files/linux/requirements.txt +++ b/static/build_files/linux/requirements.txt @@ -31,7 +31,6 @@ QtPy==2.4.1 PySide6==6.6.3.1 requests==2.32.3 -setuptools==70.3.0 pyinstaller==6.5 mkdocs-material diff --git a/static/build_files/macos/requirements.txt b/static/build_files/macos/requirements.txt index 298423c16..8810b4eb1 100644 --- a/static/build_files/macos/requirements.txt +++ b/static/build_files/macos/requirements.txt @@ -32,7 +32,6 @@ PyQt6==6.6.0 PyQt6-Qt6==6.6.0 requests==2.32.3 -setuptools==70.3.0 pyobjc-core>=10.1 pyobjc-framework-Cocoa>=10.1 diff --git a/static/build_files/windows/requirements.txt b/static/build_files/windows/requirements.txt index 132936536..a920fa652 100644 --- a/static/build_files/windows/requirements.txt +++ b/static/build_files/windows/requirements.txt @@ -31,7 +31,6 @@ QtPy==2.4.1 PySide6==6.6.3.1 requests==2.32.3 -setuptools==70.3.0 pyinstaller==6.5 mkdocs-material diff --git a/static/requirements/advanced/requirements_other_normal.txt b/static/requirements/advanced/requirements_other_normal.txt index 029c2ca0d..d80d9fc2a 100644 --- a/static/requirements/advanced/requirements_other_normal.txt +++ b/static/requirements/advanced/requirements_other_normal.txt @@ -1,2 +1 @@ requests==2.32.3 -setuptools==70.3.0 From 371d8b582a4f4e97cc40e32da3499204d47f57f4 Mon Sep 17 00:00:00 2001 From: Hydrus Network Developer Date: Tue, 15 Oct 2024 14:59:50 -0500 Subject: [PATCH 4/6] Revert "Trying to remove setuptools entirely" This reverts commit 16feb1e546c5bf41816947ef93ea58d1760debb4. --- requirements.txt | 1 + static/build_files/linux/requirements.txt | 1 + static/build_files/macos/requirements.txt | 1 + static/build_files/windows/requirements.txt | 1 + static/requirements/advanced/requirements_other_normal.txt | 1 + 5 files changed, 5 insertions(+) diff --git a/requirements.txt b/requirements.txt index 727670827..83606df85 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,3 +31,4 @@ QtPy==2.4.1 PySide6==6.6.3.1 requests==2.32.3 +setuptools==70.3.0 diff --git a/static/build_files/linux/requirements.txt b/static/build_files/linux/requirements.txt index 62f5acfdf..d751915fa 100644 --- a/static/build_files/linux/requirements.txt +++ b/static/build_files/linux/requirements.txt @@ -31,6 +31,7 @@ QtPy==2.4.1 PySide6==6.6.3.1 requests==2.32.3 +setuptools==70.3.0 pyinstaller==6.5 mkdocs-material diff --git a/static/build_files/macos/requirements.txt b/static/build_files/macos/requirements.txt index 8810b4eb1..298423c16 100644 --- a/static/build_files/macos/requirements.txt +++ b/static/build_files/macos/requirements.txt @@ -32,6 +32,7 @@ PyQt6==6.6.0 PyQt6-Qt6==6.6.0 requests==2.32.3 +setuptools==70.3.0 pyobjc-core>=10.1 pyobjc-framework-Cocoa>=10.1 diff --git a/static/build_files/windows/requirements.txt b/static/build_files/windows/requirements.txt index a920fa652..132936536 100644 --- a/static/build_files/windows/requirements.txt +++ b/static/build_files/windows/requirements.txt @@ -31,6 +31,7 @@ QtPy==2.4.1 PySide6==6.6.3.1 requests==2.32.3 +setuptools==70.3.0 pyinstaller==6.5 mkdocs-material diff --git a/static/requirements/advanced/requirements_other_normal.txt b/static/requirements/advanced/requirements_other_normal.txt index d80d9fc2a..029c2ca0d 100644 --- a/static/requirements/advanced/requirements_other_normal.txt +++ b/static/requirements/advanced/requirements_other_normal.txt @@ -1 +1,2 @@ requests==2.32.3 +setuptools==70.3.0 From 4c8424735c71f37fbce359e35f4a8ba54479f511 Mon Sep 17 00:00:00 2001 From: Hydrus Network Developer Date: Tue, 15 Oct 2024 15:07:27 -0500 Subject: [PATCH 5/6] ChatGPT to the rescue --- static/build_files/linux/requirements.txt | 2 +- static/build_files/windows/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/static/build_files/linux/requirements.txt b/static/build_files/linux/requirements.txt index d751915fa..e3e6fb860 100644 --- a/static/build_files/linux/requirements.txt +++ b/static/build_files/linux/requirements.txt @@ -33,5 +33,5 @@ PySide6==6.6.3.1 requests==2.32.3 setuptools==70.3.0 -pyinstaller==6.5 +pyinstaller==6.7 mkdocs-material diff --git a/static/build_files/windows/requirements.txt b/static/build_files/windows/requirements.txt index 132936536..36b2db0f1 100644 --- a/static/build_files/windows/requirements.txt +++ b/static/build_files/windows/requirements.txt @@ -33,7 +33,7 @@ PySide6==6.6.3.1 requests==2.32.3 setuptools==70.3.0 -pyinstaller==6.5 +pyinstaller==6.7 mkdocs-material PyWin32 From d036e44355def8a128f6af8e1e8d2e014cac75b7 Mon Sep 17 00:00:00 2001 From: Hydrus Network Developer Date: Tue, 15 Oct 2024 15:41:59 -0500 Subject: [PATCH 6/6] Catching up other requirements.txts --- static/requirements/hydev/requirements_linux_build.txt | 2 +- static/requirements/hydev/requirements_windows_build.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/static/requirements/hydev/requirements_linux_build.txt b/static/requirements/hydev/requirements_linux_build.txt index 6f02de855..51990e10c 100644 --- a/static/requirements/hydev/requirements_linux_build.txt +++ b/static/requirements/hydev/requirements_linux_build.txt @@ -1,4 +1,4 @@ -PyInstaller==6.2 +PyInstaller==6.7 mock>=4.0.0 httmock>=1.4.0 diff --git a/static/requirements/hydev/requirements_windows_build.txt b/static/requirements/hydev/requirements_windows_build.txt index d12423480..2e92ce4b0 100644 --- a/static/requirements/hydev/requirements_windows_build.txt +++ b/static/requirements/hydev/requirements_windows_build.txt @@ -1,4 +1,4 @@ -PyInstaller==6.2 +PyInstaller==6.7 mock>=4.0.0 httmock>=1.4.0