From 9b89fc3b90eaadee1081d6dc1ba1cf231a224d58 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Thu, 28 Jul 2016 09:17:06 +0100 Subject: [PATCH 1/2] Requirements - fix progen def name - use dashes Fixes #2275. Reference: http://pybuilder.github.io/documentation/external_plugins.html#.V5m-hfmANBc --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fcec27e282e..963bea20363 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ PrettyTable>=0.7.2 Jinja2>=2.7.3 IntelHex>=1.3 project-generator>=0.9.7,<0.10.0 -project_generator_definitions>=0.2.26,<0.3.0 +project-generator-definitions>=0.2.26,<0.3.0 junit-xml pyYAML requests From d26829ad7878ceaaf247c4b700b5ad03167e128c Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Fri, 29 Jul 2016 08:23:51 +0200 Subject: [PATCH 2/2] Setup - fix progen def name - use dashes --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c27a2a8b0eb..42d6dcb9fce 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ url='https://github.com/mbedmicro/mbed', packages=find_packages(), license=LICENSE, - install_requires=["PrettyTable>=0.7.2", "PySerial>=2.7", "IntelHex>=1.3", "colorama>=0.3.3", "Jinja2>=2.7.3", "project-generator>=0.9.3,<0.10.0", "project_generator_definitions>=0.2.26,<0.3.0", "junit-xml", "requests", "pyYAML"]) + install_requires=["PrettyTable>=0.7.2", "PySerial>=2.7", "IntelHex>=1.3", "colorama>=0.3.3", "Jinja2>=2.7.3", "project-generator>=0.9.3,<0.10.0", "project-generator-definitions>=0.2.26,<0.3.0", "junit-xml", "requests", "pyYAML"]) # Restore previous mbed_settings if needed if backup: