diff --git a/HISTORY.rst b/HISTORY.rst index 4771a3c088..9606fdd925 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -6,6 +6,13 @@ Release Notes PlatformIO Core 4 ----------------- +4.3.1 (2020-03-20) +~~~~~~~~~~~~~~~~~~ + +* Fixed a SyntaxError "'return' with argument inside generator" for PIO Unified Debugger when Python 2.7 is used +* Fixed an issue when ``lib_archive = no`` was not honored in `"platformio.ini" `__ +* Fixed an TypeError "super(type, obj): obj must be an instance or subtype of type" when device monitor is used with a custom dev-platform filter (`issue #3431 `_) + 4.3.0 (2020-03-19) ~~~~~~~~~~~~~~~~~~ diff --git a/docs b/docs index 51b7dd49b7..d97117eb2e 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 51b7dd49b703fd6156375a93d4bbb6e0890ecb09 +Subproject commit d97117eb2e40380c309d1ef86ebf3501c673f270 diff --git a/platformio/__init__.py b/platformio/__init__.py index c5dd8dcce8..afa9e24dee 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -VERSION = (4, 3, 0) +VERSION = (4, 3, 1) __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index c9c97e2876..5e61abffaf 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -723,7 +723,9 @@ def lib_archive(self): "env:" + self.env["PIOENV"], "lib_archive", missing ) if global_value != missing: - return global_value + return self.env.GetProjectConfig().get( + "env:" + self.env["PIOENV"], "lib_archive" + ) return self._manifest.get("build", {}).get( "libArchive", LibBuilderBase.lib_archive.fget(self) ) diff --git a/platformio/commands/debug/server.py b/platformio/commands/debug/server.py index 29a006780f..ef06b58c93 100644 --- a/platformio/commands/debug/server.py +++ b/platformio/commands/debug/server.py @@ -42,11 +42,11 @@ def spawn(self, patterns): # pylint: disable=too-many-branches systype = util.get_systype() server = self.debug_options.get("server") if not server: - return None + defer.returnValue(None) server = self.apply_patterns(server, patterns) server_executable = server["executable"] if not server_executable: - return None + defer.returnValue(None) if server["cwd"]: server_executable = join(server["cwd"], server_executable) if ( @@ -83,7 +83,7 @@ def spawn(self, patterns): # pylint: disable=too-many-branches ) self._debug_port = '| "%s" %s' % (server_executable, str_args) self._debug_port = fs.to_unix_path(self._debug_port) - return self._debug_port + defer.returnValue(self._debug_port) env = os.environ.copy() # prepend server "lib" folder to LD path @@ -120,7 +120,7 @@ def spawn(self, patterns): # pylint: disable=too-many-branches yield self._wait_until_ready() - return self._debug_port + defer.returnValue(self._debug_port) @defer.inlineCallbacks def _wait_until_ready(self): diff --git a/platformio/commands/device/filters/base.py b/platformio/commands/device/filters/base.py index bc0880b35b..5c6d0400f1 100644 --- a/platformio/commands/device/filters/base.py +++ b/platformio/commands/device/filters/base.py @@ -20,7 +20,7 @@ class DeviceMonitorFilter(miniterm.Transform): def __init__(self, project_dir=None, environment=None): """ Called by PlatformIO to pass context """ - super(DeviceMonitorFilter, self).__init__() + miniterm.Transform.__init__(self) self.project_dir = project_dir self.environment = environment diff --git a/setup.py b/setup.py index 2d3cd72f4e..512d2757ab 100644 --- a/setup.py +++ b/setup.py @@ -23,12 +23,12 @@ __url__, __version__, ) -from platformio.compat import PY2 +from platformio.compat import PY2, WINDOWS install_requires = [ "bottle<0.13", - "click>=5,<8,!=7.1,!=7.1.1", + "click>=5,<8%s" % (",!=7.1,!=7.1.1" if WINDOWS else ""), "colorama", "pyserial>=3,<4,!=3.3", "requests>=2.4.0,<3",