Merge branch 'workshop_2017'

Author: pancetta

.travis.yml

@@ -26,7 +26,7 @@ script:
   - "./docs/update_apidocs.sh"
   - mkdir data
   - which nosetests
-  - nosetests tests --with-coverage --cover-inclusive --cover-package=pySDC,tutorial --cover-html --cover-html-dir=target/doc/build/test_coverage
+  - nosetests --with-coverage --cover-erase --cover-inclusive --cover-package=pySDC/core,pySDC/implementations,pySDC/helpers,pySDC/tutorial --cover-html --cover-html-dir=target/doc/build/test_coverage pySDC/tests
   - if [[ $PYTHON_VERSION == 3 ]]; then travis-sphinx build; fi
 
 after_success:

docs/source/conf.py

@@ -22,6 +22,7 @@
 sys.path.insert(0, os.path.abspath('../'))
 sys.path.insert(0, os.path.abspath('../../'))
 sys.path.insert(0, os.path.abspath('../../../'))
+sys.path.insert(0, os.path.abspath('../../pySDC'))
 
 # -- General configuration ------------------------------------------------