Merge pull request #265 from JohanMabille/ci_2025

Ugraded GHA images

Author: JohanMabille

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
+        os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14]
 
     steps:
     - uses: actions/checkout@v4
@@ -79,7 +79,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, windows-2022]
+        os: [windows-2022, windows-2025]
 
     steps:
     - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v5.0.0
   hooks:
   - id: check-added-large-files
   - id: check-case-conflict
@@ -16,27 +16,27 @@ repos:
   - id: detect-private-key
   - id: check-merge-conflict
 - repo: https://github.com/Lucas-C/pre-commit-hooks
-  rev: v1.3.1
+  rev: v1.5.5
   hooks:
   - id: forbid-tabs
   - id: remove-tabs
     args: [--whitespaces-count, '4']
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.5.0
+  rev: v2.15.0
   hooks:
   - id: pretty-format-yaml
     args: [--autofix, --indent, '2']
 - repo: https://github.com/tdegeus/cpp_comment_format
-  rev: v0.2.0
+  rev: v0.2.1
   hooks:
   - id: cpp_comment_format
 - repo: https://github.com/tdegeus/conda_envfile
-  rev: v0.4.2
+  rev: v0.5.2
   hooks:
   - id: conda_envfile_parse
     files: environment.yaml
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v15.0.7
+  rev: v20.1.8
   hooks:
   - id: clang-format
     files: .*\.[hc]pp$
@@ -45,6 +45,6 @@ repos:
   hooks:
   - id: cmake-format
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.20.0
+  rev: 0.33.2
   hooks:
   - id: check-github-workflows

CMakeLists.txt

@@ -6,7 +6,7 @@
 # The full license is in the file LICENSE, distributed with this software.
 # ~~~
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.24)
 project(xwidgets)
 
 set(XWIDGETS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)

include/xwidgets/xcommon.hpp

@@ -94,9 +94,13 @@ namespace xw
          */
         static std::optional<bool> global_echo_update();
 
-        bool
-        same_patch(const std::string&, const nl::json&, const xeus::buffer_sequence&, const nl::json&, const xeus::buffer_sequence&)
-            const;
+        bool same_patch(
+            const std::string&,
+            const nl::json&,
+            const xeus::buffer_sequence&,
+            const nl::json&,
+            const xeus::buffer_sequence&
+        ) const;
 
         bool m_moved_from;
         const xeus::xmessage* m_hold;

include/xwidgets/xcontroller.hpp

@@ -259,11 +259,21 @@ namespace xw
     template <class D>
     inline void xcontroller<D>::register_control_types()
     {
-        get_xfactory()
-            .register_maker("@jupyter-widgets/controls", "ControllerAxisModel", "@jupyter-widgets/controls", "ControllerAxisView", xmaker<xcontroller_axis>);
-
-        get_xfactory()
-            .register_maker("@jupyter-widgets/controls", "ControllerButtonModel", "@jupyter-widgets/controls", "ControllerButtonView", xmaker<xcontroller_button>);
+        get_xfactory().register_maker(
+            "@jupyter-widgets/controls",
+            "ControllerAxisModel",
+            "@jupyter-widgets/controls",
+            "ControllerAxisView",
+            xmaker<xcontroller_axis>
+        );
+
+        get_xfactory().register_maker(
+            "@jupyter-widgets/controls",
+            "ControllerButtonModel",
+            "@jupyter-widgets/controls",
+            "ControllerButtonView",
+            xmaker<xcontroller_button>
+        );
     }
 
     /*********************

src/xcommon.cpp

@@ -287,9 +287,13 @@ namespace xw
         return out;
     }
 
-    bool
-    xcommon::same_patch(const std::string& name, const nl::json& j1, const xeus::buffer_sequence&, const nl::json& j2, const xeus::buffer_sequence&)
-        const
+    bool xcommon::same_patch(
+        const std::string& name,
+        const nl::json& j1,
+        const xeus::buffer_sequence&,
+        const nl::json& j2,
+        const xeus::buffer_sequence&
+    ) const
     {
         const auto& paths = buffer_paths();
         // For a widget with no binary buffer, compare the patches

test/CMakeLists.txt

@@ -6,7 +6,7 @@
 # The full license is in the file LICENSE, distributed with this software.
 # ~~~
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.24)
 
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     project(xwidgets-test)