@@ -0,0 +1,119 @@
1+diff --git a/esphomeyaml/__main__.py b/esphomeyaml/__main__.py
2+index 26f42c1..529d2e0 100644
3+--- a/esphomeyaml/__main__.py
4++++ b/esphomeyaml/__main__.py
5+@@ -167,13 +167,10 @@ def compile_program(args, config):
6+
7+
8+ def upload_using_esptool(config, port):
9+- import esptool
10+-
11+ path = os.path.join(CORE.build_path, '.pioenvs', CORE.name, 'firmware.bin')
12+- cmd = ['esptool.py', '--before', 'default_reset', '--after', 'hard_reset',
13++ cmd = ['@esptool@/bin/esptool.py', '--before', 'default_reset', '--after', 'hard_reset',
14+ '--chip', 'esp8266', '--port', port, 'write_flash', '0x0', path]
15+- # pylint: disable=protected-access
16+- return run_external_command(esptool._main, *cmd)
17++ return run_external_command(*cmd)
18+
19+
20+ def upload_program(config, args, host):
21+diff --git a/esphomeyaml/platformio_api.py b/esphomeyaml/platformio_api.py
22+index df29491..f991701 100644
23+--- a/esphomeyaml/platformio_api.py
24++++ b/esphomeyaml/platformio_api.py
25+@@ -13,12 +13,9 @@ _LOGGER = logging.getLogger(__name__)
26+
27+
28+ def run_platformio_cli(*args, **kwargs):
29+- import platformio.__main__
30+-
31+ os.environ["PLATFORMIO_FORCE_COLOR"] = "true"
32+- cmd = ['platformio'] + list(args)
33+- return run_external_command(platformio.__main__.main,
34+- *cmd, **kwargs)
35++ cmd = ['@platformio@/bin/platformio'] + list(args)
36++ return run_external_command(*cmd, **kwargs)
37+
38+
39+ def run_platformio_cli_run(config, verbose, *args, **kwargs):
40+diff --git a/esphomeyaml/util.py b/esphomeyaml/util.py
41+index eebb4b7..9e9e58f 100644
42+--- a/esphomeyaml/util.py
43++++ b/esphomeyaml/util.py
44+@@ -4,6 +4,7 @@ import io
45+ import logging
46+ import re
47+ import sys
48++import subprocess
49+
50+ _LOGGER = logging.getLogger(__name__)
51+
52+@@ -79,42 +80,25 @@ class RedirectText(object):
53+ return True
54+
55+
56+-def run_external_command(func, *cmd, **kwargs):
57+- def mock_exit(return_code):
58+- raise SystemExit(return_code)
59+-
60+- orig_argv = sys.argv
61+- orig_exit = sys.exit # mock sys.exit
62++def run_external_command(*cmd, **kwargs):
63+ full_cmd = u' '.join(shlex_quote(x) for x in cmd)
64+ _LOGGER.info(u"Running: %s", full_cmd)
65+
66+- orig_stdout = sys.stdout
67+- sys.stdout = RedirectText(sys.stdout)
68+- orig_stderr = sys.stderr
69+- sys.stderr = RedirectText(sys.stderr)
70+-
71+ capture_stdout = kwargs.get('capture_stdout', False)
72+ if capture_stdout:
73+- cap_stdout = sys.stdout = io.BytesIO()
74++ cap_stdout = io.BytesIO()
75++ else:
76++ cap_stdout = sys.stdout
77+
78+ try:
79+- sys.argv = list(cmd)
80+- sys.exit = mock_exit
81+- return func() or 0
82+- except KeyboardInterrupt:
83+- return 1
84+- except SystemExit as err:
85+- return err.args[0]
86++ completed_process = subprocess.run(cmd,
87++ stdout=RedirectText(cap_stdout),
88++ stderr=RedirectText(sys.stderr))
89++ return completed_process.returncode
90+ except Exception as err: # pylint: disable=broad-except
91+ _LOGGER.error(u"Running command failed: %s", err)
92+ _LOGGER.error(u"Please try running %s locally.", full_cmd)
93+ finally:
94+- sys.argv = orig_argv
95+- sys.exit = orig_exit
96+-
97+- sys.stdout = orig_stdout
98+- sys.stderr = orig_stderr
99+-
100+ if capture_stdout:
101+ # pylint: disable=lost-exception
102+ return cap_stdout.getvalue()
103+diff --git a/setup.py b/setup.py
104+index 78a5378..8ce80de 100755
105+--- a/setup.py
106++++ b/setup.py
107+@@ -23,12 +23,10 @@ DOWNLOAD_URL = '{}/archive/{}.zip'.format(GITHUB_URL, const.__version__)
108+
109+ REQUIRES = [
110+ 'voluptuous>=0.11.1',
111+- 'platformio>=3.5.3',
112+ 'pyyaml>=3.12',
113+ 'paho-mqtt>=1.3.1',
114+ 'colorlog>=3.1.2',
115+ 'tornado>=5.0.0',
116+- 'esptool>=2.3.1',
117+ 'typing>=3.0.0',
118+ 'protobuf>=3.4',
119+ 'tzlocal>=1.4',