Merge branch 'develop' into feature/v7

# Conflicts:
#	platformio/project/integration/tpls/clion/CMakeListsPrivate.txt.tpl

HISTORY.rst

@@ -13,9 +13,14 @@ Release Notes
 PlatformIO Core 6
 -----------------
 
-**A professional collaborative platform for declarative, safety-critical, and test-driven embedded development.**
+Unlock the true potential of embedded software development with
+PlatformIO's collaborative ecosystem, embracing declarative principles,
+test-driven methodologies, and modern toolchains for unrivaled success.
 
-6.1.10 (2023-??-??)
+6.1.11 (2023-??-??)
+~~~~~~~~~~~~~~~~~~~
+
+6.1.10 (2023-08-11)
 ~~~~~~~~~~~~~~~~~~~
 
 * Resolved an issue that caused generated projects for `PlatformIO IDE for VSCode <https://docs.platformio.org/en/latest/integration/ide/vscode.html>`__ to break when the ``-iprefix`` compiler flag was used

README.rst

@@ -36,9 +36,11 @@ PlatformIO Core
 .. image:: https://raw.githubusercontent.com/platformio/platformio-web/develop/app/images/platformio-ide-laptop.png
     :target: https://platformio.org?utm_source=github&utm_medium=core
 
-`PlatformIO <https://platformio.org>`_ is a professional collaborative platform for embedded development.
+`PlatformIO <https://platformio.org>`_: Your Gateway to Embedded Software Development Excellence.
 
-**A place where Developers and Teams have true Freedom! No more vendor lock-in!**
+Unlock the true potential of embedded software development with
+PlatformIO's collaborative ecosystem, embracing declarative principles,
+test-driven methodologies, and modern toolchains for unrivaled success.
 
 * Open source, maximum permissive Apache 2.0 license
 * Cross-platform IDE and Unified Debugger

platformio/__init__.py

@@ -12,20 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (6, 1, "10a4")
+VERSION = (6, 1, "11a1")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
 __description__ = (
-    "A professional collaborative platform for embedded development. "
-    "Cross-platform IDE and Unified Debugger. "
-    "Static Code Analyzer and Remote Unit Testing. "
-    "Multi-platform and Multi-architecture Build System. "
-    "Firmware File Explorer and Memory Inspection. "
-    "IoT, Arduino, CMSIS, ESP-IDF, FreeRTOS, libOpenCM3, mbedOS, Pulp OS, SPL, "
-    "STM32Cube, Zephyr RTOS, ARM, AVR, Espressif (ESP8266/ESP32), FPGA, "
-    "MCS-51 (8051), MSP430, Nordic (nRF51/nRF52), NXP i.MX RT, PIC32, RISC-V, "
-    "STMicroelectronics (STM8/STM32), Teensy"
+    "Your Gateway to Embedded Software Development Excellence. "
+    "Unlock the true potential of embedded software development "
+    "with PlatformIO's collaborative ecosystem, embracing "
+    "declarative principles, test-driven methodologies, and "
+    "modern toolchains for unrivaled success."
 )
 __url__ = "https://platformio.org"
 

platformio/project/integration/tpls/clion/.gitignore.tpl

@@ -1,3 +1 @@
 .pio
-CMakeListsPrivate.txt
-cmake-build-*/ 

platformio/telemetry.py

@@ -27,7 +27,7 @@
 from platformio import __title__, __version__, app, exception, fs, util
 from platformio.cli import PlatformioCLI
 from platformio.debug.config.base import DebugConfigBase
-from platformio.http import HTTPSession, ensure_internet_on
+from platformio.http import HTTPSession
 from platformio.proc import is_ci
 from platformio.project.helpers import get_project_id
 
@@ -362,8 +362,6 @@ def postpone_events(events):
 
 
 def process_postponed_logs():
-    if not ensure_internet_on():
-        return None
     events = load_postponed_events()
     if not events:
         return None
@@ -377,4 +375,5 @@ def process_postponed_logs():
                 timestamp=event["timestamp"],
                 instant_sending=False,
             )
+    telemetry.send()
     return True

tests/commands/test_init.py

@@ -16,7 +16,6 @@
 import os
 
 from platformio.commands.boards import cli as cmd_boards
-from platformio.package.commands.exec import package_exec_cmd
 from platformio.project.commands.init import project_init_cmd
 from platformio.project.config import ProjectConfig
 from platformio.project.exception import ProjectEnvsNotAvailableError
@@ -216,82 +215,3 @@ def test_init_incorrect_board(clirunner):
     assert result.exit_code == 2
     assert "Error: Invalid value for" in result.output
     assert isinstance(result.exception, SystemExit)
-
-
-def test_init_ide_clion(clirunner, validate_cliresult, tmpdir):
-    project_dir = tmpdir.join("project").mkdir()
-    # Add extra libraries to cover cases with possible unwanted backslashes
-    lib_extra_dirs = tmpdir.join("extra_libs").mkdir()
-    extra_lib = lib_extra_dirs.join("extra_lib").mkdir()
-    extra_lib.join("extra_lib.h").write(" ")
-    extra_lib.join("extra_lib.cpp").write(" ")
-
-    with project_dir.as_cwd():
-        result = clirunner.invoke(
-            project_init_cmd,
-            [
-                "-b",
-                "uno",
-                "--ide",
-                "clion",
-                "--project-option",
-                "framework=arduino",
-                "--project-option",
-                "platform_packages=platformio/tool-ninja",
-                "--project-option",
-                "lib_extra_dirs=%s" % str(lib_extra_dirs),
-            ],
-        )
-
-        validate_cliresult(result)
-        assert all(
-            os.path.isfile(f) for f in ("CMakeLists.txt", "CMakeListsPrivate.txt")
-        )
-
-        project_dir.join("src").join("main.cpp").write(
-            """#include <Arduino.h>
-#include "extra_lib.h"
-void setup(){}
-void loop(){}
-"""
-        )
-        project_dir.join("build_dir").mkdir()
-        result = clirunner.invoke(
-            package_exec_cmd,
-            [
-                "-p",
-                "tool-cmake",
-                "--",
-                "cmake",
-                "-DCMAKE_BUILD_TYPE=uno",
-                "-DCMAKE_MAKE_PROGRAM=%s"
-                % os.path.join(
-                    ProjectConfig().get("platformio", "packages_dir"),
-                    "tool-ninja",
-                    "ninja",
-                ),
-                "-G",
-                "Ninja",
-                "-S",
-                str(project_dir),
-                "-B",
-                "build_dir",
-            ],
-        )
-        validate_cliresult(result)
-
-        # build
-        result = clirunner.invoke(
-            package_exec_cmd,
-            [
-                "-p",
-                "tool-cmake",
-                "--",
-                "cmake",
-                "--build",
-                "build_dir",
-                "--target",
-                "Debug",
-            ],
-        )
-        validate_cliresult(result)