Merge branch 'master' into test-class-not-runnning

Author: max-sixty

.gitignore

@@ -1,4 +1,4 @@
-gi#########################################
+#########################################
 # Editor temporary/working/backup files #
 .#*
 *\#*\#
@@ -19,6 +19,8 @@ gi#########################################
 .noseids
 .ipynb_checkpoints
 .tags
+.pytest_cache
+.testmondata
 
 # Docs #
 ########

.stickler.yml

@@ -0,0 +1,6 @@
+linters:
+  flake8:
+    max-line-length: 79
+    fixer: true
+fixers:
+  enable: true

ci/requirements-3.5-0.18.1.pip

@@ -1,4 +1,4 @@
-google-auth==1.0.0
+google-auth==1.0.2
 google-auth-oauthlib==0.0.1
 mock
 google-cloud-bigquery==0.29.0

pandas_gbq/gbq.py

@@ -29,8 +29,7 @@ def _check_google_client_version():
 
     if (StrictVersion(_BIGQUERY_CLIENT_VERSION) <
             StrictVersion(bigquery_client_minimum_version)):
-        raise ImportError('pandas requires google-cloud-bigquery >= {0} '
-                          'for Google BigQuery support, '
+        raise ImportError('pandas-gbq requires google-cloud-bigquery >= {0}, '
                           'current version {1}'
                           .format(bigquery_client_minimum_version,
                                   _BIGQUERY_CLIENT_VERSION))
@@ -42,22 +41,19 @@ def _test_google_api_imports():
         from google_auth_oauthlib.flow import InstalledAppFlow  # noqa
     except ImportError as ex:
         raise ImportError(
-            'pandas requires google-auth-oauthlib for Google BigQuery '
-            'support: {0}'.format(ex))
+            'pandas-gbq requires google-auth-oauthlib: {0}'.format(ex))
 
     try:
         import google.auth  # noqa
     except ImportError as ex:
         raise ImportError(
-            "pandas requires google-auth for Google BigQuery support: "
-            "{0}".format(ex))
+            "pandas-gbq requires google-auth: {0}".format(ex))
 
     try:
         from google.cloud import bigquery  # noqa
     except ImportError as ex:
         raise ImportError(
-            "pandas requires google-cloud-python for Google BigQuery support: "
-            "{0}".format(ex))
+            "pandas-gbq requires google-cloud-bigquery: {0}".format(ex))
 
     _check_google_client_version()