Merge branch 'master' into notebook

Aquaveo · Nov 19, 2023 · 8449f1b · 8449f1b
2 parents ece2324 + d0ecfc0
commit 8449f1b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/XmsInterp-CI.yaml b/.github/workflows/XmsInterp-CI.yaml
@@ -202,7 +202,7 @@ jobs:
       - name: Install Python Dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
+          pip install pyYAML==5.3.1  conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
           python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2"
       # Login to Aquaveo Docker
       - name: Login to Aquaveo Docker
@@ -328,7 +328,7 @@ jobs:
       - name: Install Python Dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
+          pip install pyYAML==5.3.1  conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
           python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2"
       # Setup Visual Studio
       - name: Setup Visual Studio

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.2)
+cmake_minimum_required(VERSION 3.11.0)
 cmake_policy(SET CMP0015 NEW) # Link Directory Pathing
 set(CMAKE_DEBUG_POSTFIX _d)
 
@@ -10,6 +10,7 @@ endif()
 
 if (APPLE)
 	set(CMAKE_POSITION_INDEPENDENT_CODE False)
+    add_compile_definitions(_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
 else()
 	set(CMAKE_POSITION_INDEPENDENT_CODE True)
 endif()

diff --git a/_package/xms/interp/api/interpolator.py b/_package/xms/interp/api/interpolator.py
@@ -118,11 +118,11 @@ def interpolate_to_grid(interpolation_points, method, grid=None, size=(100, 100)
         data = xr.DataArray(coords={'x': x_coord, 'y': y_coord}, dims=['x', 'y'], data=z_values.T, name=z)
 
     if in_place and grid is not None:
-        if xr_enabled and type(grid) == xr.DataArray or hasattr(grid, 'to_dataset'):
+        if xr_enabled and isinstance(grid, xr.DataArray) or hasattr(grid, 'to_dataset'):
             grid.name = z
             grid.data = z_values
 
-        if xr_enabled and type(grid) == xr.Dataset or hasattr(grid, 'to_array'):
+        if xr_enabled and isinstance(grid, xr.Dataset) or hasattr(grid, 'to_array'):
             if data is not None:
                 grid[z] = data
             else: