Merge 7be6c7b into 051f9a3

.coveragerc

@@ -22,4 +22,4 @@ exclude_lines =
     if 0:
     if __name__ == .__main__.:
 
-ignore_errors = True
+ignore_errors = True

.travis.yml

@@ -24,14 +24,15 @@ before_install:
   - ./miniconda.sh -b -f -p $HOME/miniconda
   - export PATH=/home/travis/miniconda/bin:$PATH
   - conda update --yes conda
+  # - jupyter kernelspec list
 
 install:
   - conda env update -f linux_environment.yml
   - source activate datascience
   - python3 setup.py install
 
 script:
-  - coverage run setup.py test
+  - python3 setup.py test
 
 after_success:
   - coveralls

linux_environment.yml

@@ -1,6 +1,5 @@
 name: datascience
 dependencies:
-- coverage
 - coveralls
 - cycler
 - decorator
@@ -22,6 +21,7 @@ dependencies:
 - pyparsing
 - pyqt
 - pytest
+- pytest-cov
 - python
 - python-dateutil
 - pytz
@@ -42,10 +42,15 @@ dependencies:
   - alabaster
   - babel
   - docutils
-  - folium==0.2.1
+  - folium==0.9.1
   - ipython-genutils
   - jinja2
+  - jupyter
+  - jupyter_client
   - markupsafe
+  - nbval
+  - nbconvert
+  - nbformat
   - pygments
   - snowballstemmer
   - sphinx

osx_environment.yml

@@ -1,7 +1,6 @@
 name: datascience
 dependencies:
 - appnope
-- coverage
 - coveralls
 - cycler
 - decorator
@@ -20,6 +19,7 @@ dependencies:
 - pyparsing
 - pyqt
 - pytest
+- pytest-cov
 - python
 - python-dateutil
 - python.app
@@ -45,6 +45,7 @@ dependencies:
   - ipython-genutils
   - jinja2
   - markupsafe
+  - nbval
   - pygments
   - snowballstemmer
   - sphinx

setup.py

@@ -28,11 +28,14 @@ class PyTest(TestCommand):
 
     def initialize_options(self):
         TestCommand.initialize_options(self)
-        self.pytest_args = ['tests']
+        self.pytest_args = ['--nbval-lax', '--cov=datascience', 'tests']
 
     def finalize_options(self):
         TestCommand.finalize_options(self)
 
+    def pytest_collectstart(collector):
+        collector.skip_compare += 'text/html'
+
     def run_tests(self):
         # import here, cause outside the eggs aren't loaded
         import pytest

tests/notebook_runner.py

@@ -0,0 +1,10 @@
+import nbformat
+import sys
+from nbconvert.preprocessors import ExecutePreprocessor
+
+with open(sys.argv[1]) as f:
+    nb = nbformat.read(f, as_version=4)
+
+ep = ExecutePreprocessor(timeout=600)
+
+ep.preprocess(nb, {'metadata': {'path': 'tests/'}})