Merge pull request #15 from JohanMabille/upgrade

Upgraded to xproperty 0.12 and xwidgets 0.29
jupyter-xeus · May 31, 2024 · 1e76c62 · 1e76c62
2 parents 83e222f + a3f93b6
commit 1e76c62
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,8 +65,8 @@ option(XCANVAS_BUILD_STATIC_LIBS "Build xcanvas static library (default if BUILD
 # Dependencies
 # ============
 
-set(xproperty_REQUIRED_VERSION 0.11.0)
-set(xwidgets_REQUIRED_VERSION 0.27.1)
+set(xproperty_REQUIRED_VERSION 0.12.0)
+set(xwidgets_REQUIRED_VERSION 0.29.0)
 
 if (NOT TARGET xproperty)
     find_package(xproperty ${xproperty_REQUIRED_VERSION} REQUIRED)

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -5,8 +5,8 @@ dependencies:
   - cmake
   - cxx-compiler
   - xproperty
-  - xwidgets >=0.28.1
-  - ipycanvas >=0.11.0,<0.12
+  - xwidgets >=0.29.0
+  - ipycanvas >=0.12.0,<0.13
   - pytest
   - nbval
 # TODO: replace xeus-cling with xeus(cpp when it is available

diff --git a/xcanvasConfig.cmake.in b/xcanvasConfig.cmake.in
@@ -18,8 +18,8 @@
 @XCANVAS_CONFIG_CODE@
 
 include(CMakeFindDependencyMacro)
-find_dependency(xwidgets @xeus_REQUIRED_VERSION@)
-find_dependency(xproperty @xeus_REQUIRED_VERSION@)
+find_dependency(xwidgets @xwidgets_REQUIRED_VERSION@)
+find_dependency(xproperty @xproperty_REQUIRED_VERSION@)
 
 if(NOT TARGET xcanvas AND NOT TARGET xcanvas-static)
   include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")