Skip to content

Commit

Permalink
[AIRFLOW-1179] Fix Pandas 0.2x breaking Google BigQuery change
Browse files Browse the repository at this point in the history
Closes apache#2279 from NielsZeilemaker/AIRFLOW-1179
  • Loading branch information
NielsZeilemaker authored and criccomini committed May 9, 2017
1 parent 4284e64 commit ac9ccb1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion airflow/contrib/hooks/bigquery_hook.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
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
Expand Down
1 change: 1 addition & 0 deletions scripts/ci/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ def check_previous():
'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']
Expand Down

0 comments on commit ac9ccb1

Please sign in to comment.