Use PyInstaller pip install instead of git submodule.

.travis.yml

@@ -9,7 +9,7 @@ before_install:
 
   # Install python
   - brew update
-  - brew install python2
+  - brew install python
   - brew link --overwrite python
   - pip install --upgrade pip
   - PATH=/usr/local/bin:$PATH
@@ -21,6 +21,8 @@ before_install:
 
   - pip install mock
   - pip install mkdocs
+  - pip install pyinstaller
+  - pyinstaller --version
 
   # Install node.js
   - brew unlink node

circle.yml

@@ -33,6 +33,8 @@ dependencies:
     - sudo apt-get install -y python-tk
     - sudo pip install mock
     - sudo pip install mkdocs
+    - sudo pip install pyinstaller
+    - pyinstaller --version
 
     # Install node.js
     #- curl -sL https://deb.nodesource.com/setup_0.12 | sudo bash -

package/build_pyinstaller.py

@@ -34,7 +34,6 @@ import sys
 import shutil
 import platform
 import subprocess
-from glob import glob
 
 
 spec_coll_name = "server"
@@ -53,7 +52,7 @@ project_root_dir = \
 
 
 def remove_directory(dir_to_remove):
-    """ Removes the a given directory. """
+    """ :param dir_to_remove: Directory to remove. """
     if os.path.exists(dir_to_remove):
         print(script_tab + "Removing directory %s" % dir_to_remove)
         shutil.rmtree(dir_to_remove)
@@ -109,10 +108,8 @@ def pyinstaller_build():
     package folder. Captures the output streams and checks for errors.
     :return: Boolean indicating the success state of the operation.
     """
-    process_args = [
-        "python",
-        "%s" % os.path.join("package", "pyinstaller", "pyinstaller.py"),
-        "%s" % os.path.join("package", "pyinstaller.spec")]
+    process_args = ["pyinstaller",
+                    "%s" % os.path.join("package", "pyinstaller.spec")]
     print(script_tab + "Command: %s" % process_args)
 
     pyinstaller_process = subprocess.Popen(process_args)
@@ -169,8 +166,7 @@ def create_shell_file(os_type):
                      'DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )\n' \
                      'echo "[Shell Launch Script] Executing from: $DIR"\n' \
                      './%s' % os.path.join(exec_folder_name, "ardublockly")
-        shell_location = os.path.join(
-            project_root_dir, "ardublockly_run.sh")
+        shell_location = os.path.join(project_root_dir, "ardublockly_run.sh")
     else:
         # No other OS expected, so just return. This should never happen
         return

package/pyinstaller.spec

@@ -6,7 +6,7 @@
 
 block_cipher = None
 
-a = Analysis(['start.py'],
+a = Analysis(['../start.py'],
              pathex=None,
              hiddenimports=["ardublocklyserver"],
              hookspath=None,