Merge pull request #310 from NCAR/dev

Dev
NCAR · Jan 11, 2022 · 52646db · 52646db
2 parents cf43e8b + 26c61cd
commit 52646db
Show file tree

Hide file tree

Showing 28 changed files with 13,946 additions and 7,161 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -15,13 +15,8 @@ repos:
     hooks:
       - id: black-jupyter
 
-  - repo: https://github.com/keewis/blackdoc
-    rev: v0.3.4
-    hooks:
-      - id: blackdoc
-
-  - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.8.4
     hooks:
       - id: flake8
 

diff --git a/binder/environment.yml b/binder/environment.yml
@@ -15,7 +15,7 @@ dependencies:
   - ipywidgets
   - jupyter-offlinenotebook
   - jupyterlab>=3
-  - matplotlib-base
+  - matplotlib-base=3.3.3
   - ipython
   - netcdf4
   - nodejs
@@ -26,5 +26,7 @@ dependencies:
   - xarray
   - xrft
   - pandas
+  - pooch
+  - statsmodels
   - pip:
       - -e ..
diff --git a/ci/environment-dev.yml b/ci/environment-dev.yml
@@ -12,7 +12,7 @@ dependencies:
   - intake-esm
   - jupyter_contrib_nbextensions
   - jupyterlab
-  - matplotlib-base
+  - matplotlib-base=3.3.3
   - netcdf4
   - numpy
   - opencv
@@ -25,9 +25,12 @@ dependencies:
   - scikit-image
   - scipy
   - setuptools
+  - statemodels
   - xarray
   - xrft
   - zfpy
   - cf_xarray
   - astropy
   - ipython
+  - pooch
+  - statsmodels
diff --git a/ci/environment.yml b/ci/environment.yml
@@ -9,7 +9,7 @@ dependencies:
   - dask
   - intake-esm
   - jupyterlab
-  - matplotlib-base
+  - matplotlib-base=3.3.3
   - netcdf4
   - pip
   - pytest
@@ -22,3 +22,5 @@ dependencies:
   - pandas
   - astropy
   - ipython
+  - pooch
+  - statsmodels
diff --git a/ci/upstream-dev-environment.yml b/ci/upstream-dev-environment.yml
@@ -8,7 +8,7 @@ dependencies:
   - codecov
   - dask
   - intake-esm
-  - matplotlib-base
+  - matplotlib-base=3.3.3
   - netcdf4
   - pip
   - pytest
@@ -19,6 +19,8 @@ dependencies:
   - astropy
   - jupyterlab
   - ipython
+  - pooch
+  - statsmodels
   - pip:
       - git+https://github.com/pydata/xarray.git
       - git+https://github.com/xarray-contrib/cf-xarray.git

diff --git a/docs/source/notebooks/AWSDataNotebook.ipynb b/docs/source/notebooks/AWSDataNotebook.ipynb
diff --git a/docs/source/notebooks/CAMBudgets.ipynb b/docs/source/notebooks/CAMBudgets.ipynb
diff --git a/docs/source/notebooks/CompressionSamples.ipynb b/docs/source/notebooks/CompressionSamples.ipynb
diff --git a/docs/source/notebooks/LargeDataGladeNotebook.ipynb b/docs/source/notebooks/LargeDataGladeNotebook.ipynb
diff --git a/docs/source/notebooks/MetricsNotebook.ipynb b/docs/source/notebooks/MetricsNotebook.ipynb
diff --git a/docs/source/notebooks/POPData.ipynb b/docs/source/notebooks/POPData.ipynb
diff --git a/docs/source/notebooks/TutorialNotebook.ipynb b/docs/source/notebooks/TutorialNotebook.ipynb
diff --git a/docs/source/notebooks/compChecker.ipynb b/docs/source/notebooks/compChecker.ipynb
@@ -517,9 +517,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "CMIP6 2019.10",
+   "display_name": "Python 3",
    "language": "python",
-   "name": "cmip6-201910"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -531,7 +531,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.8"
+   "version": "3.8.0"
   }
  },
  "nbformat": 4,

diff --git a/docs/source/notebooks/error_bias.ipynb b/docs/source/notebooks/error_bias.ipynb
diff --git a/docs/source/notebooks/ssims.csv b/docs/source/notebooks/ssims.csv
@@ -0,0 +1,2 @@
+set,time,ssim
+zfpA1e-7,0,0.9915299264304216