Refactor databroker on top of intake.

.gitignore

@@ -119,3 +119,6 @@ doc/source/_as_gen/*
 
 #
 doc/source/_as_gen
+
+# generated by IPython example in docs
+doc/data/*

.travis.yml

@@ -1,5 +1,37 @@
+dist: xenial  # for Python 3.7
 language: python
-sudo: false
+matrix:
+  fast_finish: true
+  include:
+  - python: 3.6
+    env: INTAKE_MASTER=false
+  - python: 3.7
+    env: INTAKE_MASTER=false
+  - python: 3.7
+    env: INTAKE_MASTER=true
+  - python: nightly
+    env: INTAKE_MASTER=false
+    addons:
+      apt:
+        packages:
+          # Some additional packages for the Python nightly
+          - libhdf5-serial-dev
+          - libnetcdf-dev
+          - libsnappy-dev
+          - netcdf-bin
+  allow_failures:
+    - python: nightly
+    - env: INTAKE_MASTER=true
+cache:
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/.ccache  # https://github.com/travis-ci/travis-ci/issues/5853
+addons:
+  apt:
+    packages:
+      - libsnappy-dev
+services:
+  - mongodb
 
 env:
   global:
@@ -8,55 +40,32 @@ env:
     # Doctr deploy key for bluesky/bluesky.github.io
     - secure: "spb6HwGVvMPsQw9cEwJscmAlG7seL0svW8ouYlDr4OESJJJqC8bynEpAl7Zm/NuKiZ701IR9gEBFuwCRoEXNJ6AkqgBE0DOMj4Oezg4eUnaZz0aXJ+C6mz31vbcNmU6MrjSElw80cIXBpia3j//VMluMzJMsGx/ELPATu2nwyx1+KXljGpFe1/7HYcq/wFHi+sC02sZRVYJGqrb5Zms35hlk4xasWKlsgLh53kW+ss+4hY67vllL2iRkYiP+8z4e3dTOuDqJWx5lLT16wt0K+wJyP/QTyIP81tmMNoWRbdrfOrzyyVXZDbrlzpZDBRtvlMFMHOeEZOrFPIYuclEjT39Tge+T/OxR6SC8kvzqVItxyxLEKWpQu8DHRVEDAuirteuv4IKEnS80nbWn4v/sBOU+sC0/23dW9zZkMrNmRoSFcjudmy2PGIY8jxzOhGJJ+Rbi0xIaKwdLbDZoPHM3m9m2uWYfGNMBHDgnh/HDIq71zzYWaW4gChYgU0UeDM1RYnr1XRa44znlZ0YLnmEyxn/5LzH/hRDxqc5XH5OAiKLnTddZFYsvdRT1JMNSA5PRSm7E8BCvCOEwovjnvRUc0dktyd8+OC5+Eyf1neJ6M7F2sGxCi3yMKw3VmfCxINu6XO3GsPE7cKACEq0lriCxjNzFWbedOX9dTL1Uqdc3pQA="
 
-
-cache:
-  directories:
-    - $HOME/.cache/pip
-    - $HOME/.cache/matplotlib
-
-services:
-  - mongodb
-
-addons:
-  apt:
-    sources:
-    - mongodb-3.2-precise
-    packages:
-    - mongodb-org-server
-    - mongodb-org
-
 before_install:
   - export TZ=US/Eastern
 
-matrix:
-  fast_finish: true
-  include:
-    - python: 3.6
-    - python: 3.7
-      dist: xenial
-      env: PUBLISH_DOCS=1
-    - python: nightly
-  allow_failures:
-    - python: nightly
-
 install:
   - pip install --upgrade cython
   - pip install --quiet --upgrade --global-option='--without-libyaml' pyyaml
   - pip install .[all]
   - pip install -r requirements-test.txt
-  - pip install codecov
+  # Install intake master branch if build settings indicate to do so.
+  - |
+    if [ "$INTAKE_MASTER" = true ] ; then
+      pip install git+https://github.com/intake/intake@master
+      pip install git+https://github.com/intake/intake-xarray@master
+    fi
 
 script:
-  - coverage run run_tests.py
+  - coverage run -m pytest
   - coverage report -m
   - set -e
   - pip install -r requirements-docs.txt
   - make -C doc html
   - |
     if [ $PUBLISH_DOCS ]; then
       # Push built documentation to GH pages.
-      pip install doctr
-      doctr deploy --deploy-repo NSLS-II/NSLS-II.github.io --deploy-branch-name master databroker
+      pip install doctr;
+      doctr deploy --deploy-repo NSLS-II/NSLS-II.github.io --deploy-branch-name master databroker;
       doctr deploy --deploy-repo bluesky/bluesky.github.io --deploy-branch-name master databroker
     fi
 

MANIFEST.in

@@ -1,5 +1,3 @@
-include databroker/_version.py
-include databroker/assets/schemas/*.json
 recursive-include doc/source *
 include doc/Makefile doc/make.bat
 include LICENSE
@@ -8,3 +6,13 @@ include README.md
 include requirements.txt
 include setup.py
 include versioneer.py
+
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
+
+include versioneer.py
+include databroker/_version.py
+include databroker/assets/schemas/*.json
+
+# If including data files in the package, add them like:
+# include path/to/data_file

databroker/__init__.py

@@ -1,18 +1,14 @@
+# Import intake to run driver discovery first and avoid circular import issues.
+import intake
+del intake
+
 import warnings
 import logging
 
 
 logger = logging.getLogger(__name__)
 
 
-try:
-    import attr  # confusingly, this comes from 'attrs' on PyPI, not 'attr'
-    attr.s
-except AttributeError:
-    raise ImportError("Wrong attr module imported. Please uninstall 'attr' "
-                      "and install 'attrs' which provides the correct module.")
-
-
 from ._core import (Broker, BrokerES, Header, ALL,
                     lookup_config, list_configs, describe_configs, temp_config,
                     wrap_in_doct,