airflow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maximebeauche...@apache.org
Subject [07/18] incubator-airflow git commit: [AIRFLOW-1179] Fix Pandas 0.2x breaking Google BigQuery change
Date Thu, 08 Jun 2017 15:36:50 GMT
[AIRFLOW-1179] Fix Pandas 0.2x breaking Google BigQuery change

Closes #2279 from NielsZeilemaker/AIRFLOW-1179


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/1b2b34e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/1b2b34e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/1b2b34e6

Branch: refs/heads/v1-8-test
Commit: 1b2b34e6a0b44b5a686cae6fa6e4014705769d67
Parents: fc5fe5c
Author: Niels Zeilemaker <nielszeilemaker@godatadriven.com>
Authored: Tue May 9 09:42:32 2017 -0700
Committer: Maxime Beauchemin <maximebeauchemin@gmail.com>
Committed: Thu Jun 8 08:36:20 2017 -0700

----------------------------------------------------------------------
 airflow/contrib/hooks/bigquery_hook.py | 2 +-
 scripts/ci/requirements.txt            | 1 +
 setup.py                               | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/1b2b34e6/airflow/contrib/hooks/bigquery_hook.py
----------------------------------------------------------------------
diff --git a/airflow/contrib/hooks/bigquery_hook.py b/airflow/contrib/hooks/bigquery_hook.py
index 53ca123..06de4e8 100644
--- a/airflow/contrib/hooks/bigquery_hook.py
+++ b/airflow/contrib/hooks/bigquery_hook.py
@@ -24,7 +24,7 @@ import time
 from apiclient.discovery import build, HttpError
 from googleapiclient import errors
 from builtins import range
-from pandas.io.gbq import GbqConnector, \
+from pandas_gbq.gbq import GbqConnector, \
     _parse_data as gbq_parse_data, \
     _check_google_client_version as gbq_check_google_client_version, \
     _test_google_api_imports as gbq_test_google_api_imports

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/1b2b34e6/scripts/ci/requirements.txt
----------------------------------------------------------------------
diff --git a/scripts/ci/requirements.txt b/scripts/ci/requirements.txt
index 6c65167..813d035 100644
--- a/scripts/ci/requirements.txt
+++ b/scripts/ci/requirements.txt
@@ -53,6 +53,7 @@ nose-exclude
 nose-ignore-docstring==0.2
 nose-parameterized
 pandas
+pandas-gbq
 psutil>=4.2.0, <5.0.0
 psycopg2
 pydruid

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/1b2b34e6/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 288c2b3..2b1ac2f 100644
--- a/setup.py
+++ b/setup.py
@@ -137,6 +137,7 @@ gcp_api = [
     'google-api-python-client>=1.5.0, <1.6.0',
     'oauth2client>=2.0.2, <2.1.0',
     'PyOpenSSL',
+    'pandas-gbq'
 ]
 hdfs = ['snakebite>=2.7.8']
 webhdfs = ['hdfs[dataframe,avro,kerberos]>=2.0.4']


Mime
View raw message