From 0f1cd87deb5c6c2bdaadb2fec1b33f94df4939f6 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 2 Jan 2015 23:19:26 +0200 Subject: [PATCH 1/5] Return to 0.11.0-dev --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index 6fdb367f..4b35f3f7 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -1,7 +1,7 @@ # Copyright (C) Ivan Kravets # See LICENSE for details. -VERSION = (0, 10, 1) +VERSION = (0, 11, "0-dev") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From 09159c3ac03f71b12b1bea2fdb836a2fda451671 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 3 Jan 2015 01:16:19 +0200 Subject: [PATCH 2/5] Add notice about Engduino Library --- docs/platforms/atmelavr.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst index 9b8aa94d..9e9722d9 100644 --- a/docs/platforms/atmelavr.rst +++ b/docs/platforms/atmelavr.rst @@ -250,6 +250,11 @@ Engduino - 32 Kb - 2.5 Kb +.. note:: + If you are going to use onboard sensors, please install + `Engduino library `_ + with the examples. + More detailed information you can find here `Engduino Site `_. From 8c53cf1d3c593a4c2e4fbd0b537898c5275d5c86 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 5 Jan 2015 22:58:55 +0200 Subject: [PATCH 3/5] Fix an issue with ``--json-output`` // Resolve #42 --- HISTORY.rst | 5 +++++ platformio/commands/lib.py | 5 ++++- platformio/commands/list.py | 4 +++- platformio/commands/serialports.py | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index ca81838c..25b3928c 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,11 @@ Release History =============== +0.10.2 (2015-01-?) +------------------ + +* Fixed an issue with ``--json-output`` (`issue #42 `_) + 0.10.1 (2015-01-02) ------------------- diff --git a/platformio/commands/lib.py b/platformio/commands/lib.py index f3b87445..96b750e5 100644 --- a/platformio/commands/lib.py +++ b/platformio/commands/lib.py @@ -1,12 +1,15 @@ # Copyright (C) Ivan Kravets # See LICENSE for details. +import json + import click from platformio import app, exception from platformio.libmanager import LibraryManager from platformio.util import get_api_result, get_lib_dir + LIBLIST_TPL = ("[{id:^14}] {name:<25} {compatibility:<30} " "\"{authornames}\": {description}") @@ -160,7 +163,7 @@ def lib_list(json_output): items = lm.get_installed().values() if json_output: - click.echo(items) + click.echo(json.dumps(items)) return if not items: diff --git a/platformio/commands/list.py b/platformio/commands/list.py index 3520d2ad..c47a95b8 100644 --- a/platformio/commands/list.py +++ b/platformio/commands/list.py @@ -1,6 +1,8 @@ # Copyright (C) Ivan Kravets # See LICENSE for details. +import json + import click from platformio.platforms.base import PlatformFactory @@ -23,7 +25,7 @@ def cli(json_output): }) if json_output: - click.echo(data) + click.echo(json.dumps(data)) else: for item in data: click.echo("{name:<20} with packages: {pkgs}".format( diff --git a/platformio/commands/serialports.py b/platformio/commands/serialports.py index d62d9482..c52f27da 100644 --- a/platformio/commands/serialports.py +++ b/platformio/commands/serialports.py @@ -1,6 +1,7 @@ # Copyright (C) Ivan Kravets # See LICENSE for details. +import json import sys import click @@ -19,7 +20,7 @@ def cli(): def serialports_list(json_output): if json_output: - click.echo(get_serialports()) + click.echo(json.dumps(get_serialports())) return for item in get_serialports(): From 4b7a7d0cf099550e3dc2aabc95ea38d5828c557e Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 6 Jan 2015 17:45:07 +0200 Subject: [PATCH 4/5] Fix an exception during `platformio upgrade` under Windows OS // Resolve #45 --- HISTORY.rst | 1 + platformio/commands/upgrade.py | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 25b3928c..27a5f5e3 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,6 +5,7 @@ Release History ------------------ * Fixed an issue with ``--json-output`` (`issue #42 `_) +* Fixed an exception during `platformio upgrade `__ under Windows OS (`issue #45 `_) 0.10.1 (2015-01-02) ------------------- diff --git a/platformio/commands/upgrade.py b/platformio/commands/upgrade.py index 212744a6..75172ccf 100644 --- a/platformio/commands/upgrade.py +++ b/platformio/commands/upgrade.py @@ -23,9 +23,19 @@ def cli(): "newest version available." % __version__, fg="green" ) else: - result = exec_command(["pip", "install", "--upgrade", "platformio"]) - click.secho(result['out'], fg="green") - click.secho(result['err'], fg="red") + click.secho("Please wait while upgrading PlatformIO ...", + fg="yellow") + + pip_result = exec_command(["pip", "install", "--upgrade", + "platformio"]) + pio_result = exec_command(["platformio", "--version"]) + + if last in pio_result['out'].strip(): + click.secho("PlatformIO has been successfully upgraded to %s" % + last, fg="green") + else: + click.secho(pip_result['out'], fg="green") + click.secho(pip_result['err'], fg="red") def get_latest_version(): From be224d2d8ac9e44a11c9252a1223ef3f4f2c27d6 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 6 Jan 2015 18:32:06 +0200 Subject: [PATCH 5/5] Bump to 0.10.2 (resolve issue #42, #45) --- HISTORY.rst | 4 ++-- platformio/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 27a5f5e3..a275d21b 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,8 +1,8 @@ Release History =============== -0.10.2 (2015-01-?) ------------------- +0.10.2 (2015-01-06) +------------------- * Fixed an issue with ``--json-output`` (`issue #42 `_) * Fixed an exception during `platformio upgrade `__ under Windows OS (`issue #45 `_) diff --git a/platformio/__init__.py b/platformio/__init__.py index 4b35f3f7..f55145c6 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -1,7 +1,7 @@ # Copyright (C) Ivan Kravets # See LICENSE for details. -VERSION = (0, 11, "0-dev") +VERSION = (0, 10, 2) __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio"