Merge branch 'release/v6.1.3'

HISTORY.rst

@@ -13,6 +13,11 @@ PlatformIO Core 6
 
 **A professional collaborative platform for declarative, safety-critical, and test-driven embedded development.**
 
+6.1.3 (2022-07-18)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed a regression bug when opening device monitor without any filters (`issue #4363 <https://github.com/platformio/platformio-core/issues/4363>`_)
+
 6.1.2 (2022-07-18)
 ~~~~~~~~~~~~~~~~~~
 

platformio/__init__.py

@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (6, 1, 2)
+VERSION = (6, 1, 3)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"

platformio/account/validate.py

@@ -32,7 +32,7 @@ def validate_username(value, field="username"):
 
 def validate_email(value):
     value = str(value).strip()
-    if not re.match(r"^[a-z\d_.+-]+@[a-z\d\-]+\.[a-z\d\-.]+$", value, flags=re.I):
+    if not re.match(r"^[a-z\d_\.\+\-]+@[a-z\d\-]+\.[a-z\d\-\.]+$", value, flags=re.I):
         raise click.BadParameter("Invalid email address")
     return value
 

platformio/device/monitor/command.py

@@ -139,15 +139,16 @@ def device_monitor_cmd(**options):
         )
 
     # check for unknown filters
-    known_filters = set(get_available_filters())
-    unknown_filters = set(options["filters"]) - known_filters
-    if unknown_filters:
-        options["filters"] = list(known_filters & set(options["filters"]))
-        click.secho(
-            ("Warning! Skipping unknown filters `%s`. Known filters are `%s`")
-            % (", ".join(unknown_filters), ", ".join(sorted(known_filters))),
-            fg="yellow",
-        )
+    if options["filters"]:
+        known_filters = set(get_available_filters())
+        unknown_filters = set(options["filters"]) - known_filters
+        if unknown_filters:
+            options["filters"] = list(known_filters & set(options["filters"]))
+            click.secho(
+                ("Warning! Skipping unknown filters `%s`. Known filters are `%s`")
+                % (", ".join(unknown_filters), ", ".join(sorted(known_filters))),
+                fg="yellow",
+            )
 
     start_terminal(options)