Skip to content

Commit bb4321c

Browse files
committed
Merge branch 'master' into no-python-loop
2 parents 59dfb01 + 369959a commit bb4321c

File tree

12 files changed

+258
-456
lines changed

12 files changed

+258
-456
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gi#########################################
1+
#########################################
22
# Editor temporary/working/backup files #
33
.#*
44
*\#*\#
@@ -19,6 +19,8 @@ gi#########################################
1919
.noseids
2020
.ipynb_checkpoints
2121
.tags
22+
.pytest_cache
23+
.testmondata
2224

2325
# Docs #
2426
########
@@ -29,6 +31,7 @@ docs/source/_build
2931
.coverage
3032
coverage.xml
3133
coverage_html_report
34+
.pytest_cache
3235

3336
# Compiled source #
3437
###################

.stickler.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
linters:
2+
flake8:
3+
max-line-length: 79
4+
fixer: true
5+
fixers:
6+
enable: true

ci/requirements-3.5-0.18.1.pip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
google-auth==1.0.0
1+
google-auth==1.0.2
22
google-auth-oauthlib==0.0.1
33
mock
44
google-cloud-bigquery==0.29.0

docs/source/changelog.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changelog
22
=========
33

4+
0.3.2 / [TBD]
5+
------------------
6+
- Fix bug with querying for an array of floats (:issue:`123`)
7+
48
0.3.1 / 2018-02-13
59
------------------
610

docs/source/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#
1919
import os
2020
import sys
21+
2122
# sys.path.insert(0, os.path.abspath('.'))
2223

2324
# -- General configuration ------------------------------------------------

pandas_gbq/_load.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Helper methods for loading data into BigQuery"""
22

3-
from google.cloud import bigquery
43
import six
4+
from google.cloud import bigquery
55

66
from pandas_gbq import _schema
77

pandas_gbq/gbq.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
import warnings
2-
from datetime import datetime
31
import json
2+
import os
3+
import sys
44
import time
5+
import warnings
6+
from datetime import datetime
7+
from distutils.version import StrictVersion
58
from time import sleep
6-
import sys
7-
import os
89

910
import numpy as np
10-
11-
from distutils.version import StrictVersion
12-
from pandas import compat, DataFrame
11+
from pandas import DataFrame, compat
1312

1413

1514
def _check_google_client_version():
@@ -28,8 +27,7 @@ def _check_google_client_version():
2827

2928
if (StrictVersion(_BIGQUERY_CLIENT_VERSION) <
3029
StrictVersion(bigquery_client_minimum_version)):
31-
raise ImportError('pandas requires google-cloud-bigquery >= {0} '
32-
'for Google BigQuery support, '
30+
raise ImportError('pandas-gbq requires google-cloud-bigquery >= {0}, '
3331
'current version {1}'
3432
.format(bigquery_client_minimum_version,
3533
_BIGQUERY_CLIENT_VERSION))
@@ -41,22 +39,19 @@ def _test_google_api_imports():
4139
from google_auth_oauthlib.flow import InstalledAppFlow # noqa
4240
except ImportError as ex:
4341
raise ImportError(
44-
'pandas requires google-auth-oauthlib for Google BigQuery '
45-
'support: {0}'.format(ex))
42+
'pandas-gbq requires google-auth-oauthlib: {0}'.format(ex))
4643

4744
try:
4845
import google.auth # noqa
4946
except ImportError as ex:
5047
raise ImportError(
51-
"pandas requires google-auth for Google BigQuery support: "
52-
"{0}".format(ex))
48+
"pandas-gbq requires google-auth: {0}".format(ex))
5349

5450
try:
5551
from google.cloud import bigquery # noqa
5652
except ImportError as ex:
5753
raise ImportError(
58-
"pandas requires google-cloud-python for Google BigQuery support: "
59-
"{0}".format(ex))
54+
"pandas-gbq requires google-cloud-bigquery: {0}".format(ex))
6055

6156
_check_google_client_version()
6257

0 commit comments

Comments
 (0)