Merge branch 'master' into fix_pyocd_copy_plugin

Author: theotherjimmy

.circleci/config.yml

@@ -54,14 +54,6 @@ commands:
             - run:
                 name: Enforce styling
                 command: python -m flake8
-    combine_and_send_coverage:
-        steps:
-            - run:
-                name: Combine all coverage results
-                command: python -m coverage combine .coverage packages/*/.coverage
-            - run:
-                name: Send coverage results to coveralls
-                command: python -m coveralls
 jobs:
     test_python27:
         docker:
@@ -83,7 +75,6 @@ jobs:
             - image: python:3.7-stretch
         steps:
             - setup_and_run_tests
-            - combine_and_send_coverage
 
     style_enforcement:
         docker:

azure-pipelines.yml

@@ -0,0 +1,121 @@
+jobs:
+    -
+        job: Test
+        strategy:
+            matrix:
+                LinuxPython27:
+                    python.version: '2.7'
+                    imageName: ubuntu-16.04
+                    extraActions: 'false'
+                LinuxPython35:
+                    python.version: '3.5'
+                    imageName: ubuntu-16.04
+                    extraActions: 'false'
+                LinuxPython36:
+                    python.version: '3.6'
+                    imageName: ubuntu-16.04
+                    extraActions: 'false'
+                LinuxPython37:
+                    python.version: '3.7'
+                    imageName: ubuntu-16.04
+                    extraActions: 'true'
+                MacPython27:
+                    python.version: '2.7'
+                    imageName: macos-10.13
+                    extraActions: 'false'
+                MacPython35:
+                    python.version: '3.5'
+                    imageName: macos-10.13
+                    extraActions: 'false'
+                MacPython36:
+                    python.version: '3.6'
+                    imageName: macos-10.13
+                    extraActions: 'false'
+                MacPython37:
+                    python.version: '3.7'
+                    imageName: macos-10.13
+                    extraActions: 'false'
+                WindowsPython27:
+                    python.version: '2.7'
+                    imageName: vs2017-win2016
+                    extraActions: 'false'
+                WindowsPython35:
+                    python.version: '3.5'
+                    imageName: vs2017-win2016
+                    extraActions: 'false'
+                WindowsPython36:
+                    python.version: '3.6'
+                    imageName: vs2017-win2016
+                    extraActions: 'false'
+                WindowsPython37:
+                    python.version: '3.7'
+                    imageName: vs2017-win2016
+                    extraActions: 'false'
+            maxParallel: 10
+        pool:
+            vmImage: $(imageName)
+        steps:
+            -
+                task: UsePythonVersion@0
+                inputs:
+                    versionSpec: $(python.version)
+                    architecture: x64
+            -
+                script: 'python -m pip install --upgrade pip && pip install -r test_requirements.txt && pip install pytest'
+                displayName: 'Install mbed-os test dependencies'
+            -
+                script: |
+                    pip install --user flake8
+                    python -m flake8
+                condition: eq(variables['extraActions'], 'true')
+                displayName: 'Enforce code style'
+            -
+                script: "python -m coverage run setup.py test"
+                displayName: "Test mbed-os-tools"
+            -
+                script: "pip install ."
+                displayName: "Install mbed-os-tools"
+            -
+                script: 'pip install . && pip install -r test_requirements.txt'
+                displayName: 'Install mbed-ls'
+                workingDirectory: 'packages/mbed-ls'
+            -
+                script: 'pip install . && pip install -r test_requirements.txt'
+                displayName: 'Install mbed-host-tests'
+                workingDirectory: 'packages/mbed-host-tests'
+            -
+                script: 'pip install . && pip install -r test_requirements.txt'
+                displayName: 'Install mbed-greentea'
+                workingDirectory: 'packages/mbed-greentea'
+            -
+                script: "python -m coverage run setup.py test"
+                displayName: "Test mbed-ls"
+                workingDirectory: 'packages/mbed-ls'
+            -
+                script: "python -m coverage run setup.py test"
+                displayName: "Test mbed-host-tests"
+                workingDirectory: 'packages/mbed-host-tests'
+            -
+                script: "python -m coverage run setup.py test"
+                displayName: "Test mbed-greentea"
+                workingDirectory: 'packages/mbed-greentea'
+            -
+                script: |
+                    python -m coverage combine .coverage packages/*/.coverage
+                    python -m coveralls
+                condition: eq(variables['extraActions'], 'true')
+                displayName: 'Send coverage results to coveralls'
+    -
+        job: Build
+        dependsOn: Test
+        pool:
+            vmImage: Ubuntu-16.04
+        steps:
+            -
+                task: UsePythonVersion@0
+                inputs:
+                    versionSpec: 3.x
+                    architecture: x64
+            -
+                script: 'python setup.py sdist'
+                displayName: 'Build sdist'

packages/mbed-greentea/test/mbed_gt_cli.py

@@ -74,9 +74,10 @@ def test_get_greentea_version(self):
     def test_print_version(self):
         version = mbed_greentea_cli.get_greentea_version()
 
+        old_stdout = sys.stdout
         sys.stdout = stdout_capture = six.StringIO()
         mbed_greentea_cli.print_version()
-        sys.stdout = sys.__stdout__
+        sys.stdout = old_stdout
 
         printed_version = stdout_capture.getvalue().splitlines()[0]
         self.assertEqual(printed_version, version)

packages/mbed-greentea/test/mbed_gt_cmake_handlers.py

@@ -100,9 +100,10 @@ def test_list_binaries_for_targets(self):
         full_path = os.path.join(root_path, "resources")
 
         def run_and_capture(path, verbose=False):
+            old_stdout = sys.stdout
             sys.stdout = stdout_capture = six.StringIO()
             cmake_handlers.list_binaries_for_targets(build_dir=path, verbose_footer=verbose)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
             return stdout_capture.getvalue()
 
@@ -128,9 +129,10 @@ def test_list_binaries_for_builds(self):
 
         for verbose in [True, False]:
             # Capture logging output
+            old_stdout = sys.stdout
             sys.stdout = stdout_capture = six.StringIO()
             cmake_handlers.list_binaries_for_builds(spec, verbose_footer=verbose)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
             output = stdout_capture.getvalue()
             self.assertTrue("available tests for build 'K64F-ARM'" in output)

packages/mbed-greentea/test/mbed_gt_report_api.py

@@ -105,9 +105,10 @@ def test_export_to_file(self):
         payload  = "PAYLOAD"
         filepath = "."
 
+        old_stdout = sys.stdout
         sys.stdout = stdout_capture = six.StringIO()
         result = mbed_report_api.export_to_file(filepath, payload)
-        sys.stdout = sys.__stdout__
+        sys.stdout = old_stdout
 
         command_output = stdout_capture.getvalue().splitlines()[0]
         self.assertIn("file failed:", command_output)

src/mbed_os_tools/detect/platform_database.py

@@ -236,6 +236,8 @@
         u"2035": u"EFM32PG_STK3401",
         u"2040": u"EFM32PG12_STK3402",
         u"2041": u"TB_SENSE_12",
+        u"2042": u"EFM32GG11_STK3701",
+        u"2043": u"EFM32TG11_STK3301",
         u"2045": u"TB_SENSE_1",
         u"2100": u"XBED_LPC1768",
         u"2201": u"WIZWIKI_W7500",
@@ -285,6 +287,7 @@
         u"8003": u"UNO_81AM",
         u"8004": u"UNO_81A",
         u"8012": u"TT_M3HQ",
+        u"8013": u"TT_M4G9",
         u"8080": u"FF1705_L151CC",
         u"8081": u"FF_LPC546XX",
         u"9001": u"LPC1347",

test/test/mbed_gt_cmake_handlers.py

@@ -98,9 +98,10 @@ def test_list_binaries_for_targets(self):
         full_path = os.path.join(root_path, "resources")
 
         def run_and_capture(path, verbose=False):
+            old_stdout = sys.stdout
             sys.stdout = stdout_capture = six.StringIO()
             cmake_handlers.list_binaries_for_targets(build_dir=path, verbose_footer=verbose)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
             return stdout_capture.getvalue()
 
@@ -126,9 +127,10 @@ def test_list_binaries_for_builds(self):
 
         for verbose in [True, False]:
             # Capture logging output
+            old_stdout = sys.stdout
             sys.stdout = stdout_capture = six.StringIO()
             cmake_handlers.list_binaries_for_builds(spec, verbose_footer=verbose)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
             output = stdout_capture.getvalue()
             self.assertTrue("available tests for build 'K64F-ARM'" in output)

test/test/mbed_gt_report_api.py

@@ -106,9 +106,10 @@ def test_export_to_file(self):
         payload  = "PAYLOAD"
         filepath = "."
 
+        old_stdout = sys.stdout
         sys.stdout = stdout_capture = six.StringIO()
         result = mbed_report_api.export_to_file(filepath, payload)
-        sys.stdout = sys.__stdout__
+        sys.stdout = old_stdout
 
         command_output = stdout_capture.getvalue().splitlines()[0]
         self.assertIn("file failed:", command_output)