diff --git a/.travis.yml b/.travis.yml index 6d3a0a5d..92074fb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,16 +56,13 @@ install: # Install various deps - conda uninstall toolz - - pip install -U toolz sas7bdat psycopg2 dill 'pymongo<3' + - pip install -U toolz sas7bdat psycopg2 dill 'pymongo<3' sqlalchemy-redshift - pip install git+git://github.com/blaze/dask.git#egg=dask-dev[complete] - if [ -n "$PANDAS_VERSION" ]; then pip install $PANDAS_VERSION; fi # install pyspark - if [[ $TRAVIS_PYTHON_VERSION == '2.7' || $TRAVIS_PYTHON_VERSION == '3.4' ]]; then conda install spark=$SPARK_VERSION -c blaze -c https://conda.binstar.org/blaze/channel/dev -c anaconda-cluster; fi - # redshift sqlalchemy dialect - - pip install --upgrade git+git://github.com/graingert/redshift_sqlalchemy - # Before_script section stolen from fabric # See license https://github.com/fabric/fabric/blob/master/LICENSE before_script: diff --git a/docs/source/aws.rst b/docs/source/aws.rst index bdc93082..6a335c7d 100644 --- a/docs/source/aws.rst +++ b/docs/source/aws.rst @@ -7,7 +7,7 @@ Dependencies * `boto `_ * `sqlalchemy `_ * `psycopg2 `_ -* `redshift_sqlalchemy `_ +* `sqlalchemy_redshift `_ Setup ----- @@ -28,7 +28,7 @@ Interface ``odo`` provides access to the following AWS services: * `S3 `_ via boto. -* `Redshift `_ via a `SQLAlchemy dialect `_ +* `Redshift `_ via a `SQLAlchemy dialect `_ URIs ---- diff --git a/docs/source/whatsnew/0.5.1.txt b/docs/source/whatsnew/0.5.1.txt index ca7e3e64..eab47f2c 100644 --- a/docs/source/whatsnew/0.5.1.txt +++ b/docs/source/whatsnew/0.5.1.txt @@ -26,6 +26,8 @@ None Improved Backends ----------------- +* Sqlalchemy-redshift upgraded to 5.0 and installed from PyPI (:issue: `478`). + None API Changes diff --git a/odo/backends/sql_csv.py b/odo/backends/sql_csv.py index d2277e51..fa55687e 100644 --- a/odo/backends/sql_csv.py +++ b/odo/backends/sql_csv.py @@ -182,7 +182,7 @@ def compile_from_csv_postgres(element, compiler, **kwargs): try: import boto from odo.backends.aws import S3 - from redshift_sqlalchemy.dialect import CopyCommand + from sqlalchemy_redshift.dialect import CopyCommand except ImportError: pass else: diff --git a/odo/backends/tests/test_s3_redshift.py b/odo/backends/tests/test_s3_redshift.py index ef111bca..8335c267 100644 --- a/odo/backends/tests/test_s3_redshift.py +++ b/odo/backends/tests/test_s3_redshift.py @@ -8,7 +8,7 @@ sa = pytest.importorskip('sqlalchemy') boto = pytest.importorskip('boto') pytest.importorskip('psycopg2') -pytest.importorskip('redshift_sqlalchemy') +pytest.importorskip('sqlalchemy_redshift') from contextlib import closing import json