Merge pull request #177 from cpcloud/ambig

Fix ambiguity and test odo on travis with blaze binstar channel datashape

.travis.yml

@@ -32,12 +32,12 @@ install:
   - conda create -n odo-test python=$TRAVIS_PYTHON_VERSION pytest numpy pandas sqlalchemy h5py pip cython bcolz coverage networkx toolz multipledispatch pytables dynd-python pymongo paramiko boto dask
   - source activate odo-test
 
+  # datashape
+  - conda install datashape -c blaze
+
   # Install various deps
   - pip install sas7bdat
 
-  # Install DataShape
-  - pip install --upgrade git+http://github.com/ContinuumIO/datashape
-
   # install pyspark
   - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then conda install spark=$SPARK_VERSION -c blaze -c https://conda.binstar.org/blaze/channel/dev; fi
 

odo/backends/url.py

@@ -157,7 +157,6 @@ def file_to_temp_url_file(data, **kwargs):
     return append(target, data, **kwargs)
 
 try:
-    from .hdfs import HDFS
     from .aws import S3
 except ImportError:
     pass
@@ -168,7 +167,11 @@ def file_to_temp_url_file(data, **kwargs):
     @append.register(S3(JSONLines), URL(JSONLines))
     def other_remote_text_to_url_text(a, b, **kwargs):
         raise MDNotImplementedError()
-
+try:
+    from .hdfs import HDFS
+except ImportError:
+    pass
+else:
     @append.register(HDFS(JSON), URL(JSON))
     @append.register(HDFS(TextFile), URL(TextFile))
     @append.register(HDFS(JSONLines), URL(JSONLines))