Add pyinterp shim

.github/workflows/test.yaml

@@ -8,19 +8,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest"]
-        python-version: ["3.7", "3.8"]
+        os: ["macos-latest", "ubuntu-latest", "windows-latest"]
+        python-version: ["3.7", "3.8", "3.9"]
     steps:
-      - uses: actions/checkout@v2
-      - name: Cache conda
+      - name: Checkout source
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Cache Linux/macOS (x86) Conda environment
+        if: ${{ runner.os != "windows-latest" }}
         uses: actions/cache@v1
         env:
           # Increase this value to reset cache if ci/environment.yml has not changed
           CACHE_NUMBER: 0
         with:
           path: ~/conda_pkgs_dir
           key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/environment-py${{ matrix.python-version }}.yml') }}
-      - uses: conda-incubator/setup-miniconda@v2
+
+      - name: Cache Windows Conda environment
+        if: ${{ runner.os == "windows-latest" }}
+        uses: actions/cache@v1
+        env:
+          # Increase this value to reset cache if ci/environment.yml has not changed
+          CACHE_NUMBER: 0
+        with:
+          path: ~/conda_pkgs_dir
+          key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/environment-py${{ matrix.python-version }}-win.yml') }}
+
+      - name: Build and activate Linux/macOS Conda environment
+        if: ${{ runnor.os != "windows-latest" }}
+        uses: conda-incubator/setup-miniconda@v2
         with:
           mamba-version: "*" # activate this to build with mamba.
           channels: conda-forge, defaults # These need to be specified to use mamba
@@ -29,14 +47,29 @@ jobs:
 
           activate-environment: test_env_extract_model
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
-      - name: Set up conda environment
+
+      - name: Build and activate Linux/macOS Conda environment
+        if: ${{ runnor.os == "windows-latest" }}
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          mamba-version: "*" # activate this to build with mamba.
+          channels: conda-forge, defaults # These need to be specified to use mamba
+          channel-priority: true
+          environment-file: ci/environment-py${{ matrix.python-version }}-win.yml
+
+          activate-environment: test_env_extract_model
+          use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
+
+      - name: Install package in environment
         shell: bash -l {0}
         run: |
           python -m pip install -e . --no-deps --force-reinstall
-      - name: Run Tests
+
+      - name: Run tests
         shell: bash -l {0}
         run: |
           pytest --cov=./ --cov-report=xml
+
       - name: Upload code coverage to Codecov
         uses: codecov/codecov-action@v1
         with:

ci/environment-py3.7-win.yml

@@ -0,0 +1,21 @@
+name: test-env
+channels:
+  - conda-forge
+dependencies:
+  - python=3.7
+  - cf_xarray>=0.6
+  - cmocean
+  - dask
+  - matplotlib
+  - netcdf4
+  - numpy
+  - pip
+  - pyinterp
+  - requests
+  - xarray
+  - xcmocean
+  - pytest
+  - pip:
+    - codecov
+    - pytest-cov
+    - coverage[toml]

ci/environment-py3.7.yml

@@ -1,24 +1,21 @@
-name: test_env_extract_model
+name: test-env
 channels:
   - conda-forge
 dependencies:
   - python=3.7
-  ############## These will have to be adjusted to your specific project
   - cartopy
   - cf_xarray
   - cmocean
   - dask
-  - jupyter
-  - jupyterlab
   - matplotlib
   - netcdf4
   - numpy
   - pip
+  - pyinterp
   - requests
   - xarray
   - xcmocean
   - xesmf
-  ##############
   - pytest
   - pip:
     - codecov

ci/environment-py3.8-win.yml

@@ -0,0 +1,21 @@
+name: test-env
+channels:
+  - conda-forge
+dependencies:
+  - python=3.8
+  - cf_xarray>=0.6
+  - cmocean
+  - dask
+  - matplotlib
+  - netcdf4
+  - numpy
+  - pip
+  - pyinterp
+  - requests
+  - xarray
+  - xcmocean
+  - pytest
+  - pip:
+    - codecov
+    - pytest-cov
+    - coverage[toml]

ci/environment-py3.8.yml

@@ -1,24 +1,21 @@
-name: test_env_extract_model
+name: test-env
 channels:
   - conda-forge
 dependencies:
   - python=3.8
-  ############## These will have to be adjusted to your specific project
   - cartopy
   - cf_xarray
   - cmocean
   - dask
-  - jupyter
-  - jupyterlab
   - matplotlib
   - netcdf4
   - numpy
   - pip
+  - pyinterp
   - requests
   - xarray
   - xcmocean
   - xesmf
-  ##############
   - pytest
   - pip:
     - codecov

ci/environment-py3.9-win.yml

@@ -0,0 +1,21 @@
+name: test-env
+channels:
+  - conda-forge
+dependencies:
+  - python=3.9
+  - cf_xarray>=0.6
+  - cmocean
+  - dask
+  - matplotlib
+  - netcdf4
+  - numpy
+  - pip
+  - pyinterp
+  - requests
+  - xarray
+  - xcmocean
+  - pytest
+  - pip:
+    - codecov
+    - pytest-cov
+    - coverage[toml]

ci/environment-py3.9.yml

@@ -0,0 +1,22 @@
+name: test-env
+channels:
+  - conda-forge
+dependencies:
+  - python=3.9
+  - cf_xarray>=0.6
+  - cmocean
+  - dask
+  - matplotlib
+  - netcdf4
+  - numpy
+  - pip
+  - pyinterp
+  - requests
+  - xarray
+  - xcmocean
+  - xesmf
+  - pytest
+  - pip:
+    - codecov
+    - pytest-cov
+    - coverage[toml]

environment.yml

@@ -4,18 +4,22 @@ channels:
 dependencies:
   # Required for full project functionality (dont remove)
   - pytest
+<<<<<<< HEAD
+  - cf_xarray>=0.6
+=======
   # Examples (remove and add as needed)
   - cartopy
   - cf_xarray
+>>>>>>> origin/main
   - cmocean
   - dask
-  - jupyter
-  - jupyterlab
   - matplotlib
   - netcdf4
   - numpy
   - pip
+  - pyinterp
   - requests
+  - scipy
   - xarray
   - xcmocean
   - xesmf

extract_model/__init__.py

@@ -6,14 +6,14 @@
 
 import cf_xarray as cfxr  # noqa: F401
 import requests  # noqa: F401
-
 from pkg_resources import DistributionNotFound, get_distribution
 
-import extract_model.accessor
-
-from .extract_model import argsel2d, sel2d, select  # noqa: F401
-from .utils import filter, order, preprocess, sub_bbox, sub_grid
+import extract_model.accessor  # noqa: F401
 
+from .extract_model import (argsel2d, make_output_ds, sel2d,  # noqa: F401
+                            select)
+from .pyinterp_shim import PyInterpShim  # noqa: F401
+from .utils import filter, order, preprocess, sub_bbox, sub_grid  # noqa: F401
 
 try:
     __version__ = get_distribution("extract_model").version