Skip to content

Commit 8dc20f9

Browse files
committed
Merge branch 'release/v6.1.3'
2 parents 7527143 + 72ac6c8 commit 8dc20f9

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

HISTORY.rst

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ PlatformIO Core 6
1313

1414
**A professional collaborative platform for declarative, safety-critical, and test-driven embedded development.**
1515

16+
6.1.3 (2022-07-18)
17+
~~~~~~~~~~~~~~~~~~
18+
19+
* Fixed a regression bug when opening device monitor without any filters (`issue #4363 <https://github.com/platformio/platformio-core/issues/4363>`_)
20+
1621
6.1.2 (2022-07-18)
1722
~~~~~~~~~~~~~~~~~~
1823

docs

Submodule docs updated from 0a58185 to beb6d19

platformio/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import sys
1616

17-
VERSION = (6, 1, 2)
17+
VERSION = (6, 1, 3)
1818
__version__ = ".".join([str(s) for s in VERSION])
1919

2020
__title__ = "platformio"

platformio/account/validate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def validate_username(value, field="username"):
3232

3333
def validate_email(value):
3434
value = str(value).strip()
35-
if not re.match(r"^[a-z\d_.+-]+@[a-z\d\-]+\.[a-z\d\-.]+$", value, flags=re.I):
35+
if not re.match(r"^[a-z\d_\.\+\-]+@[a-z\d\-]+\.[a-z\d\-\.]+$", value, flags=re.I):
3636
raise click.BadParameter("Invalid email address")
3737
return value
3838

platformio/device/monitor/command.py

+10-9
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,16 @@ def device_monitor_cmd(**options):
139139
)
140140

141141
# check for unknown filters
142-
known_filters = set(get_available_filters())
143-
unknown_filters = set(options["filters"]) - known_filters
144-
if unknown_filters:
145-
options["filters"] = list(known_filters & set(options["filters"]))
146-
click.secho(
147-
("Warning! Skipping unknown filters `%s`. Known filters are `%s`")
148-
% (", ".join(unknown_filters), ", ".join(sorted(known_filters))),
149-
fg="yellow",
150-
)
142+
if options["filters"]:
143+
known_filters = set(get_available_filters())
144+
unknown_filters = set(options["filters"]) - known_filters
145+
if unknown_filters:
146+
options["filters"] = list(known_filters & set(options["filters"]))
147+
click.secho(
148+
("Warning! Skipping unknown filters `%s`. Known filters are `%s`")
149+
% (", ".join(unknown_filters), ", ".join(sorted(known_filters))),
150+
fg="yellow",
151+
)
151152

152153
start_terminal(options)
153154

0 commit comments

Comments
 (0)