Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4DD89200C8E for ; Thu, 8 Jun 2017 17:36:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4C783160BCA; Thu, 8 Jun 2017 15:36:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 92F8A160BE5 for ; Thu, 8 Jun 2017 17:36:49 +0200 (CEST) Received: (qmail 59543 invoked by uid 500); 8 Jun 2017 15:36:48 -0000 Mailing-List: contact commits-help@airflow.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airflow.incubator.apache.org Delivered-To: mailing list commits@airflow.incubator.apache.org Received: (qmail 59532 invoked by uid 99); 8 Jun 2017 15:36:48 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2017 15:36:48 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 4E2DA1A03C6 for ; Thu, 8 Jun 2017 15:36:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.221 X-Spam-Level: X-Spam-Status: No, score=-4.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id T_UYfP8Eq3ws for ; Thu, 8 Jun 2017 15:36:47 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id B54A95FBA7 for ; Thu, 8 Jun 2017 15:36:45 +0000 (UTC) Received: (qmail 59096 invoked by uid 99); 8 Jun 2017 15:36:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2017 15:36:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5FEF6E8F07; Thu, 8 Jun 2017 15:36:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: maximebeauchemin@apache.org To: commits@airflow.incubator.apache.org Date: Thu, 08 Jun 2017 15:36:50 -0000 Message-Id: In-Reply-To: <5e204c5727c4403b86b3748bd957417e@git.apache.org> References: <5e204c5727c4403b86b3748bd957417e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/18] incubator-airflow git commit: [AIRFLOW-1179] Fix Pandas 0.2x breaking Google BigQuery change archived-at: Thu, 08 Jun 2017 15:36:50 -0000 [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 Authored: Tue May 9 09:42:32 2017 -0700 Committer: Maxime Beauchemin 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']