Merge pull request #28 from kthyng/main

updated package listings
axiom-data-science · Jun 29, 2021 · dce0382 · dce0382
2 parents ccfc78a + 2c76f67
commit dce0382
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/ci/environment-py3.7.yml b/ci/environment-py3.7.yml
@@ -13,14 +13,14 @@ dependencies:
   - netcdf4
   - numpy
   - pip
+  - requests
   - xarray
   - xcmocean
   - xesmf
   ##############
   - pytest
   - pip:
-    # use cf-xarray from github to include recent variable naming work
-    - git+git://github.com/xarray-contrib/cf-xarray#egg=cf-xarray
+    - cf_xarray
     - codecov
     - pytest-cov
     - coverage[toml]
diff --git a/ci/environment-py3.8.yml b/ci/environment-py3.8.yml
@@ -13,14 +13,14 @@ dependencies:
   - netcdf4
   - numpy
   - pip
+  - requests
   - xarray
   - xcmocean
   - xesmf
   ##############
   - pytest
   - pip:
-    # use cf-xarray from github to include recent variable naming work
-    - git+git://github.com/xarray-contrib/cf-xarray#egg=cf-xarray
+    - cf_xarray
     - codecov
     - pytest-cov
     - coverage[toml]
diff --git a/docs/environment.yml b/docs/environment.yml
@@ -15,6 +15,7 @@ dependencies:
    - numpy
    - pip
    - pooch
+   - requests
    - xarray
    - xcmocean
    - xesmf
@@ -30,8 +31,7 @@ dependencies:
    - recommonmark
    - pip
    - pip:
-     # use cf-xarray from github to include recent variable naming work
-     - git+git://github.com/xarray-contrib/cf-xarray#egg=cf-xarray
+     - cf_xarray
      - docrep<=0.2.7
      - nbsphinx
      - jupyter_client

diff --git a/environment.yml b/environment.yml
@@ -14,9 +14,9 @@ dependencies:
   - netcdf4
   - numpy
   - pip
+  - requests
   - xarray
   - xcmocean
   - xesmf
   - pip:
-    # use cf-xarray from github to include recent variable naming work
-    - git+git://github.com/xarray-contrib/cf-xarray#egg=cf-xarray
+      cf_xarray
diff --git a/extract_model/__init__.py b/extract_model/__init__.py
@@ -18,7 +18,7 @@
 my_custom_criteria_gist = "https://gist.githubusercontent.com/kthyng/c3cc27de6b4449e1776ce79215d5e732/raw/55317e92be367f7d6d66e6142d5219a5d272afce/my_custom_criteria.py"
 response = requests.get(my_custom_criteria_gist)
 my_custom_criteria = ast.literal_eval(response.text)
-cfxr.accessor.set_options(my_custom_criteria)
+cfxr.set_options(custom_criteria=my_custom_criteria)
 
 
 try:

diff --git a/setup.cfg b/setup.cfg
@@ -55,10 +55,20 @@ author_email = [email protected]
 ### make sure to fill in your dependencies!
 [options]
 install_requires =
+    cf_xarray
+    cmocean
+    dask
+    jupyter
+    jupyterlab
+    matplotlib
+    netcdf4
     numpy
-    xesmf
+    requests
+    pip
     xarray
-    cf_xarray
+    xcmocean
+    xesmf
+
 setup_requires=
     setuptools_scm
 python_requires = >=3.6