Skip to content

Commit

Permalink
Merge branch 'future-2024-10' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
hydrusnetwork committed Oct 23, 2024
2 parents d0f2c97 + cff4862 commit e6373b5
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 53 deletions.
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions setup_venv.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
30 changes: 15 additions & 15 deletions setup_venv.command
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions setup_venv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions static/build_files/linux/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
pyinstaller==6.7
mkdocs-material
4 changes: 2 additions & 2 deletions static/build_files/macos/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions static/build_files/windows/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ 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
pyinstaller==6.7
mkdocs-material

PyWin32
Expand Down
4 changes: 2 additions & 2 deletions static/requirements/advanced/requirements_other_normal.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
requests==2.31.0
setuptools==69.1.1
requests==2.32.3
setuptools==70.3.0
2 changes: 1 addition & 1 deletion static/requirements/hydev/requirements_linux_build.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PyInstaller==6.2
PyInstaller==6.7

mock>=4.0.0
httmock>=1.4.0
Expand Down
2 changes: 1 addition & 1 deletion static/requirements/hydev/requirements_windows_build.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PyInstaller==6.2
PyInstaller==6.7

mock>=4.0.0
httmock>=1.4.0
Expand Down

0 comments on commit e6373b5

Please sign in to comment.