From 741e9a40b3107beea59f50f4ab9dc7713abb00cd Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Mon, 18 Jul 2022 17:27:13 +0300
Subject: [PATCH 1/4] Bump version to 6.1.3a1

---
 platformio/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio/__init__.py b/platformio/__init__.py
index 594635e6..98195a05 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (6, 1, 2)
+VERSION = (6, 1, "3a1")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"

From d92e36efa0309893796845eccf21a48d093b08ea Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Mon, 18 Jul 2022 18:06:37 +0300
Subject: [PATCH 2/4] Minor fixes to email regexp

---
 platformio/account/validate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio/account/validate.py b/platformio/account/validate.py
index 69efb753..7fb77222 100644
--- a/platformio/account/validate.py
+++ b/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
 

From 8c2a7df53ec230e07e440650d1f67a3a8b7739c6 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Mon, 18 Jul 2022 20:46:27 +0300
Subject: [PATCH 3/4] Fixed a regression bug when opening device monitor
 without any filters // Resolve #4363

---
 HISTORY.rst                          |  5 +++++
 platformio/device/monitor/command.py | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index db6444eb..1a276e45 100644
--- a/HISTORY.rst
+++ b/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-??)
+~~~~~~~~~~~~~~~~~~
+
+* 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)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/device/monitor/command.py b/platformio/device/monitor/command.py
index 11a1afdf..8ba61677 100644
--- a/platformio/device/monitor/command.py
+++ b/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)
 

From 72ac6c86df352b77103bc8b8c109c490e9c860aa Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Mon, 18 Jul 2022 20:48:10 +0300
Subject: [PATCH 4/4] Bump version to v6.1.3

---
 HISTORY.rst            | 2 +-
 docs                   | 2 +-
 platformio/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 1a276e45..33bf355d 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -13,7 +13,7 @@ PlatformIO Core 6
 
 **A professional collaborative platform for declarative, safety-critical, and test-driven embedded development.**
 
-6.1.3 (2022-07-??)
+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>`_)
diff --git a/docs b/docs
index 0a58185b..beb6d196 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 0a58185b4a983db4478cfba41307b02f22461543
+Subproject commit beb6d196ead70c1025340005ba007b3dee11e92a
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 98195a05..703712d9 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (6, 1, "3a1")
+VERSION = (6, 1, 3)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"