Merge pull request #278 from NCAR/dev

Dev
NCAR · May 24, 2021 · db0f7b1 · db0f7b1
2 parents 92d349a + 5532a19
commit db0f7b1
Show file tree

Hide file tree

Showing 22 changed files with 3,703 additions and 947 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest']
-        python-version: ['3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9']
     steps:
       - name: Cancel previous runs
         uses: styfle/[email protected]

diff --git a/binder/environment.yml b/binder/environment.yml
@@ -2,6 +2,7 @@ name: myenv
 channels:
   - conda-forge
 dependencies:
+  - python=*=*cp*
   - cartopy
   - cf_xarray
   - cmocean

diff --git a/ci/environment-dev.yml b/ci/environment-dev.yml
@@ -2,6 +2,7 @@ name: ldcpy_dev
 channels:
   - conda-forge
 dependencies:
+  - python=*=*cp*
   - cartopy=0.18
   - cmocean
   - codecov

diff --git a/ci/environment.yml b/ci/environment.yml
@@ -2,6 +2,7 @@ name: ldcpy
 channels:
   - conda-forge
 dependencies:
+  - python=*=*cp*
   - cartopy=0.18
   - cmocean
   - codecov

diff --git a/ci/upstream-dev-environment.yml b/ci/upstream-dev-environment.yml
@@ -2,6 +2,7 @@ name: ldcpy
 channels:
   - conda-forge
 dependencies:
+  - python=*=*cp*
   - cartopy=0.18
   - cmocean
   - codecov

diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -21,5 +21,5 @@ ldcpy Plot (ldcpy.plot)
 ldcpy Metrics (ldcpy.metrics)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. automodule:: ldcpy.metrics
+.. automodule:: ldcpy.calcs
     :members: