Merge pull request #117 from andersy005/release-2019-8-4

Prepare new release
intake · Aug 5, 2019 · 909eec5 · 909eec5
2 parents 3e6e9cc + 2ec335a
commit 909eec5
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 36 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,7 +2,7 @@
 Changelog History
 =================
 
-Intake-esm v2019.8.xx (2019-08-xx)
+Intake-esm v2019.8.5 (2019-08-05)
 ==================================
 
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -7,6 +7,7 @@ include requirements.txt
 recursive-include docs/source *
 include docs/Makefile docs/make.bat
 recursive-include intake_esm *.yaml
+recursive-include intake_esm/collection_defs *.yaml
 recursive-include intake_esm *.py
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]

diff --git a/ci/environment-dev-3.6.yml b/ci/environment-dev-3.6.yml
@@ -3,12 +3,8 @@ channels:
   - conda-forge
 dependencies:
   - codecov
-  - coverage
-  - dask
-  - distributed
   - git
-  - intake
-  - intake-xarray
+  - intake-xarray>=0.3.1
   - ipykernel
   - pip
   - pre_commit
@@ -18,7 +14,6 @@ dependencies:
   - python=3.6
   - pyyaml
   - tqdm
-  - xarray
   - docrep
-  - click
   - s3fs
+  - fsspec
diff --git a/ci/environment-dev-3.7.yml b/ci/environment-dev-3.7.yml
@@ -5,13 +5,9 @@ dependencies:
   - autopep8
   - black
   - codecov
-  - coverage
-  - dask
-  - distributed
   - flake8
   - git
-  - intake
-  - intake-xarray
+  - intake-xarray>=0.3.1
   - ipykernel
   - isort
   - make
@@ -28,7 +24,6 @@ dependencies:
   - sphinx_rtd_theme
   - sphinx>=1.6
   - tqdm
-  - xarray
   - docrep
-  - click
   - s3fs
+  - fsspec
diff --git a/docs/environment.yml b/docs/environment.yml
@@ -2,19 +2,17 @@ name: intake-esm-dev
 channels:
   - conda-forge
 dependencies:
-  - dask
-  - intake
-  - intake-xarray
+  - intake-xarray>=0.3.1
   - nbsphinx
   - numpydoc
   - python=3.7
   - pyyaml
   - sphinx_rtd_theme
   - tqdm
-  - xarray
   - docrep
   - click
   - git
   - make
-  - jupyterlab
+  - ipython
   - s3fs
+  - fsspec
diff --git a/intake_esm/aggregate.py b/intake_esm/aggregate.py
@@ -6,8 +6,7 @@
 import dask
 import numpy as np
 import xarray as xr
-from dask.bytes.core import get_fs, infer_options, update_storage_options
-from intake_xarray.xzarr import get_mapper
+from fsspec import get_mapper
 
 from . import config
 
@@ -299,14 +298,8 @@ def open_dataset(url, data_vars, **kwargs):
 
 def open_store(url, data_vars, storage_options={}, **kwargs):
     """open zarr store."""
-    urlpath, protocol, options = infer_options(url)
-    update_storage_options(options, storage_options)
-    fs, _ = get_fs(protocol, options)
-    if protocol != 'file':
-        mapper = get_mapper(protocol, fs, urlpath)
-        ds = xr.open_zarr(mapper, **kwargs)
-    else:
-        ds = xr.open_zarr(urlpath, **kwargs)
+    mapper = get_mapper(url, **storage_options)
+    ds = xr.open_zarr(mapper, **kwargs)
 
     if data_vars:
         return set_coords(ds, data_vars)

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,6 @@
-click
-dask
 docrep
-intake
-intake-xarray
+intake-xarray>=0.3.1
 pyyaml
 tqdm
-xarray
+fsspec
 s3fs
diff --git a/setup.cfg b/setup.cfg
@@ -10,7 +10,7 @@ select = B,C,E,F,W,T4,B9
 
 [isort]
 known_first_party=intake_esm
-known_third_party=click,dask,docrep,intake,intake_xarray,numpy,pandas,pkg_resources,pytest,s3fs,setuptools,tqdm,xarray,yaml
+known_third_party=click,dask,docrep,fsspec,intake,intake_xarray,numpy,pandas,pkg_resources,pytest,s3fs,setuptools,tqdm,xarray,yaml
 multi_line_output=3
 include_trailing_comma=True
 force_grid_wrap=0