Merge branch 'dependencies_cleanup' into 'master'

Dependencies cleanup

See merge request !99

conda/meta.yaml

@@ -38,8 +38,6 @@ requirements:
     - simplejson
     - six
     - beat.backend.python >=1.7.0b0
-    - matplotlib
-    - pillow
 
 test:
   requires:
@@ -51,6 +49,9 @@ test:
     - coverage
     - sphinx
     - sphinx_rtd_theme
+    # required for plotting related tests
+    - matplotlib
+    - pillow
 
   imports:
     - {{ name }}

requirements.txt

@@ -9,5 +9,3 @@ pyzmq
 setuptools
 simplejson
 six
-matplotlib
-pillow

test-requirements.txt

+matplotlib
+pillow