Merge branch 'master' into notebook

Author: wdolinar

.github/workflows/XmsInterp-CI.yaml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [macos-latest]
+        platform: [macos-13]
         python-version: ['3.10']
         build_type: [Release, Debug]
 
@@ -73,6 +73,10 @@ jobs:
       RELEASE_PYTHON: 'False'
 
     steps:
+      # Get Correct Version of Xcode
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: 14.3.1
       # Checkout Sources
       - name: Checkout Source
         uses: actions/checkout@v2
@@ -125,7 +129,7 @@ jobs:
         run: |
           tar czf ${{ github.workspace }}/${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz ${{ env.CONAN_PATH }}/${{ env.LIBRARY_NAME }}/${{ env.XMS_VERSION }}/aquaveo/${{ env.CONAN_CHANNEL}}/package
       - name: Add Artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}
           path: ${{ github.workspace }}/${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz
@@ -179,7 +183,7 @@ jobs:
       CONAN_BUILD_TYPES: ${{ matrix.build_type }}
       CONAN_GCC_VERSIONS: ${{ matrix.compiler-version }}
       CONAN_DOCKER_IMAGE: docker.aquaveo.com/aquaveo/conan-docker/conan-gcc${{ matrix.compiler-version }}-py${{ matrix.python-version }}:latest
-      CONAN_PIP_INSTALL: 'conan-package-tools==0.35.1'
+      CONAN_PIP_INSTALL: 'conan-package-tools==0.35.1 numpy==1.26.4'
       CONAN_PIP_PACKAGE: 'conan==1.41.0'
       # Aquapi Variables
       AQUAPI_USERNAME: ${{ secrets.AQUAPI_USERNAME_SECRET }}
@@ -253,7 +257,7 @@ jobs:
         run: |
           tar czf ${{ github.workspace }}/${{ matrix.platform }}-GCC${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz ${{ env.CONAN_PATH }}/${{ env.LIBRARY_NAME }}/${{ env.XMS_VERSION }}/aquaveo/${{ env.CONAN_CHANNEL}}/package
       - name: Add Artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}
           path: ${{ github.workspace }}/${{ matrix.platform }}-GCC${{ matrix.compiler-version }}-${{ matrix.build_type }}.tar.gz
@@ -376,7 +380,7 @@ jobs:
         run: |
           tar czf ${{ github.workspace }}/${{ env.MATRIX_NAME }}.tar.gz ${{ env.CONAN_PATH }}/${{ env.LIBRARY_NAME }}/${{ env.XMS_VERSION }}/aquaveo/${{ env.CONAN_CHANNEL}}/package
       - name: Add Artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.MATRIX_NAME }}
           path: ${{ github.workspace }}/${{ env.MATRIX_NAME }}.tar.gz

_package/setup.py

@@ -10,7 +10,7 @@
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 requires = [
-    'numpy',
+    'numpy<2.0.0',
     'xmscore>=6.0.0',
     'xmsgrid>=7.0.0, <8.0.0',
 ]