diff --git a/bin/COMPILE.cmd b/bin/COMPILE.cmd index d8e57f5..39b5653 100644 --- a/bin/COMPILE.cmd +++ b/bin/COMPILE.cmd @@ -17,13 +17,19 @@ SET PYTHONPATH=c:\GIT\npbackup "%PYTHON64%" -m pip install --upgrade pip || GOTO ERROR "%PYTHON64%" -m pip install pytest +"%PYTHON64%" -m pip install --upgrade -r npbackup/requirements.txt || GOTO ERROR + "%PYTHON64%" -m pytest C:\GIT\npbackup\tests || GOTO ERROR -"%PYTHON64%" -m pip install --upgrade -r npbackup/requirements.txt || GOTO ERROR "%PYTHON64%" bin\compile.py --sign "C:\ODJ\KEYS\NetInventEV.dat" %* +"%PYTHON32%" -m pip install --upgrade pip || GOTO ERROR +"%PYTHON32%" -m pip install pytest "%PYTHON32%" -m pip install --upgrade -r npbackup/requirements.txt || GOTO ERROR + +"%PYTHON32%" -m pytest C:\GIT\npbackup\tests || GOTO ERROR + "%PYTHON32%" bin\compile.py --sign "C:\ODJ\KEYS\NetInventEV.dat" %* GOTO END diff --git a/bin/COMPILE.sh b/bin/COMPILE.sh index 3d5587a..1f9e442 100755 --- a/bin/COMPILE.sh +++ b/bin/COMPILE.sh @@ -15,9 +15,10 @@ export PYTHONPATH=/opt/npbackup /opt/npbackup/venv/bin/python -m pip install --upgrade pip || exit 1 /opt/npbackup/venv/bin/python -m pip install pytest ||exit 1 +/opt/npbackup/venv/bin/python -m pip install --upgrade -r npbackup/requirements.txt || exit 1 + /opt/npbackup/venv/bin/python -m pytest /opt/npbackup/tests || exit 1 -/opt/npbackup/venv/bin/python -m pip install --upgrade -r npbackup/requirements.txt || exit 1 /opt/npbackup/venv/bin/python bin/compile.py $@ export PYTHONPATH="$OLD_PYTHONPATH" \ No newline at end of file