Merge remote-tracking branch 'plotjuggler/main' into sync/main-to-internal-main-2026-05-29

Author: pabloinigoblasco

.github/workflows/cla.yml

@@ -1,9 +1,9 @@
 name: Linux CI
 on:
   push:
-    branches: [development, main]
+    branches: [main]
   pull_request:
-    branches: [development, main]
+    branches: [main]
     types: [opened, synchronize, reopened, ready_for_review]
   workflow_dispatch: {}
 

.github/workflows/linux-ci.yml

@@ -0,0 +1,48 @@
+name: macOS CI
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+    types: [opened, synchronize, reopened, ready_for_review]
+  workflow_dispatch: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    if: github.event.pull_request.draft == false
+    runs-on: macos-15-intel
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: conan-io/setup-conan@v1
+        with:
+          cache_packages: true
+
+      - name: Install cmake and ninja
+        run: pip install cmake ninja
+
+      - name: Conan install
+        run: >
+          conan install . --output-folder=build --build=missing
+          -s build_type=RelWithDebInfo -s compiler.cppstd=20
+          -o "plotjuggler_core/*:with_tests=True"
+          -o "plotjuggler_core/*:with_parquet_example=False"
+
+      - name: Configure
+        run: >
+          cmake -S . -B build -G Ninja
+          -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/build/conan_toolchain.cmake
+          -DCMAKE_BUILD_TYPE=RelWithDebInfo
+          -DPJ_BUILD_PARQUET_IMPORT_EXAMPLE=OFF
+
+      - name: Build
+        run: cmake --build build
+
+      - name: Test
+        env:
+          QT_QPA_PLATFORM: offscreen
+        run: ctest --test-dir build --output-on-failure

.github/workflows/macos-ci.yml

@@ -0,0 +1,25 @@
+name: pre-commit
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+    types: [opened, synchronize, reopened, ready_for_review]
+  workflow_dispatch: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  pre-commit:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - uses: pre-commit/action@v3.0.1

.github/workflows/pre-commit.yml

@@ -1,9 +1,9 @@
 name: Windows CI
 on:
   push:
-    branches: [development, main]
+    branches: [main]
   pull_request:
-    branches: [development, main]
+    branches: [main]
     types: [opened, synchronize, reopened, ready_for_review]
   workflow_dispatch: {}
 

.github/workflows/windows-ci.yml

@@ -81,6 +81,12 @@ add_library(pj_internal_fmt INTERFACE)
 target_compile_definitions(pj_internal_fmt INTERFACE FMT_HEADER_ONLY=1)
 target_link_libraries(pj_internal_fmt INTERFACE ${PJ_FMT_TARGET})
 
+# fast_float backs the floating-point branch of PJ::parseNumber. Header-only;
+# linked PRIVATE under a BUILD_INTERFACE scope by pj_base so it never appears
+# in the installed plotjuggler_coreTargets file. Conan ships the CMake
+# package under the capitalised name `FastFloat`.
+find_package(FastFloat REQUIRED)
+
 if(PJ_BUILD_DATASTORE)
   find_package(tsl-robin-map REQUIRED)
   if(PJ_BUILD_TESTS)
@@ -196,7 +202,7 @@ endif()
 if(PJ_INSTALL_SDK)
   include(CMakePackageConfigHelpers)
 
-  set(PJ_PACKAGE_VERSION "0.4.0")
+  set(PJ_PACKAGE_VERSION "0.5.0")
   set(PJ_PACKAGE_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/plotjuggler_core)
 
   install(EXPORT plotjuggler_coreTargets

CLA.md

@@ -7,7 +7,7 @@
   plugin_sdk   — umbrella for plugin authors (base + dialog SDK + parser SDK)
   plugin_host  — umbrella for host loaders (data_source/parser/toolbox/dialog)
 
-A consuming Conan recipe declares e.g. `plotjuggler_core/0.4.0` and then:
+A consuming Conan recipe declares e.g. `plotjuggler_core/0.5.0` and then:
 
     find_package(plotjuggler_core REQUIRED COMPONENTS plugin_sdk)
     target_link_libraries(my_plugin PRIVATE plotjuggler_core::plugin_sdk)
@@ -27,7 +27,7 @@
 
 class PlotjugglerCoreConan(ConanFile):
     name = "plotjuggler_core"
-    version = "0.4.0"
+    version = "0.5.0"
     # Apache-2.0 covers pj_base + pj_plugins (the plugin-facing SDK);
     # MPL-2.0 covers pj_datastore (the storage engine). See LICENSE.
     license = "Apache-2.0 AND MPL-2.0"
@@ -98,6 +98,18 @@ def requirements(self):
             transitive_libs=False,
         )
 
+        # fast_float backs the floating-point branch of PJ::parseNumber. It
+        # is header-only and stays private: never appears in any public
+        # pj_base header, never propagated to downstream consumers.
+        self.requires(
+            "fast_float/8.1.0",
+            headers=True,
+            libs=False,
+            visible=False,
+            transitive_headers=False,
+            transitive_libs=False,
+        )
+
         if self.options.with_datastore:
             # tsl-robin-map is header-only; nanoarrow is in public headers.
             self.requires("tsl-robin-map/1.4.0", transitive_headers=True)