Upgrade pyinstaller to 3.0

Signed-off-by: Daniel Nephin <[email protected]>
tokyodrift1993 · Oct 23, 2015 · 0340361 · 0340361
1 parent e6f3946
commit 0340361
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/requirements-build.txt b/requirements-build.txt
@@ -1 +1 @@
-git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
+pyinstaller==3.0
diff --git a/script/build-windows.ps1 b/script/build-windows.ps1
@@ -42,20 +42,16 @@ Get-ChildItem -Recurse -Include *.pyc | foreach ($_) { Remove-Item $_.FullName }
 virtualenv .\venv
 
 # Install dependencies
-# TODO: pip warns when installing from a git sha, so we need to set ErrorAction to
-# 'Continue'.  See
-# https://github.com/pypa/pip/blob/fbc4b7ae5fee00f95bce9ba4b887b22681327bb1/pip/vcs/git.py#L77
-# This can be removed once pyinstaller 3.x is released and we upgrade 
-$ErrorActionPreference = "Continue"
 .\venv\Scripts\pip install pypiwin32==219
 .\venv\Scripts\pip install -r requirements.txt
 .\venv\Scripts\pip install --no-deps .
 .\venv\Scripts\pip install --allow-external pyinstaller -r requirements-build.txt
 
 # Build binary
 # pyinstaller has lots of warnings, so we need to run with ErrorAction = Continue
+$ErrorActionPreference = "Continue"
 .\venv\Scripts\pyinstaller .\docker-compose.spec
 $ErrorActionPreference = "Stop"
 
-Move-Item -Force .\dist\docker-compose .\dist\docker-compose-Windows-x86_64.exe
+Move-Item -Force .\dist\docker-compose.exe .\dist\docker-compose-Windows-x86_64.exe
 .\dist\docker-compose-Windows-x86_64.exe --version