Merge branch 'develop'

OS-Q · Aug 3, 2024 · c016c6b · c016c6b
2 parents 2f11f82 + eeb5ac4
commit c016c6b
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [3.7, 3.11]
+        python-version: ["3.11", "3.12"]
 
     runs-on: ${{ matrix.os }}
 

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -21,6 +21,9 @@ test-driven methodologies, and modern toolchains for unrivaled success.
 6.1.16 (2024-??-??)
 ~~~~~~~~~~~~~~~~~~~
 
+* Upgraded the `Doctest <https://docs.platformio.org/en/latest/advanced/unit-testing/frameworks/doctest.html>`__ testing framework to version 2.4.11, the `GoogleTest <https://docs.platformio.org/en/latest/advanced/unit-testing/frameworks/doctest.html>`__ to version 1.15.2, and the `Unity <https://docs.platformio.org/en/latest/advanced/unit-testing/frameworks/unity.html>`__ to version 2.6.0, incorporating the latest features and improvements for enhanced testing capabilities
+* Corrected an issue where the incorrect public class was imported for the ``DoctestTestRunner`` (`issue #4949 <https://github.com/platformio/platformio-core/issues/4949>`_)
+
 6.1.15 (2024-04-25)
 ~~~~~~~~~~~~~~~~~~~
 

diff --git 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 = (6, 1, "16a1")
+VERSION = (6, 1, "16b1")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"

diff --git a/platformio/assets/system/99-platformio-udev.rules b/platformio/assets/system/99-platformio-udev.rules
@@ -178,3 +178,6 @@ ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2107", MODE="0666", ENV{ID_MM_DEVICE
 
 # Espressif USB JTAG/serial debug unit
 ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1001", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1"
+
+# Zephyr framework USB CDC-ACM
+ATTRS{idVendor}=="2fe3", ATTRS{idProduct}=="0100", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1"
diff --git a/platformio/dependencies.py b/platformio/dependencies.py
@@ -44,8 +44,8 @@ def get_pip_dependencies():
     home = [
         # PIO Home requirements
         "ajsonrpc == 1.2.*",
-        "starlette >=0.19, <0.38",
-        "uvicorn %s" % ("== 0.16.0" if PY36 else ">=0.16, <0.30"),
+        "starlette >=0.19, <0.39",
+        "uvicorn %s" % ("== 0.16.0" if PY36 else ">=0.16, <0.31"),
         "wsproto == 1.*",
     ]
 

diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
@@ -276,7 +276,7 @@ def validate_license(self, value):
     @staticmethod
     @memoized(expire="1h")
     def load_spdx_licenses():
-        version = "3.23"
+        version = "3.24.0"
         spdx_data_url = (
             "https://raw.githubusercontent.com/spdx/license-list-data/"
             f"v{version}/json/licenses.json"

diff --git a/platformio/public.py b/platformio/public.py
@@ -23,7 +23,7 @@
 from platformio.project.options import get_config_options_schema
 from platformio.test.result import TestCase, TestCaseSource, TestStatus
 from platformio.test.runners.base import TestRunnerBase
-from platformio.test.runners.doctest import DoctestTestCaseParser
+from platformio.test.runners.doctest import DoctestTestRunner
 from platformio.test.runners.googletest import GoogletestTestRunner
 from platformio.test.runners.unity import UnityTestRunner
 from platformio.util import get_systype
diff --git a/platformio/test/runners/doctest.py b/platformio/test/runners/doctest.py
@@ -101,7 +101,7 @@ def _parse_assert(self, line):
 
 
 class DoctestTestRunner(TestRunnerBase):
-    EXTRA_LIB_DEPS = ["doctest/doctest@^2.4.9"]
+    EXTRA_LIB_DEPS = ["doctest/doctest@^2.4.11"]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

diff --git a/platformio/test/runners/googletest.py b/platformio/test/runners/googletest.py
@@ -88,7 +88,7 @@ def _parse_source_and_message(self, stdout):
 
 
 class GoogletestTestRunner(TestRunnerBase):
-    EXTRA_LIB_DEPS = ["google/googletest@^1.12.1"]
+    EXTRA_LIB_DEPS = ["google/googletest@^1.15.2"]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

diff --git a/platformio/test/runners/unity.py b/platformio/test/runners/unity.py
@@ -26,7 +26,7 @@
 
 
 class UnityTestRunner(TestRunnerBase):
-    EXTRA_LIB_DEPS = ["throwtheswitch/Unity@^2.5.2"]
+    EXTRA_LIB_DEPS = ["throwtheswitch/Unity@^2.6.0"]
 
     # Examples:
     # test/test_foo.cpp:44:test_function_foo:FAIL: Expected 32 Was 33