Fix release process by fixing setuptools to 19.2

Makefile

@@ -26,8 +26,11 @@ env:
 	virtualenv $(ENV) --always-copy
 .PHONY: env
 
+# Note: Downgrades setuptools to 19.2 so PyInstaller 3.1 does not fail.
+# Note: PyInstaller 3.2 fails silently. No apparent reason.
 install:
 	. $(ENV)/bin/activate && pip install -r requirements.txt
+	. $(ENV)/bin/activate && pip install setuptools==19.2
 .PHONY: install
 
 activate:
@@ -91,7 +94,7 @@ release-delete:
 .PHONY: release-delete
 
 bundle-mastermind:
-	$(ENV_BIN)/pyinstaller mastermind.spec
+	$(ENV_BIN)pyinstaller mastermind.spec
 .PHONY: bundle-mastermind
 
 bundle-proxyswitch:

mastermind.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
+from __future__ import (absolute_import, print_function, division)
+
 from mastermind import main
 
-if __name__ == '__main__':
-    main()
+main.main()

mastermind.spec

@@ -1,24 +1,18 @@
 # -*- mode: python -*-
-
 from PyInstaller.utils.hooks import collect_data_files
 
-block_cipher = None
 
 a = Analysis(['mastermind.py'],
              pathex=['.'],
              binaries=None,
              datas=collect_data_files("mitmproxy.onboarding") +
                    [('./mastermind/scripts/*.py', 'scripts')],
              hiddenimports=['mastermind.handlers', 'mastermind.driver'],
-             hookspath=[],
-             runtime_hooks=[],
-             excludes=[],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher)
+             hookspath=None,
+             runtime_hooks=None,
+             excludes=None)
 
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data)
 exe = EXE(pyz,
           a.scripts,
           a.binaries,
@@ -28,4 +22,4 @@ exe = EXE(pyz,
           debug=False,
           strip=False,
           upx=True,
-          console=True )
+          console=True)

mastermind/__init__.py

@@ -1,38 +1 @@
-from __future__ import (absolute_import, print_function, division)
-from itertools import repeat
-from mitmproxy.main import mitmdump
-import os
 
-from . import (cli, proxyswitch, say)
-
-def main():
-    parser = cli.args()
-    args, extra_args = parser.parse_known_args()
-
-    try:
-        config = cli.config(args)
-    except IOError as err:
-        parser.error(err)
-    except toml.core.TomlError as err:
-        parser.error("Errors found in the config file:\n\n", err)
-
-    mitm_args = cli.mitm_args(config)
-    is_sudo = os.getuid() == 0
-
-    if type(mitm_args) == Exception:
-        parser.error(mitm_args.message)
-
-    say.level(config["core"]["verbose"])
-
-    try:
-        if config["os"]["proxy-settings"]:
-            if not is_sudo:
-                parser.error("proxy-settings is enabled, please provide sudo in order to change the OSX proxy configuration.")
-
-            proxyswitch.enable(config["core"]["host"],
-                               str(config["core"]["port"]))
-
-        mitmdump(mitm_args + extra_args)
-    finally:
-        if config["os"]["proxy-settings"] and is_sudo:
-            proxyswitch.disable()

mastermind/main.py

@@ -0,0 +1,38 @@
+from __future__ import (absolute_import, print_function, division)
+from itertools import repeat
+from mitmproxy.main import mitmdump
+import os
+
+from . import (cli, proxyswitch, say)
+
+def main():
+    parser = cli.args()
+    args, extra_args = parser.parse_known_args()
+
+    try:
+        config = cli.config(args)
+    except IOError as err:
+        parser.error(err)
+    except toml.core.TomlError as err:
+        parser.error("Errors found in the config file:\n\n", err)
+
+    mitm_args = cli.mitm_args(config)
+    is_sudo = os.getuid() == 0
+
+    if type(mitm_args) == Exception:
+        parser.error(mitm_args.message)
+
+    say.level(config["core"]["verbose"])
+
+    try:
+        if config["os"]["proxy-settings"]:
+            if not is_sudo:
+                parser.error("proxy-settings is enabled, please provide sudo in order to change the OSX proxy configuration.")
+
+            proxyswitch.enable(config["core"]["host"],
+                               str(config["core"]["port"]))
+
+        mitmdump(mitm_args + extra_args)
+    finally:
+        if config["os"]["proxy-settings"] and is_sudo:
+            proxyswitch.disable()