From 0acfc25d56f621363dba6cc767a2fff8870617fa Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 21 Mar 2024 21:30:22 +0200 Subject: [PATCH 1/6] Bump version to 6.1.15a1 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index 9bb65b5a..83292304 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, 14) +VERSION = (6, 1, "15a1") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From 2bad42ecb1271a52203f585b970e13466c2cddb1 Mon Sep 17 00:00:00 2001 From: soiamsoNG Date: Sat, 23 Mar 2024 22:26:25 +0800 Subject: [PATCH 2/6] Update 99-platformio-udev.rules (#4880) Fix typo --- platformio/assets/system/99-platformio-udev.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/assets/system/99-platformio-udev.rules b/platformio/assets/system/99-platformio-udev.rules index d17569e7..08817377 100644 --- a/platformio/assets/system/99-platformio-udev.rules +++ b/platformio/assets/system/99-platformio-udev.rules @@ -177,4 +177,4 @@ ATTRS{product}=="*CMSIS-DAP*", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2107", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1" # Espressif USB JTAG/serial debug unit -ATTRS{idVendor}=="303a", ATTR{idProduct}=="1001", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1" +ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1001", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1" From c475578db698fe2828b5a602af08d4e062145137 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 26 Mar 2024 13:44:26 +0200 Subject: [PATCH 3/6] Resolved an issue where the |LDF| couldn't locate a library dependency declared via version control system repository // Resolve #4885 --- HISTORY.rst | 5 +++++ platformio/builder/tools/piolib.py | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 6c83cbb5..4013392e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -18,6 +18,11 @@ 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.15 (2024-??-??) +~~~~~~~~~~~~~~~~~~~ + +* Resolved an issue where the |LDF| couldn't locate a library dependency declared via version control system repository (`issue #4885 `_) + 6.1.14 (2024-03-21) ~~~~~~~~~~~~~~~~~~~ diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index d970344e..ca9c9f1e 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -39,7 +39,7 @@ from platformio.package.manifest.parser import ( ManifestParserError, ManifestParserFactory, ) -from platformio.package.meta import PackageCompatibility, PackageItem +from platformio.package.meta import PackageCompatibility, PackageItem, PackageSpec from platformio.project.options import ProjectOptions @@ -332,9 +332,17 @@ class LibBuilderBase: qualifiers = {"name": pkg.metadata.name, "version": pkg.metadata.version} if pkg.metadata.spec and pkg.metadata.spec.owner: qualifiers["owner"] = pkg.metadata.spec.owner - return PackageCompatibility.from_dependency( - {k: v for k, v in dependency.items() if k in ("owner", "name", "version")} - ).is_compatible(PackageCompatibility(**qualifiers)) + dep_qualifiers = { + k: v for k, v in dependency.items() if k in ("owner", "name", "version") + } + if ( + "version" in dep_qualifiers + and not PackageSpec(dep_qualifiers["version"]).requirements + ): + del dep_qualifiers["version"] + return PackageCompatibility.from_dependency(dep_qualifiers).is_compatible( + PackageCompatibility(**qualifiers) + ) def get_search_files(self): return [ From 591b377e4a4f7219b95531e447aec8d28fd41a79 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 29 Mar 2024 21:33:54 +0200 Subject: [PATCH 4/6] Sync docs --- docs | 2 +- examples | 2 +- scripts/docspregen.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs b/docs index 670721e9..6493e4c2 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 670721e9231cdedd1e28f9826759f7db70cab0e8 +Subproject commit 6493e4c239c7775beca175e06207a2fb76a93352 diff --git a/examples b/examples index f06e9656..9b393441 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit f06e9656a490c17b9193ce78dca8df4c7a6cb82e +Subproject commit 9b3934418378480ee1f04cc99941e9d46b167bfa diff --git a/scripts/docspregen.py b/scripts/docspregen.py index 1b595b3f..3693d9cb 100644 --- a/scripts/docspregen.py +++ b/scripts/docspregen.py @@ -357,6 +357,8 @@ Packages - Description""" ) for name, options in dict(sorted(packages.items())).items(): + if name == "toolchain-gccarmnoneeab": # aceinna typo fix + name = name + "i" package = REGCLIENT.get_package( "tool", options.get("owner", "platformio"), name ) From cdac7d497c68a1e196ba8ac121adf6de3fe261d2 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 24 Apr 2024 23:08:00 +0300 Subject: [PATCH 5/6] Resolved an issue related to the inaccurate detection of the Clang compiler // Resolve #4897 --- HISTORY.rst | 1 + platformio/builder/tools/piomisc.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 4013392e..b6b5a980 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -22,6 +22,7 @@ test-driven methodologies, and modern toolchains for unrivaled success. ~~~~~~~~~~~~~~~~~~~ * Resolved an issue where the |LDF| couldn't locate a library dependency declared via version control system repository (`issue #4885 `_) +* Resolved an issue related to the inaccurate detection of the Clang compiler (`pull #4897 `_) 6.1.14 (2024-03-21) ~~~~~~~~~~~~~~~~~~~ diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py index 47496fe5..9652c400 100644 --- a/platformio/builder/tools/piomisc.py +++ b/platformio/builder/tools/piomisc.py @@ -20,19 +20,23 @@ from platformio.proc import exec_command @util.memoized() -def GetCompilerType(env): - if env.subst("$CC").endswith("-gcc"): +def GetCompilerType(env): # pylint: disable=too-many-return-statements + CC = env.subst("$CC") + if CC.endswith("-gcc"): return "gcc" + if os.path.basename(CC) == "clang": + return "clang" try: + sysenv = os.environ.copy() sysenv["PATH"] = str(env["ENV"]["PATH"]) - result = exec_command([env.subst("$CC"), "-v"], env=sysenv) + result = exec_command([CC, "-v"], env=sysenv) except OSError: return None if result["returncode"] != 0: return None output = "".join([result["out"], result["err"]]).lower() - if "clang" in output and "LLVM" in output: + if "clang version" in output: return "clang" if "gcc" in output: return "gcc" From 956f21b639ad8e2c12b11aba01c3b69ec171904f Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 25 Apr 2024 11:37:28 +0300 Subject: [PATCH 6/6] Bump version to 6.1.15 --- HISTORY.rst | 2 +- docs | 2 +- platformio/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index b6b5a980..33301fca 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -18,7 +18,7 @@ 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.15 (2024-??-??) +6.1.15 (2024-04-25) ~~~~~~~~~~~~~~~~~~~ * Resolved an issue where the |LDF| couldn't locate a library dependency declared via version control system repository (`issue #4885 `_) diff --git a/docs b/docs index 6493e4c2..0125f8d5 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 6493e4c239c7775beca175e06207a2fb76a93352 +Subproject commit 0125f8d5bec0e906ed04aba5dcd0d70ad794b30f diff --git a/platformio/__init__.py b/platformio/__init__.py index 83292304..878e6329 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, "15a1") +VERSION = (6, 1, 15) __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio"