Merge pull request blaze#1168 from cpcloud/tarball

Fix 0.8.1 tarball

MANIFEST.in

@@ -4,7 +4,7 @@ recursive-include docs *.rst
 include requirements.txt
 include requirements-strict.txt
 include setup.py
-include README.md
+include README.rst
 include LICENSE.txt
 include MANIFEST.in
 

all.recipe/meta.yaml

@@ -30,6 +30,9 @@ test:
     - dask
     - dynd-python
     - pytables
+    - yaml
+    - pyyaml
+    - h5py
 
   commands:
     - py.test -vx --doctest-modules --doctest-ignore-import-errors --pyargs blaze -rsxX

blaze/compute/tests/test_sparksql.py

@@ -10,8 +10,6 @@
 import itertools
 import shutil
 
-from distutils.version import StrictVersion
-
 from py4j.protocol import Py4JJavaError
 import numpy as np
 import pandas as pd
@@ -244,14 +242,17 @@ def test_column_arithmetic(ctx, db):
 
 # pyspark doesn't use __version__ so we use this kludge
 # should submit a bug report upstream to get __version__
-fail_on_spark_one_two = pytest.mark.xfail(not hasattr(pyspark.sql, 'types'),
-                                          raises=py4j.protocol.Py4JJavaError,
-                                          reason=('math functions only '
-                                                  'supported in HiveContext'))
+def fail_on_spark_one_two(x):
+    if hasattr(pyspark.sql, 'types'):
+        return x
+    else:
+        return pytest.mark.xfail(x, raises=py4j.protocol.Py4JJavaError,
+                                 reason=('math functions only supported in '
+                                         'HiveContext'))
 
 
-@pytest.mark.parametrize('func', map(fail_on_spark_one_two,
-                                     [sin, cos, tan, exp]))
+@pytest.mark.parametrize('func', list(map(fail_on_spark_one_two,
+                                          [sin, cos, tan, exp])))
 def test_math(ctx, db, func):
     expr = func(db.t.amount)
     result = compute(expr, ctx)

core.recipe/meta.yaml

@@ -36,6 +36,9 @@ test:
     - dask
     - dynd-python
     - pytables
+    - yaml
+    - pyyaml
+    - h5py
 
   commands:
     - py.test -vx --doctest-modules --doctest-ignore-import-errors --pyargs blaze -rsxX

setup.py

@@ -6,6 +6,7 @@
 import sys
 from fnmatch import fnmatch
 
+import setuptools
 from distutils.core import setup
 
 import versioneer