From aa0df36c8a3d1f4c901fedb2dcba1b4b530df783 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 11 Aug 2023 13:49:03 +0300 Subject: [PATCH 1/2] Remove CLion from tests --- tests/commands/test_init.py | 80 ------------------------------------- 1 file changed, 80 deletions(-) diff --git a/tests/commands/test_init.py b/tests/commands/test_init.py index 80ef0d91..651cf579 100644 --- a/tests/commands/test_init.py +++ b/tests/commands/test_init.py @@ -16,7 +16,6 @@ import json 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 -#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) From 5cac6d8b88aed99a002284778662ba5241dd955b Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 31 Aug 2023 19:31:37 +0300 Subject: [PATCH 2/2] Bump version to 6.1.11 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index d8e1515b..c0226cf3 100644 --- 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, "12a1") +VERSION = (6, 1, 11) __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio"