Rooba
/
hydrus
mirror of https://github.com/hydrusnetwork/hydrus.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some env stuff

This commit is contained in:
Hydrus Network Developer 2023-09-05 15:01:54 -05:00
parent 8360fcc527
commit 54c2cd34e8
No known key found for this signature in database
GPG Key ID: 76249F053212133C
6 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/release.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
python-version: '3.10'
-
name: Build docs to /help
run: |
@ -86,7 +86,7 @@ jobs:
name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
python-version: '3.10'
architecture: x64
-
name: APT Install
@ -148,7 +148,7 @@ jobs:
name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
python-version: '3.10'
architecture: x64
-
name: Pip Install

13
setup_venv.bat
View File

@ -46,12 +46,14 @@ goto :parse_fail
ECHO:
ECHO Qt is the User Interface library. We are now on Qt6.
ECHO If you are on Windows ^<=8.1, choose 5. If 6 gives you trouble, fall back to o.
SET /P qt="Do you want Qt(5), Qt(6), Qt6 (o)lder, or (t)est? "
ECHO If you are on Windows ^<=8.1, choose 5.
ECHO If you have multi-monitor menu position bugs with the normal Qt6, try the (o)lder build on Python ^<=3.10 or (m)iddle on Python ^>=3.11.
SET /P qt="Do you want Qt(5), Qt(6), Qt6 (o)lder, Qt6 (m)iddle or (t)est? "
IF "%qt%" == "5" goto :question_mpv
IF "%qt%" == "6" goto :question_mpv
IF "%qt%" == "o" goto :question_mpv
IF "%qt%" == "m" goto :question_mpv
IF "%qt%" == "t" goto :question_mpv
goto :parse_fail
@ -60,10 +62,11 @@ goto :parse_fail
ECHO:
ECHO mpv is the main way to play audio and video. We need to tell hydrus how to talk to your mpv dll.
ECHO Try the n first. If it doesn't work, fall back to o.
SET /P mpv="Do you want (o)ld mpv or (n)ew mpv? "
SET /P mpv="Do you want (o)ld mpv, (n)ew mpv, or (t)est mpv? "
IF "%mpv%" == "o" goto :question_opencv
IF "%mpv%" == "n" goto :question_opencv
IF "%mpv%" == "t" goto :question_opencv
goto :parse_fail
:question_opencv
@ -115,7 +118,7 @@ IF "%install_type%" == "d" (
python -m pip install pyside2
python -m pip install PyQtChart PyQt5
python -m pip install PyQt6-Charts PyQt6
python -m pip install -r static\requirements\advanced\requirements_mpv_new.txt
python -m pip install -r static\requirements\advanced\requirements_mpv_test.txt
python -m pip install -r static\requirements\advanced\requirements_opencv_test.txt
python -m pip install -r static\requirements\hydev\requirements_windows_build.txt
@ -129,10 +132,12 @@ IF "%install_type%" == "a" (
IF "%qt%" == "5" python -m pip install -r static\requirements\advanced\requirements_qt5.txt
IF "%qt%" == "6" python -m pip install -r static\requirements\advanced\requirements_qt6.txt
IF "%qt%" == "o" python -m pip install -r static\requirements\advanced\requirements_qt6_older.txt
IF "%qt%" == "m" python -m pip install -r static\requirements\advanced\requirements_qt6_middle.txt
IF "%qt%" == "t" python -m pip install -r static\requirements\advanced\requirements_qt6_test.txt
IF "%mpv%" == "o" python -m pip install -r static\requirements\advanced\requirements_mpv_old.txt
IF "%mpv%" == "n" python -m pip install -r static\requirements\advanced\requirements_mpv_new.txt
IF "%mpv%" == "t" python -m pip install -r static\requirements\advanced\requirements_mpv_test.txt
IF "%opencv%" == "o" python -m pip install -r static\requirements\advanced\requirements_opencv_old.txt
IF "%opencv%" == "n" python -m pip install -r static\requirements\advanced\requirements_opencv_new.txt

15
setup_venv.command
View File

@ -33,8 +33,9 @@ if [ "$install_type" = "s" ]; then
elif [ "$install_type" = "a" ]; then
echo
echo "Qt is the User Interface library. We are now on Qt6."
echo "If you are <= 10.13 (High Sierra), choose 5. If you are <=10.15 (Catalina), choose o."
echo "Do you want Qt(5), Qt(6), Qt6 (o)lder, or (t)est? "
echo "If you are <= 10.13 (High Sierra), choose 5."
echo "If you are <=10.15 (Catalina) or otherwise have trouble with the normal Qt6, try the (o)lder build on Python ^<=3.10 or (m)iddle on Python ^>=3.11."
echo "Do you want Qt(5), Qt(6), Qt6 (o)lder, Qt6 (m)iddle or (t)est? "
read -r qt
if [ "$qt" = "5" ]; then
:
@ -42,6 +43,8 @@ elif [ "$install_type" = "a" ]; then
:
elif [ "$qt" = "o" ]; then
:
elif [ "$qt" = "m" ]; then
:
elif [ "$qt" = "t" ]; then
:
else
@ -52,12 +55,14 @@ elif [ "$install_type" = "a" ]; then
echo
echo "mpv is broken on macOS. As a safe default, choose n."
echo "Do you want (o)ld mpv or (n)ew mpv? "
echo "Do you want (o)ld mpv, (n)ew mpv, or (t)est mpv? "
read -r mpv
if [ "$mpv" = "o" ]; then
:
elif [ "$mpv" = "n" ]; then
:
elif [ "$mpv" = "t" ]; then
:
else
echo "Sorry, did not understand that input!"
popd || exit 1
@ -112,6 +117,8 @@ elif [ "$install_type" = "a" ]; then
python -m pip install -r static/requirements/advanced/requirements_qt6.txt
elif [ "$qt" = "o" ]; then
python -m pip install -r static/requirements/advanced/requirements_qt6_older.txt
elif [ "$qt" = "m" ]; then
python -m pip install -r static/requirements/advanced/requirements_qt6_middle.txt
elif [ "$qt" = "t" ]; then
python -m pip install -r static/requirements/advanced/requirements_qt6_test.txt
fi
@ -120,6 +127,8 @@ elif [ "$install_type" = "a" ]; then
python -m pip install -r static/requirements/advanced/requirements_mpv_old.txt
elif [ "$mpv" = "n" ]; then
python -m pip install -r static/requirements/advanced/requirements_mpv_new.txt
elif [ "$mpv" = "t" ]; then
python -m pip install -r static/requirements/advanced/requirements_mpv_test.txt
fi
if [ "$opencv" = "o" ]; then

15
setup_venv.sh
View File

@ -33,8 +33,9 @@ if [ "$install_type" = "s" ]; then
elif [ "$install_type" = "a" ]; then
echo
echo "Qt is the User Interface library. We are now on Qt6."
echo "If you are <=Ubuntu 18.04 or equivalent, choose 5. If 6 gives you trouble, fall back to o."
echo "Do you want Qt(5), Qt(6), Qt6 (o)lder, or (t)est? "
echo "If you are <=Ubuntu 18.04 or equivalent, choose 5.
echo "If you cannot boot with the normal Qt6, try the (o)lder build on Python ^<=3.10 or (m)iddle on Python ^>=3.11."
echo "Do you want Qt(5), Qt(6), Qt6 (o)lder, Qt6 (m)iddle or (t)est? "
read -r qt
if [ "$qt" = "5" ]; then
:
@ -42,6 +43,8 @@ elif [ "$install_type" = "a" ]; then
:
elif [ "$qt" = "o" ]; then
:
elif [ "$qt" = "m" ]; then
:
elif [ "$qt" = "t" ]; then
:
else
@ -52,12 +55,14 @@ elif [ "$install_type" = "a" ]; then
echo
echo "mpv is the main way to play audio and video. We need to tell hydrus how to talk to your existing mpv install."
echo "Try the n first. If it doesn't work, fall back to o."
echo "Do you want (o)ld mpv or (n)ew mpv? "
echo "Do you want (o)ld mpv, (n)ew mpv, or (t)est mpv? "
read -r mpv
if [ "$mpv" = "o" ]; then
:
elif [ "$mpv" = "n" ]; then
:
elif [ "$mpv" = "t" ]; then
:
else
echo "Sorry, did not understand that input!"
popd || exit 1
@ -110,6 +115,8 @@ elif [ "$install_type" = "a" ]; then
python -m pip install -r static/requirements/advanced/requirements_qt6.txt
elif [ "$qt" = "o" ]; then
python -m pip install -r static/requirements/advanced/requirements_qt6_older.txt
elif [ "$qt" = "m" ]; then
python -m pip install -r static/requirements/advanced/requirements_qt6_middle.txt
elif [ "$qt" = "t" ]; then
python -m pip install -r static/requirements/advanced/requirements_qt6_test.txt
fi
@ -118,6 +125,8 @@ elif [ "$install_type" = "a" ]; then
python -m pip install -r static/requirements/advanced/requirements_mpv_old.txt
elif [ "$mpv" = "n" ]; then
python -m pip install -r static/requirements/advanced/requirements_mpv_new.txt
elif [ "$mpv" = "t" ]; then
python -m pip install -r static/requirements/advanced/requirements_mpv_test.txt
fi
if [ "$opencv" = "o" ]; then

1
static/requirements/advanced/requirements_mpv_test.txt Normal file
View File

@ -0,0 +1 @@
python-mpv==1.0.4

2
static/requirements/advanced/requirements_qt6_middle.txt Normal file
View File

@ -0,0 +1,2 @@
QtPy==2.3.1
PySide6==6.4.1