Merge pull request #1195 from cpcloud/server-install-doc

Add pyyaml to all.recipe and add doc note about them
blaze · Aug 5, 2015 · 5dd096a · 5dd096a
2 parents bed2c36 + a5d1061
commit 5dd096a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/all.recipe/meta.yaml b/all.recipe/meta.yaml
@@ -23,14 +23,14 @@ requirements:
     - numba
     - bcolz
     - unittest2 [py26]
+    - pyyaml
 
 test:
   requires:
     - pytest >=2.7.0
     - dask
     - dynd-python
     - pytables
-    - yaml
     - pyyaml
     - h5py
 

diff --git a/core.recipe/meta.yaml b/core.recipe/meta.yaml
@@ -48,7 +48,6 @@ test:
     - dask
     - dynd-python
     - pytables
-    - yaml
     - pyyaml
     - h5py
 

diff --git a/docs/source/server.rst b/docs/source/server.rst
@@ -55,6 +55,15 @@ Serving Data from the Command Line
 
 Blaze ships with a command line tool called ``blaze-server`` to serve up data specified in a YAML file.
 
+.. note::
+
+   To use the YAML specification feature of Blaze server please install
+   the ``pyyaml`` library. This can be done easily with ``conda``:
+
+   .. code-block:: sh
+
+      conda install pyyaml
+
 YAML Specification
 ------------------
 

diff --git a/requirements.txt b/requirements.txt
@@ -15,3 +15,4 @@ psutil
 pytest
 bcolz
 numba
+pyyaml