From 67a6f66a353690a1aeeb15b38520cafaeb89db43 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 29 Oct 2018 19:23:06 +0200 Subject: [PATCH 01/41] Add support for oddWires IoT-Bus Io debug tool --- docs | 2 +- scripts/docspregen.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs b/docs index 30c88f62..faee34e2 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 30c88f624780bd003f105bab7ddfc56f20de850c +Subproject commit faee34e210043fa734e28fd943ee1ebca95f7bb6 diff --git a/scripts/docspregen.py b/scripts/docspregen.py index d2072ed2..8332ee71 100644 --- a/scripts/docspregen.py +++ b/scripts/docspregen.py @@ -822,7 +822,7 @@ Boards # Debug tools for tool, platforms in tool_to_platforms.items(): tool_path = join(DOCS_ROOT_DIR, "plus", "debug-tools", "%s.rst" % tool) - assert isfile(tool_path) + assert isfile(tool_path), tool platforms = sorted(set(platforms)) lines = [".. begin_platforms"] From fce84b5a487891e6db7ff2dc5fd8bd166dbf14d3 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 29 Oct 2018 22:27:47 +0200 Subject: [PATCH 02/41] Add debugging support using TIAO USB Multi-Protocol adapter (TUMPA) --- docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs b/docs index faee34e2..814d2986 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit faee34e210043fa734e28fd943ee1ebca95f7bb6 +Subproject commit 814d2986e916fe4307a05fa0e5058fe986875534 From 543a1dddaef4e338bccde6833fe8c20810ebdeb9 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 29 Oct 2018 22:38:20 +0200 Subject: [PATCH 03/41] Sync docs --- docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs b/docs index 814d2986..a5816053 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 814d2986e916fe4307a05fa0e5058fe986875534 +Subproject commit a5816053148c7e775e548aaa65f7b11798cef9d9 From 692af90161f7ad1ff7491aa6e55ad3c3b112336e Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 30 Oct 2018 00:14:06 +0200 Subject: [PATCH 04/41] Fix incorrect wording when initializing/updating project --- HISTORY.rst | 5 +++++ platformio/commands/init.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 5ea68cce..f12a78ef 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,11 @@ Release Notes PlatformIO 3.0 -------------- +3.6.2 (2018-??-??) +~~~~~~~~~~~~~~~~~~ + +* Fixed incorrect wording when initializing/updating project + 3.6.1 (2018-10-29) ~~~~~~~~~~~~~~~~~~ diff --git a/platformio/commands/init.py b/platformio/commands/init.py index 1e3cbeb9..e90bc2fd 100644 --- a/platformio/commands/init.py +++ b/platformio/commands/init.py @@ -87,7 +87,7 @@ def cli( click.echo("%s - Project Configuration File" % click.style( "platformio.ini", fg="cyan")) - is_new_project = util.is_platformio_project(project_dir) + is_new_project = not util.is_platformio_project(project_dir) init_base_project(project_dir) if board: From 50ed828e7a037288353263832e6850b5ddb78658 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 30 Oct 2018 00:14:58 +0200 Subject: [PATCH 05/41] Bump version to 3.6.2a1 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index b980d065..97f8279c 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, 1) +VERSION = (3, 6, "2a1") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From ab6a323aca6c39115602f83f91862f3d42ad4127 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 30 Oct 2018 00:27:29 +0200 Subject: [PATCH 06/41] Fixed an issue with VSCode IntelliSense warning about the missed headers located in "include" folder --- HISTORY.rst | 1 + platformio/builder/tools/pioide.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index f12a78ef..413a82c0 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -7,6 +7,7 @@ PlatformIO 3.0 3.6.2 (2018-??-??) ~~~~~~~~~~~~~~~~~~ +* Fixed an issue with VSCode IntelliSense warning about the missed headers located in `include `__ folder * Fixed incorrect wording when initializing/updating project 3.6.1 (2018-10-29) diff --git a/platformio/builder/tools/pioide.py b/platformio/builder/tools/pioide.py index 063ce45d..8ff6888f 100644 --- a/platformio/builder/tools/pioide.py +++ b/platformio/builder/tools/pioide.py @@ -25,7 +25,7 @@ from platformio.managers.core import get_core_package_dir def _dump_includes(env): - includes = [env.subst("$PROJECTINCLUDE_DIR"), env.subst("$PROJECTSRC_DIR")] + includes = [] for item in env.get("CPPPATH", []): includes.append(env.subst(item)) @@ -53,6 +53,9 @@ def _dump_includes(env): if unity_dir: includes.append(unity_dir) + includes.extend( + env.subst("$PROJECTINCLUDE_DIR"), env.subst("$PROJECTSRC_DIR")) + # remove duplicates result = [] for item in includes: From 38fb5b22346b693e1d26452f3e4e9ff1652b34e6 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 30 Oct 2018 06:40:11 +0200 Subject: [PATCH 07/41] Typo fix --- platformio/builder/tools/pioide.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/builder/tools/pioide.py b/platformio/builder/tools/pioide.py index 8ff6888f..ed932818 100644 --- a/platformio/builder/tools/pioide.py +++ b/platformio/builder/tools/pioide.py @@ -54,7 +54,7 @@ def _dump_includes(env): includes.append(unity_dir) includes.extend( - env.subst("$PROJECTINCLUDE_DIR"), env.subst("$PROJECTSRC_DIR")) + [env.subst("$PROJECTINCLUDE_DIR"), env.subst("$PROJECTSRC_DIR")]) # remove duplicates result = [] From 0a6fb6884053a9ccc624a5db84a4ac31c6963bd4 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 30 Oct 2018 06:40:36 +0200 Subject: [PATCH 08/41] Bump version to 3.6.2a2 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index 97f8279c..0a2127ac 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, "2a1") +VERSION = (3, 6, "2a2") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From 09d58d0d49930c481968e2d30bb164e459ef78f9 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 2 Nov 2018 12:54:09 +0200 Subject: [PATCH 09/41] Update docs for ESP8266 lwIP profiles --- docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs b/docs index a5816053..747ade96 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit a5816053148c7e775e548aaa65f7b11798cef9d9 +Subproject commit 747ade96483d6ad007e6c7367fc13ef8b4f9dae7 From 151823f80e8e6ca1be578faeaa6519890506b3e0 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 2 Nov 2018 15:48:12 +0200 Subject: [PATCH 10/41] Fix pinouts for oddWires IOT-Bus JTAG --- docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs b/docs index 747ade96..5f196f55 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 747ade96483d6ad007e6c7367fc13ef8b4f9dae7 +Subproject commit 5f196f55178b6b1f0af4d140df5a04a81d970873 From 1287e51bf843c5bb5b5621378ca58cc209f2debd Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sun, 4 Nov 2018 13:13:34 +0200 Subject: [PATCH 11/41] Add info about "EN" pin for ESP32 and debug probes --- docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs b/docs index 5f196f55..3ad9278c 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 5f196f55178b6b1f0af4d140df5a04a81d970873 +Subproject commit 3ad9278c9a4362571b037dcb401eb99d22b1badb From 7789e3bc6228bd227a1f8f368ae74a8979030cde Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sun, 4 Nov 2018 17:24:39 +0200 Subject: [PATCH 12/41] Rename "System" to "Hardware" for board spec --- docs | 2 +- platformio/builder/tools/pioplatform.py | 13 +++++++------ scripts/docspregen.py | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docs b/docs index 3ad9278c..f2d4816c 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 3ad9278c9a4362571b037dcb401eb99d22b1badb +Subproject commit f2d4816caebe07bb7766cbdaa1bd916ebded93d3 diff --git a/platformio/builder/tools/pioplatform.py b/platformio/builder/tools/pioplatform.py index 3033ea25..9d37ae77 100644 --- a/platformio/builder/tools/pioplatform.py +++ b/platformio/builder/tools/pioplatform.py @@ -124,15 +124,15 @@ def LoadPioPlatform(env, variables): def PrintConfiguration(env): platform = env.PioPlatform() platform_data = ["PLATFORM: %s >" % platform.title] - system_data = ["SYSTEM:"] + hardware_data = ["HARDWARE:"] configuration_data = ["CONFIGURATION:"] mcu = env.subst("$BOARD_MCU") f_cpu = env.subst("$BOARD_F_CPU") if mcu: - system_data.append(mcu.upper()) + hardware_data.append(mcu.upper()) if f_cpu: f_cpu = int("".join([c for c in str(f_cpu) if c.isdigit()])) - system_data.append("%dMHz" % (f_cpu / 1000000)) + hardware_data.append("%dMHz" % (f_cpu / 1000000)) debug_tools = None if "BOARD" in env: @@ -142,13 +142,14 @@ def PrintConfiguration(env): debug_tools = board_config.get("debug", {}).get("tools") ram = board_config.get("upload", {}).get("maximum_ram_size") flash = board_config.get("upload", {}).get("maximum_size") - system_data.append("%s RAM (%s Flash)" % (util.format_filesize(ram), - util.format_filesize(flash))) + hardware_data.append( + "%s RAM (%s Flash)" % (util.format_filesize(ram), + util.format_filesize(flash))) configuration_data.append( "https://docs.platformio.org/page/boards/%s/%s.html" % (platform.name, board_config.id)) - for data in (configuration_data, platform_data, system_data): + for data in (configuration_data, platform_data, hardware_data): if len(data) > 1: print(" ".join(data)) diff --git a/scripts/docspregen.py b/scripts/docspregen.py index 8332ee71..721d39da 100644 --- a/scripts/docspregen.py +++ b/scripts/docspregen.py @@ -628,8 +628,8 @@ def update_embedded_board(rst_path, board): lines.append(""" .. contents:: -System ------- +Hardware +-------- Platform :ref:`platform_{platform}`: {platform_description} From c06a018d88e502276cffc5f398e1e1655b7d2e42 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 5 Nov 2018 18:32:58 +0200 Subject: [PATCH 13/41] Docs: Add support for OLIMEX ESP32-PRO --- docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs b/docs index f2d4816c..17b54997 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit f2d4816caebe07bb7766cbdaa1bd916ebded93d3 +Subproject commit 17b549979bc0bd365f7c31fc7a5af1f9e480c3a0 From f65ab58c88444479dcad86d83d7f7cb40b26fbd4 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sun, 18 Nov 2018 23:53:47 +0200 Subject: [PATCH 14/41] Go over 8010-8100 TCP ports when shutting down PIO Home server --- platformio/managers/core.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platformio/managers/core.py b/platformio/managers/core.py index 0ea1cb15..514bac5b 100644 --- a/platformio/managers/core.py +++ b/platformio/managers/core.py @@ -106,12 +106,12 @@ def update_core_packages(only_check=False, silent=False): def shutdown_piohome_servers(): port = 8010 - while port < 9000: + while port < 8100: try: requests.get("http://127.0.0.1:%d?__shutdown__=1" % port) - port += 1 except: # pylint: disable=bare-except - return + pass + port += 1 def pioplus_call(args, **kwargs): From 95beb03aadf1aa46e6fd623a8e4de6e07f1a401a Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sun, 18 Nov 2018 23:54:42 +0200 Subject: [PATCH 15/41] Bump version to 3.6.2a3 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index 0a2127ac..5f575a22 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, "2a2") +VERSION = (3, 6, "2a3") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From b22ca10f8c785959052e8c9a67ec189d73ab6cc3 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 19 Nov 2018 17:45:53 +0200 Subject: [PATCH 16/41] Prepend CPPATH of library dependencies instead of appending // Resolve #1914 --- HISTORY.rst | 2 ++ platformio/builder/tools/pioide.py | 3 ++- platformio/builder/tools/piolib.py | 10 +++++----- platformio/builder/tools/platformio.py | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 413a82c0..56dd7863 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -9,6 +9,8 @@ PlatformIO 3.0 * Fixed an issue with VSCode IntelliSense warning about the missed headers located in `include `__ folder * Fixed incorrect wording when initializing/updating project +* Fixed an issue with incorrect order for library dependencies ``CPPPATH`` + (`issue #1914 `_) 3.6.1 (2018-10-29) ~~~~~~~~~~~~~~~~~~ diff --git a/platformio/builder/tools/pioide.py b/platformio/builder/tools/pioide.py index ed932818..9a35b6e3 100644 --- a/platformio/builder/tools/pioide.py +++ b/platformio/builder/tools/pioide.py @@ -54,7 +54,8 @@ def _dump_includes(env): includes.append(unity_dir) includes.extend( - [env.subst("$PROJECTINCLUDE_DIR"), env.subst("$PROJECTSRC_DIR")]) + [env.subst("$PROJECTINCLUDE_DIR"), + env.subst("$PROJECTSRC_DIR")]) # remove duplicates result = [] diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index d9e5733c..720f1eba 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -432,23 +432,23 @@ class LibBuilderBase(object): libs.extend(lb.build()) # copy shared information to self env for key in ("CPPPATH", "LIBPATH", "LIBS", "LINKFLAGS"): - self.env.AppendUnique(**{key: lb.env.get(key)}) + self.env.PrependUnique(**{key: lb.env.get(key)}) for lb in self._circular_deps: - self.env.AppendUnique(CPPPATH=lb.get_include_dirs()) + self.env.PrependUnique(CPPPATH=lb.get_include_dirs()) if self._is_built: return libs self._is_built = True - self.env.AppendUnique(CPPPATH=self.get_include_dirs()) + self.env.PrependUnique(CPPPATH=self.get_include_dirs()) if self.lib_ldf_mode == "off": for lb in self.env.GetLibBuilders(): if self == lb or not lb.is_built: continue for key in ("CPPPATH", "LIBPATH", "LIBS", "LINKFLAGS"): - self.env.AppendUnique(**{key: lb.env.get(key)}) + self.env.PrependUnique(**{key: lb.env.get(key)}) if self.lib_archive: libs.append( @@ -743,7 +743,7 @@ class ProjectAsLibBuilder(LibBuilderBase): def build(self): self._is_built = True # do not build Project now - self.env.AppendUnique(CPPPATH=self.get_include_dirs()) + self.env.PrependUnique(CPPPATH=self.get_include_dirs()) return LibBuilderBase.build(self) diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py index 321e8ea1..b93499ae 100644 --- a/platformio/builder/tools/platformio.py +++ b/platformio/builder/tools/platformio.py @@ -44,10 +44,10 @@ def scons_patched_match_splitext(path, suffixes=None): def _build_project_deps(env): project_lib_builder = env.ConfigureProjectLibBuilder() - # append project libs to the beginning of list + # prepend project libs to the beginning of list env.Prepend(LIBS=project_lib_builder.build()) - # append extra linker related options from libs - env.AppendUnique( + # prepend extra linker related options from libs + env.PrependUnique( **{ key: project_lib_builder.env.get(key) for key in ("LIBS", "LIBPATH", "LINKFLAGS") From 32bb9c9d8349c0bf9d28b5b093ff70e47c1255a9 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 19 Nov 2018 17:46:19 +0200 Subject: [PATCH 17/41] Bump version to 3.6.2b1 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index 5f575a22..1104341a 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, "2a3") +VERSION = (3, 6, "2b1") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From 7322df26ad8d43029b992a9bd3f3369840bc40da Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 19 Nov 2018 19:06:56 +0200 Subject: [PATCH 18/41] Fix an issue when Library Dependency Finder (LDF) does not handle project `src_filter ` // Resolve #1905 --- HISTORY.rst | 2 ++ platformio/builder/tools/piolib.py | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 56dd7863..a83b34f9 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -11,6 +11,8 @@ PlatformIO 3.0 * Fixed incorrect wording when initializing/updating project * Fixed an issue with incorrect order for library dependencies ``CPPPATH`` (`issue #1914 `_) +* Fixed an issue when Library Dependency Finder (LDF) does not handle project `src_filter `__ + (`issue #1905 `_) 3.6.1 (2018-10-29) ~~~~~~~~~~~~~~~~~~ diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index 720f1eba..39627682 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -663,6 +663,12 @@ class PlatformIOLibBuilder(LibBuilderBase): class ProjectAsLibBuilder(LibBuilderBase): + def __init__(self, env, path, manifest=None, verbose=False): + # backup original value, will be reset in base.__init__ + project_src_filter = env.get("SRC_FILTER") + super(ProjectAsLibBuilder, self).__init__(env, path) + self.env['SRC_FILTER'] = project_src_filter + @property def include_dir(self): include_dir = self.env.subst("$PROJECTINCLUDE_DIR") @@ -701,7 +707,8 @@ class ProjectAsLibBuilder(LibBuilderBase): @property def src_filter(self): - return self.env.get("SRC_FILTER", LibBuilderBase.src_filter.fget(self)) + return (self.env.get("SRC_FILTER") + or LibBuilderBase.src_filter.fget(self)) def process_extra_options(self): # skip for project, options are already processed From 23af9c9027d999052f782db76aaec283f018cd33 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 19 Nov 2018 22:29:53 +0200 Subject: [PATCH 19/41] Fix an issue when Library Dependency Finder (LDF) finds spurious dependencies in ``chain+`` and ``deep+`` modes // Resolve #1930 --- HISTORY.rst | 2 ++ platformio/builder/tools/piolib.py | 4 ++-- platformio/managers/core.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index a83b34f9..7ce2aec1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -13,6 +13,8 @@ PlatformIO 3.0 (`issue #1914 `_) * Fixed an issue when Library Dependency Finder (LDF) does not handle project `src_filter `__ (`issue #1905 `_) +* Fixed an issue when Library Dependency Finder (LDF) finds spurious dependencies in ``chain+`` and ``deep+`` modes + (`issue #1930 `_) 3.6.1 (2018-10-29) ~~~~~~~~~~~~~~~~~~ diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index 39627682..1b3fb653 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -663,10 +663,10 @@ class PlatformIOLibBuilder(LibBuilderBase): class ProjectAsLibBuilder(LibBuilderBase): - def __init__(self, env, path, manifest=None, verbose=False): + def __init__(self, env, *args, **kwargs): # backup original value, will be reset in base.__init__ project_src_filter = env.get("SRC_FILTER") - super(ProjectAsLibBuilder, self).__init__(env, path) + super(ProjectAsLibBuilder, self).__init__(env, *args, **kwargs) self.env['SRC_FILTER'] = project_src_filter @property diff --git a/platformio/managers/core.py b/platformio/managers/core.py index 514bac5b..1945b055 100644 --- a/platformio/managers/core.py +++ b/platformio/managers/core.py @@ -28,7 +28,7 @@ CORE_PACKAGES = { "contrib-pysite": ">=0.3.2,<2", "tool-pioplus": "^1.5.0", "tool-unity": "~1.20403.0", - "tool-scons": "~2.20501.4" + "tool-scons": "~2.20501.5" } PIOPLUS_AUTO_UPDATES_MAX = 100 From 375006ee65d708de35f45ecf376ac1eb07ad7251 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 19 Nov 2018 22:30:52 +0200 Subject: [PATCH 20/41] Bump version to 3.6.2b2 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index 1104341a..eb62bfc6 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, "2b1") +VERSION = (3, 6, "2b2") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From b861e9c192dcd0081164a9f9fc13df50676f6dd5 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 20 Nov 2018 00:50:52 +0200 Subject: [PATCH 21/41] Document in `library.json` how to pass flags to a global build environment --- docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs b/docs index 17b54997..92e6f26b 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 17b549979bc0bd365f7c31fc7a5af1f9e480c3a0 +Subproject commit 92e6f26b4f45045e273f5ca7e4cbe18b7aed2f9f From 579a9735129b3b15459f66da1d8e9a194c38c881 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 20 Nov 2018 01:23:34 +0200 Subject: [PATCH 22/41] Handle CWD when searching for a file // Resolve #1930 --- platformio/managers/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/managers/core.py b/platformio/managers/core.py index 1945b055..c34da52b 100644 --- a/platformio/managers/core.py +++ b/platformio/managers/core.py @@ -28,7 +28,7 @@ CORE_PACKAGES = { "contrib-pysite": ">=0.3.2,<2", "tool-pioplus": "^1.5.0", "tool-unity": "~1.20403.0", - "tool-scons": "~2.20501.5" + "tool-scons": "~2.20501.6" } PIOPLUS_AUTO_UPDATES_MAX = 100 From 9d2499ab98aab0052b42c3fb3155783bf6be21e5 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 20 Nov 2018 01:23:55 +0200 Subject: [PATCH 23/41] Bump version to 3.6.2b3 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index eb62bfc6..fa369505 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, "2b2") +VERSION = (3, 6, "2b3") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From a2b0b2893b042822050497bfe54f3c851ef24f32 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 21 Nov 2018 00:52:34 +0200 Subject: [PATCH 24/41] LDF: Stop handling "define" and "undef" when condition fails; handle CPP files in "chain+" and "deep+" modes // Resolve #1930 --- platformio/builder/tools/piolib.py | 38 +++++++++++++++--------------- platformio/managers/core.py | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index 1b3fb653..574c9ed9 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -347,7 +347,7 @@ class LibBuilderBase(object): for path in self._validate_search_files(search_files): try: assert "+" in self.lib_ldf_mode - incs = LibBuilderBase.CCONDITIONAL_SCANNER( + candidates = LibBuilderBase.CCONDITIONAL_SCANNER( self.env.File(path), self.env, tuple(include_dirs), @@ -357,26 +357,26 @@ class LibBuilderBase(object): sys.stderr.write( "Warning! Classic Pre Processor is used for `%s`, " "advanced has failed with `%s`\n" % (path, e)) - _incs = LibBuilderBase.CLASSIC_SCANNER( + candidates = LibBuilderBase.CLASSIC_SCANNER( self.env.File(path), self.env, tuple(include_dirs)) - incs = [] - for inc in _incs: - incs.append(inc) - if not self.PARSE_SRC_BY_H_NAME: + + # print(path, map(lambda n: n.get_abspath(), candidates)) + for item in candidates: + if item not in result: + result.append(item) + if not self.PARSE_SRC_BY_H_NAME: + continue + _h_path = item.get_abspath() + if not self.env.IsFileWithExt(_h_path, piotool.SRC_HEADER_EXT): + continue + _f_part = _h_path[:_h_path.rindex(".")] + for ext in piotool.SRC_C_EXT: + if not isfile("%s.%s" % (_f_part, ext)): continue - _h_path = inc.get_abspath() - if not self.env.IsFileWithExt(_h_path, - piotool.SRC_HEADER_EXT): - continue - _f_part = _h_path[:_h_path.rindex(".")] - for ext in piotool.SRC_C_EXT: - if isfile("%s.%s" % (_f_part, ext)): - incs.append( - self.env.File("%s.%s" % (_f_part, ext))) - # print(path, map(lambda n: n.get_abspath(), incs)) - for inc in incs: - if inc not in result: - result.append(inc) + _c_path = self.env.File("%s.%s" % (_f_part, ext)) + if _c_path not in result: + result.append(_c_path) + return result def depend_recursive(self, lb, search_files=None): diff --git a/platformio/managers/core.py b/platformio/managers/core.py index c34da52b..b626a439 100644 --- a/platformio/managers/core.py +++ b/platformio/managers/core.py @@ -28,7 +28,7 @@ CORE_PACKAGES = { "contrib-pysite": ">=0.3.2,<2", "tool-pioplus": "^1.5.0", "tool-unity": "~1.20403.0", - "tool-scons": "~2.20501.6" + "tool-scons": "~2.20501.7" } PIOPLUS_AUTO_UPDATES_MAX = 100 From d3909bdfa206d5c7d2cdbfdc1a72786294a1d022 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 21 Nov 2018 00:52:54 +0200 Subject: [PATCH 25/41] Bump version to 3.6.2b4 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index fa369505..963f1fe4 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, "2b3") +VERSION = (3, 6, "2b4") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From 4a17a9b5b3f6cc4ecbf68b0c0e0d2af5a660e57c Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 21 Nov 2018 15:00:13 +0200 Subject: [PATCH 26/41] Improved IntelliSense for PlatformIO IDE for VSCode via passing extra compiler information for C/C++ Code Parser --- HISTORY.rst | 1 + platformio/builder/tools/pioide.py | 4 ++-- platformio/ide/tpls/atom/.gcc-flags.json.tpl | 5 +++-- platformio/ide/tpls/vim/.gcc-flags.json.tpl | 5 +++-- platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 7ce2aec1..2b78b705 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -7,6 +7,7 @@ PlatformIO 3.0 3.6.2 (2018-??-??) ~~~~~~~~~~~~~~~~~~ +* Improved IntelliSense for `PlatformIO IDE for VSCode `__ via passing extra compiler information for C/C++ Code Parser (resolves issues with spurious project's "Problems") * Fixed an issue with VSCode IntelliSense warning about the missed headers located in `include `__ folder * Fixed incorrect wording when initializing/updating project * Fixed an issue with incorrect order for library dependencies ``CPPPATH`` diff --git a/platformio/builder/tools/pioide.py b/platformio/builder/tools/pioide.py index 9a35b6e3..0e6bf31a 100644 --- a/platformio/builder/tools/pioide.py +++ b/platformio/builder/tools/pioide.py @@ -134,8 +134,8 @@ def _get_svd_path(env): def DumpIDEData(env): - LINTCCOM = "$CFLAGS $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS" - LINTCXXCOM = "$CXXFLAGS $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS" + LINTCCOM = "$CFLAGS $CCFLAGS $CPPFLAGS" + LINTCXXCOM = "$CXXFLAGS $CCFLAGS $CPPFLAGS" data = { "libsource_dirs": diff --git a/platformio/ide/tpls/atom/.gcc-flags.json.tpl b/platformio/ide/tpls/atom/.gcc-flags.json.tpl index 5af2ea3a..20942a7a 100644 --- a/platformio/ide/tpls/atom/.gcc-flags.json.tpl +++ b/platformio/ide/tpls/atom/.gcc-flags.json.tpl @@ -1,7 +1,8 @@ +% _defines = " ".join(["-D%s" % d for d in defines]) { "execPath": "{{ cxx_path.replace("\\", "/") }}", - "gccDefaultCFlags": "-fsyntax-only {{! cc_flags.replace(' -MMD ', ' ').replace('"', '\\"') }}", - "gccDefaultCppFlags": "-fsyntax-only {{! cxx_flags.replace(' -MMD ', ' ').replace('"', '\\"') }}", + "gccDefaultCFlags": "-fsyntax-only {{! cc_flags.replace(' -MMD ', ' ').replace('"', '\\"') }} {{ !_defines.replace('"', '\\"') }}", + "gccDefaultCppFlags": "-fsyntax-only {{! cxx_flags.replace(' -MMD ', ' ').replace('"', '\\"') }} {{ !_defines.replace('"', '\\"') }}", "gccErrorLimit": 15, "gccIncludePaths": "{{ ','.join(includes).replace("\\", "/") }}", "gccSuppressWarnings": false diff --git a/platformio/ide/tpls/vim/.gcc-flags.json.tpl b/platformio/ide/tpls/vim/.gcc-flags.json.tpl index 07acafd0..b904e1a3 100644 --- a/platformio/ide/tpls/vim/.gcc-flags.json.tpl +++ b/platformio/ide/tpls/vim/.gcc-flags.json.tpl @@ -1,7 +1,8 @@ +% _defines = " ".join(["-D%s" % d for d in defines]) { "execPath": "{{ cxx_path.replace("\\", "/") }}", - "gccDefaultCFlags": "-fsyntax-only {{! cc_flags.replace(' -MMD ', ' ').replace('"', '\\"') }}", - "gccDefaultCppFlags": "-fsyntax-only {{! cxx_flags.replace(' -MMD ', ' ').replace('"', '\\"') }}", + "gccDefaultCFlags": "-fsyntax-only {{! cc_flags.replace(' -MMD ', ' ').replace('"', '\\"') }} {{ !_defines.replace('"', '\\"') }}", + "gccDefaultCppFlags": "-fsyntax-only {{! cxx_flags.replace(' -MMD ', ' ').replace('"', '\\"') }} {{ !_defines.replace('"', '\\"') }}", "gccErrorLimit": 15, "gccIncludePaths": "{{! ','.join("'{}'".format(w.replace("\\", '/')) for w in includes)}}", "gccSuppressWarnings": false diff --git a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl index 2497f743..d15fb8bd 100644 --- a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl +++ b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl @@ -56,7 +56,7 @@ % if cxx_stds: "cppStandard": "c++{{ cxx_stds[-1] }}", % end - "compilerPath": "{{ cc_path.replace('\\\\', '/').replace('\\', '/').replace('"', '\\"') }}" + "compilerPath": "{{ cc_path.replace('\\\\', '/').replace('\\', '/').replace('"', '\\"') }} {{! STD_RE.sub("", cc_flags).replace('"', '\\"') }}" } ] } \ No newline at end of file From b42d0efa73c0c9e8daf8756753eb3303bdaf79e1 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 21 Nov 2018 15:00:52 +0200 Subject: [PATCH 27/41] Bump version to 3.6.2b5 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index 963f1fe4..d9f007ce 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, "2b4") +VERSION = (3, 6, "2b5") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From 9ef8d4cfe033b2a7ffdb0f60bc93953bc0ac7fd0 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 24 Nov 2018 14:30:21 +0200 Subject: [PATCH 28/41] Docs: Grammar fixes --- docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs b/docs index 92e6f26b..3bf15757 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 92e6f26b4f45045e273f5ca7e4cbe18b7aed2f9f +Subproject commit 3bf157571cf1009339e41d05a732ed0bd0b18092 From 7574798a3a3f31cd3c8ce6183a351c7a7b9f56f6 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 24 Nov 2018 15:51:50 +0200 Subject: [PATCH 29/41] Document "erase" target --- docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs b/docs index 3bf15757..d696c0d5 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 3bf157571cf1009339e41d05a732ed0bd0b18092 +Subproject commit d696c0d52fa5a779085a1e695672b9cfcd2ac824 From d475f44e493454e293efa9e1c8b4323a3df3c7c4 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 27 Nov 2018 00:54:59 +0200 Subject: [PATCH 30/41] Escape string when generating manifest for VSCode C/C++ IntelliSense service --- .../tpls/vscode/.vscode/c_cpp_properties.json.tpl | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl index d15fb8bd..0f6de48d 100644 --- a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl +++ b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl @@ -7,10 +7,14 @@ % % systype = platform.system().lower() % +% def _escape(text): +% return text.replace('\\\\', '/').replace('\\', '/').replace('"', '\\"') +% end +% % cleaned_includes = [] % for include in includes: % if "toolchain-" not in dirname(commonprefix([include, cc_path])): -% cleaned_includes.append(include) +% cleaned_includes.append(include) % end % end % @@ -24,7 +28,7 @@ % end "includePath": [ % for include in cleaned_includes: - "{{include.replace('\\\\', '/').replace('\\', '/').replace('"', '\\"')}}", + "{{! _escape(include) }}", % end "" ], @@ -33,14 +37,14 @@ "databaseFilename": "${workspaceRoot}/.vscode/.browse.c_cpp.db", "path": [ % for include in cleaned_includes: - "{{include.replace('\\\\', '/').replace('\\', '/').replace('"', '\\"')}}", + "{{! _escape(include) }}}", % end "" ] }, "defines": [ % for define in defines: - "{{!define.replace('"', '\\"')}}", + "{{! _escape(define) }}", % end "" ], @@ -56,7 +60,7 @@ % if cxx_stds: "cppStandard": "c++{{ cxx_stds[-1] }}", % end - "compilerPath": "{{ cc_path.replace('\\\\', '/').replace('\\', '/').replace('"', '\\"') }} {{! STD_RE.sub("", cc_flags).replace('"', '\\"') }}" + "compilerPath": "{{! _escape(cc_path) }} {{! _escape(STD_RE.sub("", cc_flags)) }}" } ] } \ No newline at end of file From 3d5271093513c7b9953e61f7c8bf73746345c5b1 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 27 Nov 2018 00:55:30 +0200 Subject: [PATCH 31/41] Bump version to 3.6.2b6 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index d9f007ce..8ea1f915 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, "2b5") +VERSION = (3, 6, "2b6") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From 13731b44613f0f442d2c7b8f43e77e49caf5a1d4 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 28 Nov 2018 17:23:33 +0200 Subject: [PATCH 32/41] Switch PIO Home to native WebSockets (next step to PY3) --- platformio/managers/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio/managers/core.py b/platformio/managers/core.py index b626a439..d23bc35a 100644 --- a/platformio/managers/core.py +++ b/platformio/managers/core.py @@ -24,8 +24,8 @@ from platformio import __version__, exception, util from platformio.managers.package import PackageManager CORE_PACKAGES = { - "contrib-piohome": "^1.0.2", - "contrib-pysite": ">=0.3.2,<2", + "contrib-piohome": "^2.0.0", + "contrib-pysite": "^2.%d%d.0" % (sys.version_info[0], sys.version_info[1]), "tool-pioplus": "^1.5.0", "tool-unity": "~1.20403.0", "tool-scons": "~2.20501.7" From 710b150fcdb7e385b185eb97caf530b5bc519102 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 28 Nov 2018 17:28:14 +0200 Subject: [PATCH 33/41] Switch PIO Home to native WebSockets (next step to PY3) --- platformio/managers/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/managers/core.py b/platformio/managers/core.py index d23bc35a..1c5a814f 100644 --- a/platformio/managers/core.py +++ b/platformio/managers/core.py @@ -26,7 +26,7 @@ from platformio.managers.package import PackageManager CORE_PACKAGES = { "contrib-piohome": "^2.0.0", "contrib-pysite": "^2.%d%d.0" % (sys.version_info[0], sys.version_info[1]), - "tool-pioplus": "^1.5.0", + "tool-pioplus": "^2.0.0", "tool-unity": "~1.20403.0", "tool-scons": "~2.20501.7" } From cf35f9dbf83f0b74632ec244e7838e74ba2b99f0 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 28 Nov 2018 21:32:37 +0200 Subject: [PATCH 34/41] Only patch versions are allowed for "contrib-pysite" --- platformio/managers/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/managers/core.py b/platformio/managers/core.py index 1c5a814f..2a516f04 100644 --- a/platformio/managers/core.py +++ b/platformio/managers/core.py @@ -25,7 +25,7 @@ from platformio.managers.package import PackageManager CORE_PACKAGES = { "contrib-piohome": "^2.0.0", - "contrib-pysite": "^2.%d%d.0" % (sys.version_info[0], sys.version_info[1]), + "contrib-pysite": "~2.%d%d.0" % (sys.version_info[0], sys.version_info[1]), "tool-pioplus": "^2.0.0", "tool-unity": "~1.20403.0", "tool-scons": "~2.20501.7" From a485e563f0762f5c7988f6f7593ab6764fbc9f32 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 29 Nov 2018 00:52:36 +0200 Subject: [PATCH 35/41] Bump version to 3.6.2rc1 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index 8ea1f915..1418404e 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, "2b6") +VERSION = (3, 6, "2rc1") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From 33ea6ef12319927743bcb2ee38b75fc70cf19381 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 29 Nov 2018 15:21:06 +0200 Subject: [PATCH 36/41] Be in silence when debug interpreter is run --- platformio/maintenance.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/platformio/maintenance.py b/platformio/maintenance.py index bafe4fa9..61811142 100644 --- a/platformio/maintenance.py +++ b/platformio/maintenance.py @@ -66,11 +66,13 @@ def on_platformio_exception(e): def in_silence(ctx=None): ctx = ctx or app.get_session_var("command_ctx") - assert ctx - ctx_args = ctx.args or [] - return ctx_args and any([ - ctx.args[0] == "upgrade", "--json-output" in ctx_args, - "--version" in ctx_args + if not ctx: + return True + return ctx.args and any([ + ctx.args[0] == "debug" and "--interpreter" in " ".join(ctx.args), + ctx.args[0] == "upgrade", + "--json-output" in ctx.args, + "--version" in ctx.args ]) From 16df5474e4a3d5d2edc9324c6dca8b7db84a450d Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 29 Nov 2018 15:59:22 +0200 Subject: [PATCH 37/41] VSCode IntelliSense config: Typo fix with useless bracket --- platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl index 0f6de48d..c90ca667 100644 --- a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl +++ b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl @@ -37,7 +37,7 @@ "databaseFilename": "${workspaceRoot}/.vscode/.browse.c_cpp.db", "path": [ % for include in cleaned_includes: - "{{! _escape(include) }}}", + "{{! _escape(include) }}", % end "" ] From 59a0d2b6188a521449202dc71cd7472a5f85d8e8 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 29 Nov 2018 16:02:59 +0200 Subject: [PATCH 38/41] Bump version to 3.6.2rc2 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index 1418404e..52d4607c 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, "2rc1") +VERSION = (3, 6, "2rc2") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From 6f01f10f598b1d2766b3277df257c7cb80fedf0c Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 29 Nov 2018 17:59:29 +0200 Subject: [PATCH 39/41] YAPF --- platformio/maintenance.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platformio/maintenance.py b/platformio/maintenance.py index 61811142..7894dbda 100644 --- a/platformio/maintenance.py +++ b/platformio/maintenance.py @@ -70,8 +70,7 @@ def in_silence(ctx=None): return True return ctx.args and any([ ctx.args[0] == "debug" and "--interpreter" in " ".join(ctx.args), - ctx.args[0] == "upgrade", - "--json-output" in ctx.args, + ctx.args[0] == "upgrade", "--json-output" in ctx.args, "--version" in ctx.args ]) From d87ee0b2860fb0cc76b5c3e5277e918283b77152 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 29 Nov 2018 18:00:52 +0200 Subject: [PATCH 40/41] Bump docs --- docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs b/docs index d696c0d5..cfdb7d89 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit d696c0d52fa5a779085a1e695672b9cfcd2ac824 +Subproject commit cfdb7d89681470706bb6bb2c5ea8e9356475f1cd From 8ef6ea805355a1d9710e0a4e0e0d253438ebd581 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 29 Nov 2018 18:02:49 +0200 Subject: [PATCH 41/41] Bump version to 3.6.2 --- HISTORY.rst | 2 +- platformio/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 2b78b705..120c45cb 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,7 +4,7 @@ Release Notes PlatformIO 3.0 -------------- -3.6.2 (2018-??-??) +3.6.2 (2018-11-29) ~~~~~~~~~~~~~~~~~~ * Improved IntelliSense for `PlatformIO IDE for VSCode `__ via passing extra compiler information for C/C++ Code Parser (resolves issues with spurious project's "Problems") diff --git a/platformio/__init__.py b/platformio/__init__.py index 52d4607c..e4a8ed38 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 6, "2rc2") +VERSION = (3, 6, 2) __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio"