Skip to content

Prepare for 0.2.1 release. #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/source/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Changelog
=========

0.2.1 / 2017-??-??
0.2.1 / 2017-11-27
------------------

- :func:`read_gbq` now raises ``QueryTimeout`` if the request exceeds the ``query.timeoutMs`` value specified in the BigQuery configuration. (:issue:`76`)
Expand Down
10 changes: 5 additions & 5 deletions pandas_gbq/gbq.py
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ def process_insert_errors(self, insert_errors):
def run_query(self, query, **kwargs):
try:
from googleapiclient.errors import HttpError
except:
except ImportError:
from apiclient.errors import HttpError
from google.auth.exceptions import RefreshError

Expand Down Expand Up @@ -663,7 +663,7 @@ def run_query(self, query, **kwargs):
def load_data(self, dataframe, dataset_id, table_id, chunksize):
try:
from googleapiclient.errors import HttpError
except:
except ImportError:
from apiclient.errors import HttpError

job_id = uuid.uuid4().hex
Expand Down Expand Up @@ -737,7 +737,7 @@ def schema(self, dataset_id, table_id):

try:
from googleapiclient.errors import HttpError
except:
except ImportError:
from apiclient.errors import HttpError

try:
Expand Down Expand Up @@ -1162,7 +1162,7 @@ def __init__(self, project_id, dataset_id, reauth=False, verbose=False,
private_key=None):
try:
from googleapiclient.errors import HttpError
except:
except ImportError:
from apiclient.errors import HttpError
self.http_error = HttpError
self.dataset_id = dataset_id
Expand Down Expand Up @@ -1261,7 +1261,7 @@ def __init__(self, project_id, reauth=False, verbose=False,
private_key=None):
try:
from googleapiclient.errors import HttpError
except:
except ImportError:
from apiclient.errors import HttpError
self.http_error = HttpError
super(_Dataset, self).__init__(project_id, reauth, verbose,
Expand Down