Repository: incubator-airflow Updated Branches: refs/heads/master 4284e6485 -> ac9ccb151
[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/ac9ccb15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/ac9ccb15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/ac9ccb15 Branch: refs/heads/master Commit: ac9ccb1518f6a0273d53fcd8e32aba1ac5563fb9 Parents: 4284e64 Author: Niels Zeilemaker <[email protected]> Authored: Tue May 9 09:42:32 2017 -0700 Committer: Chris Riccomini <[email protected]> Committed: Tue May 9 09:42:32 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/ac9ccb15/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/ac9ccb15/scripts/ci/requirements.txt ---------------------------------------------------------------------- diff --git a/scripts/ci/requirements.txt b/scripts/ci/requirements.txt index 9769dfb..06ad0bb 100644 --- a/scripts/ci/requirements.txt +++ b/scripts/ci/requirements.txt @@ -61,6 +61,7 @@ nose-ignore-docstring==0.2 nose-parameterized nose-timer pandas +pandas-gbq psutil>=4.2.0, <5.0.0 psycopg2 pydruid http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/ac9ccb15/setup.py ---------------------------------------------------------------------- diff --git a/setup.py b/setup.py index 0b98e56..b0b2ddd 100644 --- a/setup.py +++ b/setup.py @@ -142,6 +142,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']
