From 38afa07dbe6ec4d088d566eff19889f03ec2b763 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 17 May 2022 19:10:54 +0300
Subject: [PATCH 1/2] Use Marshmallow v3.14.1 for Python 3.6

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 20585ab3..5df72834 100644
--- a/setup.py
+++ b/setup.py
@@ -28,9 +28,9 @@ from platformio import (
 
 minimal_requirements = [
     "bottle==0.12.*",
-    "click%s" % (">=8.0.3,<9" if sys.version_info >= (3, 7) else "==8.0.4"),
+    "click%s" % (">=8.0.4,<9" if sys.version_info >= (3, 7) else "==8.0.4"),
     "colorama",
-    "marshmallow==3.*",
+    "marshmallow==%s" % ("3.*" if sys.version_info >= (3, 7) else "3.14.1"),
     "pyelftools>=0.27,<1",
     "pyserial==3.*",
     "requests==2.*",

From cb7148d018ba065119036b7ad4e9a2ee5b4223da Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 17 May 2022 19:23:00 +0300
Subject: [PATCH 2/2] Bump version to 6.0.1

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

diff --git a/HISTORY.rst b/HISTORY.rst
index 3b5930ad..9426f0dd 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -12,7 +12,7 @@ PlatformIO Core 6
 
 **A professional collaborative platform for declarative, safety-critical, and test-driven embedded development.**
 
-6.0.1 (2022-05-??)
+6.0.1 (2022-05-17)
 ~~~~~~~~~~~~~~~~~~
 
 * Improved support for the renamed configuration options (`issue #4270 <https://github.com/platformio/platformio-core/issues/4270>`_)
diff --git a/docs b/docs
index 2ea85922..5bf0037c 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 2ea8592203cc647febcb1e13abca311a6ea99903
+Subproject commit 5bf0037c6679cccffbb835c30d729cd19120651b
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 1e3b1597..097088c0 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (6, 0, "1b1")
+VERSION = (6, 0, 1)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/telemetry.py b/platformio/telemetry.py
index 2792d5c6..ba721792 100644
--- a/platformio/telemetry.py
+++ b/platformio/telemetry.py
@@ -346,6 +346,7 @@ def dump_run_environment(options):
         "check_tool",
         "debug_tool",
         "monitor_filters",
+        "test_framework",
     ]
     safe_options = {k: v for k, v in options.items() if k in non_sensitive_data}
     if is_platformio_project(os.getcwd()):