Add support for MakerDiary nRF52840-MDK

MANIFEST.in

@@ -1,2 +1,7 @@
+global-exclude *.py[cod] __pycache__ *.so
+graft test
 include README.md
+include LICENSE
+include CONTRIBUTING.md
+include requirements.txt
 include test_requirements.txt

azure-pipelines.yml

@@ -79,6 +79,10 @@ jobs:
             -
                 script: "python -m pip install --upgrade pip && pip install -r test_requirements.txt"
                 displayName: "Install mbed-os test dependencies"
+            -
+                script: "pip install lxml"
+                env: { STATIC_DEPS: true }
+                displayName: "Install lxml separately on Linux/MacOS"
             -
                 script: 'pip install --user "urllib3<1.25"'
                 displayName: "Fix dependency issue for requests package"

packages/mbed-greentea/MANIFEST.in

@@ -1,2 +1,8 @@
-include README.md LICENSE CONTRIBUTING.md
+global-exclude *.py[cod] __pycache__ *.so
+graft test
+include README.md
+include LICENSE
+include CONTRIBUTING.md
+include requirements.txt
+include test_requirements.txt
 include .coveragerc

packages/mbed-greentea/mbed_greentea/mbed_greentea_cli.py

@@ -569,7 +569,7 @@ def run_test_thread(test_result_queue, test_queue, opts, mut, build, build_path,
             # In some cases we want to print console to see why test failed
             # even if we are not in verbose mode
             gt_logger.gt_log_tab("test failed, reporting console output (specified with --report-fails option)")
-            print
+            print()
             print(single_test_output)
 
     #greentea_release_target_id(mut['target_id'], gt_instance_uuid)

packages/mbed-greentea/requirements.txt

@@ -0,0 +1,2 @@
+mbed-os-tools>=0.0.9,<0.1.0
+mbed-host-tests>=1.5.0,<2

packages/mbed-greentea/setup.py

@@ -27,23 +27,33 @@
 from distutils.core import setup
 from setuptools import find_packages
 
-
 DESCRIPTION = "mbed 3.0 onwards test suite, codename Greentea. The test suite is a collection of tools that enable automated testing on mbed-enabled platforms"
 OWNER_NAMES = 'Anna Bridge, Qinghao Shi'
 OWNER_EMAILS = '[email protected], [email protected]'
 
+repository_dir = os.path.dirname(__file__)
+
 
 def read(fname):
     """
     Utility function to cat in a file (used for the README)
-    @param fname: the name of the file to read, relative to the directory containing this file
+    @param fname: the name of the file to read,
+    relative to the directory containing this file
     @return: The string content of the opened file
     """
-    return open(os.path.join(os.path.dirname(__file__), fname), encoding="utf-8").read()
+    with open(os.path.join(repository_dir, fname), mode='r') as f:
+        return f.read()
+
+
+with open(os.path.join(repository_dir, 'requirements.txt')) as fh:
+    requirements = fh.readlines()
 
+with open(os.path.join(repository_dir, 'test_requirements.txt')) as fh:
+    test_requirements = fh.readlines()
 
+python_requires = '>=2.7.10, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4'
 setup(name='mbed-greentea',
-      version='1.7.3',
+      version='1.7.4',
       description=DESCRIPTION,
       long_description=read('README.md'),
       long_description_content_type='text/markdown',
@@ -56,13 +66,24 @@ def read(fname):
       license="Apache-2.0",
       test_suite='test',
       entry_points={
-          "console_scripts": ["mbedgt=mbed_greentea.mbed_greentea_cli:main",],
+          "console_scripts": ["mbedgt=mbed_greentea.mbed_greentea_cli:main", ],
       },
-      install_requires=[
-          "mbed-os-tools>=0.0.9,<0.1.0",
-          "mbed-host-tests>=1.5.0,<2"
-      ],
-      tests_require=[
-          "mock>=2"
-      ]
-)
+      classifiers=(
+          'Development Status :: 5 - Production/Stable',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: Apache Software License',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
+          'Programming Language :: Python',
+          'Topic :: Software Development :: Build Tools',
+          'Topic :: Software Development :: Embedded Systems',
+          'Topic :: Software Development :: Testing',
+      ),
+      python_requires=python_requires,
+      install_requires=requirements,
+      tests_require=test_requirements
+      )

packages/mbed-greentea/test_requirements.txt

@@ -1,2 +1,3 @@
+mock>=2
 coverage
 coveralls

packages/mbed-host-tests/MANIFEST.in

@@ -1,2 +1,7 @@
+global-exclude *.py[cod] __pycache__ *.so
+graft test
 include README.md
+include requirements.txt
+include test_requirements.txt
 include .coveragerc
+

packages/mbed-host-tests/requirements.txt

@@ -0,0 +1 @@
+mbed-os-tools>=0.0.9,<0.1.0

packages/mbed-host-tests/setup.py

@@ -31,18 +31,29 @@
 OWNER_NAMES = 'Qinghao Shi'
 OWNER_EMAILS = '[email protected]'
 
+repository_dir = os.path.dirname(__file__)
+
 
 def read(fname):
     """
     Utility function to cat in a file (used for the README)
-    @param fname: the name of the file to read, relative to the directory containing this file
+    @param fname: the name of the file to read,
+    relative to the directory containing this file
     @return: The string content of the opened file
     """
-    return open(os.path.join(os.path.dirname(__file__), fname), encoding="utf8").read()
+    with open(os.path.join(repository_dir, fname), mode='r') as f:
+        return f.read()
+
+
+with open(os.path.join(repository_dir, 'requirements.txt')) as fh:
+    requirements = fh.readlines()
 
+with open(os.path.join(repository_dir, 'test_requirements.txt')) as fh:
+    test_requirements = fh.readlines()
 
+python_requires = '>=2.7.10, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4'
 setup(name='mbed-host-tests',
-      version='1.5.9',
+      version='1.5.10',
       description=DESCRIPTION,
       long_description=read('README.md'),
       long_description_content_type='text/markdown',
@@ -55,14 +66,26 @@ def read(fname):
       license="Apache-2.0",
       test_suite='test',
       entry_points={
-        "console_scripts":
-            ["mbedhtrun=mbed_host_tests.mbedhtrun:main",
-             "mbedflsh=mbed_host_tests.mbedflsh:main"],
+          "console_scripts":
+              ["mbedhtrun=mbed_host_tests.mbedhtrun:main",
+               "mbedflsh=mbed_host_tests.mbedflsh:main"],
       },
-      install_requires=[
-        "mbed-os-tools>=0.0.9,<0.1.0"
-      ],
-      tests_require=[
-        "mock>=2"
-      ]
+      classifiers=(
+          'Development Status :: 5 - Production/Stable',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: Apache Software License',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
+          'Programming Language :: Python',
+          'Topic :: Software Development :: Build Tools',
+          'Topic :: Software Development :: Embedded Systems',
+          'Topic :: Software Development :: Testing',
+      ),
+      python_requires=python_requires,
+      install_requires=requirements,
+      tests_require=test_requirements
 )

packages/mbed-host-tests/test_requirements.txt

@@ -1,2 +1,3 @@
+mock>=2
 coverage
 coveralls

packages/mbed-ls/MANIFEST.in

@@ -1,2 +1,6 @@
-include README.md LICENSE CONTRIBUTING.md
+global-exclude *.py[cod] __pycache__ *.so
+graft test
+include README.md
+include requirements.txt
+include test_requirements.txt
 include .coveragerc

packages/mbed-ls/requirements.txt

@@ -0,0 +1,2 @@
+PrettyTable>=0.7.2
+mbed-os-tools>=0.0.9,<0.1.0

packages/mbed-ls/setup.py

@@ -28,18 +28,29 @@
 OWNER_NAMES = 'Graham Hammond, Mark Edgeworth'
 OWNER_EMAILS = '[email protected], [email protected]'
 
+repository_dir = os.path.dirname(__file__)
+
 
 def read(fname):
     """
     Utility function to cat in a file (used for the README)
-    @param fname: the name of the file to read, relative to the directory containing this file
+    @param fname: the name of the file to read,
+    relative to the directory containing this file
     @return: The string content of the opened file
     """
-    return open(os.path.join(os.path.dirname(__file__), fname), encoding="utf8").read()
+    with open(os.path.join(repository_dir, fname), mode='r') as f:
+        return f.read()
+
+
+with open(os.path.join(repository_dir, 'requirements.txt')) as fh:
+    requirements = fh.readlines()
 
+with open(os.path.join(repository_dir, 'test_requirements.txt')) as fh:
+    test_requirements = fh.readlines()
 
+python_requires = '>=2.7.10, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4'
 setup(name='mbed-ls',
-      version='1.7.9',
+      version='1.7.10',
       description=DESCRIPTION,
       long_description=read('README.md'),
       long_description_content_type='text/markdown',
@@ -51,19 +62,28 @@ def read(fname):
       packages=find_packages(),
       license="Apache-2.0",
       test_suite='test',
+      classifiers=(
+          'Development Status :: 5 - Production/Stable',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: Apache Software License',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
+          'Programming Language :: Python',
+          'Topic :: Software Development :: Build Tools',
+          'Topic :: Software Development :: Embedded Systems',
+      ),
+      python_requires=python_requires,
       entry_points={
-        "console_scripts": [
-            "mbedls=mbed_lstools:mbedls_main",
-        ],
+          "console_scripts": [
+              "mbedls=mbed_lstools:mbedls_main",
+          ],
       },
-      install_requires=[
-          "PrettyTable>=0.7.2",
-          "mbed-os-tools>=0.0.9,<0.1.0"
-      ],
-      tests_require=[
-          "mock>=2",
-          "pytest>=3"
-      ],
+      install_requires=requirements,
+      tests_require=test_requirements,
       extras_require={
           "colorized_logs": ["colorlog"]
       }

packages/mbed-ls/test_requirements.txt

@@ -1,2 +1,4 @@
+mock>=2
+pytest>=3
 coverage
 coveralls

requirements.txt

@@ -0,0 +1,14 @@
+PySerial>=3.0,<4.0
+requests>=2.0,<3.0
+intelhex>=2.0,<3.0
+future
+PrettyTable>=0.7.2
+fasteners
+appdirs>=1.4,<2.0
+junit-xml>=1.0,<2.0
+lockfile
+six>=1.0,<2.0
+colorama>=0.3,<0.5
+# When using beautiful soup, the XML parser needs to be installed independently. It is only needed on macOs though.
+beautifulsoup4
+lxml; sys_platform == 'darwin'

setup.py

@@ -21,13 +21,27 @@
 OWNER_NAMES = "Jimmy Brisson, Brian Daniels"
 OWNER_EMAILS = "[email protected], [email protected]"
 
+repository_dir = os.path.dirname(__file__)
+
 
-# Utility function to cat in a file (used for the README)
 def read(fname):
-    with open(os.path.join(os.path.dirname(__file__), fname), 'r') as f:
+    """
+    Utility function to cat in a file (used for the README)
+    @param fname: the name of the file to read,
+    relative to the directory containing this file
+    @return: The string content of the opened file
+    """
+    with open(os.path.join(repository_dir, fname), mode='r') as f:
         return f.read()
 
 
+with open(os.path.join(repository_dir, 'requirements.txt')) as fh:
+    requirements = fh.readlines()
+
+with open(os.path.join(repository_dir, 'test_requirements.txt')) as fh:
+    test_requirements = fh.readlines()
+
+python_requires = '>=2.7.10, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4'
 setup(
     name="mbed-os-tools",
     version=read("src/mbed_os_tools/VERSION.txt").strip(),
@@ -44,20 +58,23 @@ def read(fname):
     package_data={"": ["VERSION.txt"]},
     license="Apache-2.0",
     test_suite="test",
-    install_requires=[
-        "PySerial>=3.0,<4.0",
-        "requests>=2.0,<3.0",
-        "intelhex>=2.0,<3.0",
-        "future",
-        "PrettyTable>=0.7.2",
-        "fasteners",
-        "appdirs>=1.4,<2.0",
-        "junit-xml>=1.0,<2.0",
-        "lockfile",
-        "six>=1.0,<2.0",
-        "colorama>=0.3,<0.5",
-    ],
-    tests_require=read("test_requirements.txt").splitlines(),
+    classifiers=(
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python',
+        'Topic :: Software Development :: Build Tools',
+        'Topic :: Software Development :: Embedded Systems',
+    ),
+    python_requires=python_requires,
+    install_requires=requirements,
+    tests_require=test_requirements,
     extras_require={
         "pyocd": ["pyocd==0.14.0"]
     },

src/mbed_os_tools/VERSION.txt

@@ -1 +1 @@
-0.0.10
+0.0.12