From fa4551a781aff5dab350bbb5fbeb651fba757a95 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Tue, 21 Apr 2015 11:10:28 -0500 Subject: [PATCH 1/2] Ambiguity warnings fix --- odo/backends/url.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/odo/backends/url.py b/odo/backends/url.py index b26abc5d..48a912e4 100644 --- a/odo/backends/url.py +++ b/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)) From bae9316c3cd35b87e675d25ce2dae85a8e467a02 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Tue, 21 Apr 2015 11:10:39 -0500 Subject: [PATCH 2/2] Install datashape from the blaze binstar channel --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 519530a5..c886bafb 100644 --- a/.travis.yml +++ b/.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