Merge branch 'master' of github.com:pebble/pebble-tool

Author: Katharine

pebble_tool/commands/sdk/project/debug.py

@@ -8,7 +8,7 @@
 import subprocess
 
 from pebble_tool.commands.base import PebbleCommand
-from pebble_tool.sdk import sdk_manager
+from pebble_tool.sdk import sdk_manager, add_tools_to_path
 from pebble_tool.sdk.emulator import ManagedEmulatorTransport
 from pebble_tool.exceptions import ToolError
 
@@ -56,6 +56,7 @@ def __call__(self, args):
         # We poke around in the ManagedEmulatorTransport, so it's important that we actually have one.
         # Just asserting is okay because this should already be enforced by valid_connections.
         assert isinstance(self.pebble.transport, ManagedEmulatorTransport)
+        add_tools_to_path()
 
         platform = self.pebble.transport.platform
         sdk_version = self.pebble.transport.version

pebble_tool/version.py

@@ -1,5 +1,5 @@
 version_base = (4, 2, 0)
-version_suffix = 'rc2'
+version_suffix = None
 
 if version_suffix is None:
     __version_info__ = version_base