diff --git a/scripts/build-requirements.txt b/scripts/build-requirements.txt new file mode 100644 index 0000000000..45ad33c4d4 --- /dev/null +++ b/scripts/build-requirements.txt @@ -0,0 +1,2 @@ +PyInstaller==3.5 +psutil diff --git a/scripts/build_posix.sh b/scripts/build_posix.sh index cfe1bf611f..c5e9bb89f2 100755 --- a/scripts/build_posix.sh +++ b/scripts/build_posix.sh @@ -95,10 +95,8 @@ install_dependencies() pip install --upgrade pip print_info "Installing requirements..." - pip install .[all] psutil - - print_info "Installing pyinstaller..." - pip install pyinstaller + pip install .[all] + pip install -r scripts/build-requirements.txt } build_dvc() diff --git a/scripts/build_windows.cmd b/scripts/build_windows.cmd index 90c513c83c..feca849b4d 100755 --- a/scripts/build_windows.cmd +++ b/scripts/build_windows.cmd @@ -23,9 +23,8 @@ if %errorlevel% neq 0 (echo Error: Couldn't find Inno Setup compiler. && goto :e echo ====== Installing requirements... ====== echo PKG = "exe" > dvc\utils\build.py call pip install .[all] || goto :error -call pip install psutil || goto :error +call pip install -r scripts\build-requirements.txt || goto :error call dvc pull || goto :error -call pip install pyinstaller || goto :error echo ====== Building dvc binary... ====== call pyinstaller --additional-hooks-dir scripts\hooks dvc/__main__.py --name dvc --specpath build diff --git a/setup.py b/setup.py index 9c86e09035..035253aaaf 100644 --- a/setup.py +++ b/setup.py @@ -99,7 +99,6 @@ def run(self): # Extra dependecies to run tests tests_requirements = [ - "PyInstaller==3.5", "wheel>=0.31.1", "pydot>=1.2.4", # Test requirements: