From 9ac4e003f1415385de05f017b238072745bb4e60 Mon Sep 17 00:00:00 2001 From: Seth Bromberger Date: Wed, 4 Mar 2026 16:22:44 -0800 Subject: [PATCH 1/3] bumped jsonlogic version --- py/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/requirements.txt b/py/requirements.txt index c6bcb4a..231ab37 100644 --- a/py/requirements.txt +++ b/py/requirements.txt @@ -1,2 +1,2 @@ semver >= 3.0 -jsonlogic-py == 0.2.1 +jsonlogic-py == 0.2.2 From ab6f68e56694e434d19e8255d4c3b3a9449c9693 Mon Sep 17 00:00:00 2001 From: Seth Bromberger Date: Sat, 7 Mar 2026 20:52:22 +0000 Subject: [PATCH 2/3] devcontainer + 0.5.2 version --- .devcontainer/devcontainer.json | 17 +++++++++++++---- cpp/CMakeLists.txt | 9 +++++---- cpp/examples/CMakeLists.txt | 2 +- py/pyproject.toml | 2 +- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8399eb1..83a5e07 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -12,10 +12,19 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "ms-python.python" - // add other extensions as needed - ] + "ms-vscode.cmake-tools", + "ms-python.python", + "charliermarsh.ruff" + ], + "settings": { + "[cpp]": { + "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd" + }, + "clangd.checkUpdates": true, + "cmake.debugConfig": { "MIMode": "lldb" }, + "cmake.options.statusBarVisibility": "compact" + } } - }, + } //"postCreateCommand": "pip install --break-system-packages -r ${containerWorkspaceFolder}/test/requirements.txt" } \ No newline at end of file diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 819b18a..5c9451a 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_policy(SET CMP0135 NEW) endif() project(CLIPPy - VERSION 0.5.1 + VERSION 0.5.2 DESCRIPTION "Command Line Interface Plus Python" LANGUAGES CXX) @@ -59,7 +59,7 @@ set(JSONLOGIC_FETCH_GIT "https://github.com/LLNL/jsonlogic.git" CACHE STRING "GIT to fetch JsonLogic") -set(BOOST_INCLUDE_LIBRARIES json lexical_cast range) +set(BOOST_INCLUDE_LIBRARIES json lexical_cast range regex) set(BUILD_SHARED_LIBS ON) FetchContent_Declare( Boost @@ -69,11 +69,12 @@ FetchContent_MakeAvailable(Boost) # # JSONLogic -set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/boost-install) # needed for jsonlogic +# set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/boost-install) # needed for jsonlogic +set(Boost_INCLUDE_DIR ${boost_SOURCE_DIR}) FetchContent_Declare(jsonlogic GIT_REPOSITORY ${JSONLOGIC_FETCH_GIT} - GIT_TAG v0.2.0 + GIT_TAG v0.2.3 SOURCE_SUBDIR cpp ) # set(jsonlogic_INCLUDE_DIR ${jsonlogic_SOURCE_DIR}/cpp/include/jsonlogic) diff --git a/cpp/examples/CMakeLists.txt b/cpp/examples/CMakeLists.txt index 39c6759..ff0627c 100644 --- a/cpp/examples/CMakeLists.txt +++ b/cpp/examples/CMakeLists.txt @@ -19,7 +19,7 @@ function ( add_test class_name method_name ) include/ ${jsonlogic_SOURCE_DIR}/cpp/include ) - target_link_libraries(${target} PRIVATE Boost::json) + target_link_libraries(${target} PRIVATE Boost::json Boost::regex) endfunction() diff --git a/py/pyproject.toml b/py/pyproject.toml index 00cdace..2f2f068 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "llnl-clippy" -version = "0.5.1" +version = "0.5.2" authors = [ { name="Roger Pearce"}, { name="Seth Bromberger"} ] From c7d1fd0980e4fd764407bbe8f5422a623f9383ff Mon Sep 17 00:00:00 2001 From: Seth Bromberger Date: Sat, 7 Mar 2026 20:55:45 +0000 Subject: [PATCH 3/3] 0.2.3 --- py/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/requirements.txt b/py/requirements.txt index 231ab37..d80a0fe 100644 --- a/py/requirements.txt +++ b/py/requirements.txt @@ -1,2 +1,2 @@ semver >= 3.0 -jsonlogic-py == 0.2.2 +jsonlogic-py == 0.2.3