From 3f29617b4bb8c8b1a64cd3960f8388820426add3 Mon Sep 17 00:00:00 2001 From: Hydrus Network Developer Date: Tue, 8 Oct 2024 21:28:06 -0500 Subject: [PATCH] Updating requests and setuptools --- requirements.txt | 4 +-- setup_venv.bat | 16 +++++----- 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, 48 insertions(+), 48 deletions(-) diff --git a/requirements.txt b/requirements.txt index 65760a04..83606df8 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 f93b7b0f..a426cae5 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? " +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? " -IF "%future%" == "y" goto :question_future_done -IF "%future%" == "n" goto :question_future_done -goto :parse_fail +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 b8b159c2..363dc40d 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 0d8bafb8..fdb81e52 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 2345d839..55ff7374 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 e402ed58..298423c1 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 d023f570..d1bdff96 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 a77cc3be..029c2ca0 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