Skip to content

Commit

Permalink
dependency checker moved to tools, launchers updated
Browse files Browse the repository at this point in the history
Small tweak in the Windows launcher: that ELSE clause was absolutely useless.
  • Loading branch information
Noiredd committed Mar 2, 2019
1 parent 0340c0b commit cd9f648
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 8 deletions.
7 changes: 1 addition & 6 deletions Filmatyk.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ REM Iterate over versions
SET pyexe=%%p
GOTO exit_loop
)
) ELSE (
REM Executable not found - might need to set status too
IF 3 LSS %python_status% (
SET python_status=3
)
)
))
:exit_loop
Expand All @@ -57,7 +52,7 @@ IF %python_status% NEQ 0 (
)

REM Check dependencies
%pyexe% filmatyk\dependency_test.py
%pyexe% tools\deptest.py
REM If it left a list of packages to install - pass it to pip
IF EXIST install.txt (
REM Tester can leave a list of missing packages. In this case - install them,
Expand Down
2 changes: 1 addition & 1 deletion Filmatyk_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ else
fi

# Check dependencies
$pycmd filmatyk/dependency_test.py
$pycmd tools/deptest.py
if [ -f install.txt ]; then
$pycmd -m pip install -r install.txt
rm install.txt
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion tools/pytest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import sys
#print(sys.argv)
if sys.version_info.major != 3:
sys.exit(2)
if sys.version_info.minor < 6:
Expand Down

0 comments on commit cd9f648

Please sign in to comment.