Merge branch 'release/v6.1.5'

Author: ivankravets

.github/workflows/projects.yml

@@ -21,7 +21,7 @@ jobs:
           - smartknob:
             repository: "scottbez1/smartknob"
             folder: "smartknob"
-            config_dir: "smartknob/firmware"
+            config_dir: "smartknob"
             env_name: "view"
           - espurna:
             repository: "xoseperez/espurna"

HISTORY.rst

@@ -13,6 +13,15 @@ PlatformIO Core 6
 
 **A professional collaborative platform for declarative, safety-critical, and test-driven embedded development.**
 
+6.1.5 (2022-11-01)
+~~~~~~~~~~~~~~~~~~
+
+* Added a new `enable_proxy_strict_ssl <https://docs.platformio.org/en/latest/core/userguide/cmd_settings.html>`__ setting to disable the proxy server certificate verification (`issue #4432 <https://github.com/platformio/platformio-core/issues/4432>`_)
+* Documented `PlatformIO Core Proxy Configuration <https://docs.platformio.org/en/latest/core/installation/proxy-configuration.html>`__
+* Speeded up device port finder by avoiding loading board HWIDs from development platforms
+* Improved caching of build metadata in debug mode
+* Fixed an issue when `pio pkg install --storage-dir <https://docs.platformio.org/en/latest/core/userguide/pkg/cmd_install.html>`__ command requires PlatformIO project (`issue #4410 <https://github.com/platformio/platformio-core/issues/4410>`_)
+
 6.1.4 (2022-08-12)
 ~~~~~~~~~~~~~~~~~~
 

docs

@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (6, 1, 4)
+VERSION = (6, 1, 5)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
@@ -44,8 +44,6 @@
 ]
 __pioremote_endpoint__ = "ssl:host=remote.platformio.org:port=4413"
 
-__default_requests_timeout__ = (10, None)  # (connect, read)
-
 __core_packages__ = {
     "contrib-piohome": "~3.4.2",
     "contrib-pysite": "~2.%d%d.0" % (sys.version_info.major, sys.version_info.minor),

platformio/__init__.py

@@ -58,6 +58,10 @@ def projects_dir_validate(projects_dir):
         "value": get_default_projects_dir(),
         "validator": projects_dir_validate,
     },
+    "enable_proxy_strict_ssl": {
+        "description": "Verify the proxy server certificate against the list of supplied CAs",
+        "value": True,
+    },
 }
 
 SESSION_VARS = {

platformio/app.py

@@ -24,7 +24,7 @@
 
 
 def IsIntegrationDump(_):
-    return set(["_idedata", "idedata"]) & set(COMMAND_LINE_TARGETS)
+    return set(["__idedata", "idedata"]) & set(COMMAND_LINE_TARGETS)
 
 
 def DumpIntegrationIncludes(env):
@@ -147,6 +147,7 @@ def _subst_cmd(env, cmd):
 def DumpIntegrationData(*args):
     projenv, globalenv = args[0:2]  # pylint: disable=unbalanced-tuple-unpacking
     data = {
+        "build_type": globalenv.GetBuildType(),
         "env_name": globalenv["PIOENV"],
         "libsource_dirs": [
             globalenv.subst(item) for item in globalenv.GetLibSourceDirs()

platformio/builder/tools/piointegration.py

@@ -145,7 +145,7 @@ def server_ready_pattern(self):
         )
 
     def _load_build_data(self):
-        data = load_build_metadata(os.getcwd(), self.env_name, cache=True)
+        data = load_build_metadata(os.getcwd(), self.env_name, cache=True, debug=True)
         if data:
             return data
         raise DebugInvalidOptionsError("Could not load a build configuration")

platformio/debug/config/base.py

@@ -14,6 +14,7 @@
 
 import os
 from fnmatch import fnmatch
+from functools import lru_cache
 
 import click
 import serial
@@ -119,6 +120,8 @@ def match_serial_port(pattern):
 
     @staticmethod
     def match_device_hwid(patterns):
+        if not patterns:
+            return None
         for item in list_serial_ports(as_objects=True):
             if not item.vid or not item.pid:
                 continue
@@ -143,10 +146,10 @@ def find(self, initial_port=None):
         if not device:
             device = self._find_known_device()
         if device:
-            port = self._reveal_device_port(device)
+            return self._reveal_device_port(device)
 
         # pick the best PID:VID USB device
-        best_port = None
+        port = best_port = None
         for item in list_serial_ports():
             if self.ensure_ready and not is_serial_port_ready(item["port"]):
                 continue
@@ -215,20 +218,26 @@ def _find_known_device(self):
         if os.path.isfile(udev_rules_path):
             hwids.extend(parse_udev_rules_hwids(udev_rules_path))
 
-        # load from installed dev-platforms
-        for platform in PlatformPackageManager().get_installed():
-            p = PlatformFactory.new(platform)
-            for board_config in p.get_boards().values():
-                for board_hwid in board_config.get("build.hwids", []):
-                    board_hwid = self.normalize_board_hwid(board_hwid)
-                    if board_hwid not in hwids:
-                        hwids.append(board_hwid)
+        @lru_cache(maxsize=1)
+        def _fetch_hwids_from_platforms():
+            """load from installed dev-platforms"""
+            result = []
+            for platform in PlatformPackageManager().get_installed():
+                p = PlatformFactory.new(platform)
+                for board_config in p.get_boards().values():
+                    for board_hwid in board_config.get("build.hwids", []):
+                        board_hwid = self.normalize_board_hwid(board_hwid)
+                        if board_hwid not in result:
+                            result.append(board_hwid)
+            return result
 
         try:
 
             @retry(timeout=self.timeout)
             def wrapper():
                 device = self.match_device_hwid(hwids)
+                if not device:
+                    device = self.match_device_hwid(_fetch_hwids_from_platforms())
                 if device:
                     return device
                 raise retry.RetryNextException()

platformio/device/finder.py

@@ -14,15 +14,15 @@
 
 import socket
 
-import requests
 from starlette.concurrency import run_in_threadpool
 
 from platformio import util
 from platformio.compat import IS_WINDOWS
+from platformio.http import HTTPSession
 from platformio.proc import where_is_program
 
 
-class AsyncSession(requests.Session):
+class AsyncSession(HTTPSession):
     async def request(  # pylint: disable=signature-differs,invalid-overridden-method
         self, *args, **kwargs
     ):

platformio/home/helpers.py

@@ -20,7 +20,7 @@
 
 import click
 
-from platformio import __default_requests_timeout__, fs
+from platformio import fs
 from platformio.cache import ContentCache
 from platformio.device.list.util import list_logical_devices
 from platformio.home import helpers
@@ -50,13 +50,9 @@ async def fetch_content(uri, data=None, headers=None, cache_valid=None):
 
         session = helpers.requests_session()
         if data:
-            r = await session.post(
-                uri, data=data, headers=headers, timeout=__default_requests_timeout__
-            )
+            r = await session.post(uri, data=data, headers=headers)
         else:
-            r = await session.get(
-                uri, headers=headers, timeout=__default_requests_timeout__
-            )
+            r = await session.get(uri, headers=headers)
 
         r.raise_for_status()
         result = r.text