Merge pull request #56 from bridadan/optional_pyocd

Optional pyocd dependency

Author: theotherjimmy

setup.py

@@ -46,7 +46,6 @@ def read(fname):
     install_requires=[
         "PySerial>=3.0",
         "requests",
-        "pyocd==0.14.0",
         "intelhex",
         "future",
         "PrettyTable>=0.7.2",
@@ -58,5 +57,7 @@ def read(fname):
         "colorama>=0.3,<0.5",
     ],
     tests_require=["mock>=2", "pytest>=3"],
-    extras_require={"colorized_logs": ["colorlog"]},
+    extras_require={
+        "pyocd": ["pyocd==0.14.0"]
+    },
 )

src/mbed_os_tools/test/host_tests_plugins/module_copy_pyocd.py

@@ -15,9 +15,13 @@
 
 import os
 from .host_test_plugins import HostTestPluginBase
-from pyocd.core.helpers import ConnectHelper
-from pyocd.flash.loader import FileProgrammer
 
+try:
+    from pyocd.core.helpers import ConnectHelper
+    from pyocd.flash.loader import FileProgrammer
+    PYOCD_PRESENT = True
+except ImportError:
+    PYOCD_PRESENT = False
 
 class HostTestPluginCopyMethod_pyOCD(HostTestPluginBase):
     # Plugin interface
@@ -44,6 +48,13 @@ def execute(self, capability, *args, **kwargs):
         @param kwargs Additional arguments
         @return Capability call return value
         """
+        if not PYOCD_PRESENT:
+            self.print_plugin_error(
+                'The "pyocd" feature is not installed. Please run '
+                '"pip install mbed-os-tools[pyocd]" to enable the "pyocd" copy plugin.'
+            )
+            return False
+
         if not self.check_parameters(capability, *args, **kwargs):
             return False
 

src/mbed_os_tools/test/host_tests_plugins/module_reset_pyocd.py

@@ -14,7 +14,12 @@
 # limitations under the License.
 
 from .host_test_plugins import HostTestPluginBase
-from pyocd.core.helpers import ConnectHelper
+
+try:
+    from pyocd.core.helpers import ConnectHelper
+    PYOCD_PRESENT = True
+except ImportError:
+    PYOCD_PRESENT = False
 
 
 class HostTestPluginResetMethod_pyOCD(HostTestPluginBase):
@@ -48,6 +53,13 @@ def execute(self, capability, *args, **kwargs):
         @details Each capability e.g. may directly just call some command line program or execute building pythonic function
         @return Capability call return value
         """
+        if not PYOCD_PRESENT:
+            self.print_plugin_error(
+                'The "pyocd" feature is not installed. Please run '
+                '"pip install mbed-os-tools[pyocd]" to enable the "pyocd" reset plugin.'
+            )
+            return False
+
         if not kwargs['target_id']:
             self.print_plugin_error("Error: target_id not set")
             return False