Skip to content

Commit 95427d5

Browse files
bnaulTomAugspurger
authored andcommitted
[ENH] Add read support for Google Cloud Storage (#20729)
* Google Cloud Storage support using gcsfs
1 parent dbd102c commit 95427d5

18 files changed

+116
-19
lines changed

ci/appveyor-27.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dependencies:
66
- beautifulsoup4
77
- bottleneck
88
- dateutil
9+
- gcsfs
910
- html5lib
1011
- jinja2=2.8
1112
- lxml

ci/check_imports.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
blacklist = {
77
'bs4',
8+
'gcsfs',
89
'html5lib',
910
'ipython',
1011
'jinja2'

ci/circle-36-locale_slow.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ channels:
55
dependencies:
66
- beautifulsoup4
77
- cython
8+
- gcsfs
89
- html5lib
910
- ipython
1011
- jinja2

ci/requirements-optional-conda.txt

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ blosc
33
bottleneck
44
fastparquet
55
feather-format
6+
gcsfs
67
html5lib
78
ipython>=5.6.0
89
ipykernel

ci/requirements-optional-pip.txt

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ blosc
55
bottleneck
66
fastparquet
77
feather-format
8+
gcsfs
89
html5lib
910
ipython>=5.6.0
1011
ipykernel

ci/travis-27.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies:
99
- fastparquet
1010
- feather-format
1111
- flake8=3.4.1
12+
- gcsfs
1213
- html5lib
1314
- ipython
1415
- jemalloc=4.5.0.post

ci/travis-36.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ dependencies:
88
- dask
99
- fastparquet
1010
- feather-format
11+
- gcsfs
1112
- geopandas
1213
- html5lib
1314
- ipython

doc/source/install.rst

+1
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ Optional Dependencies
276276
* `Jinja2 <http://jinja.pocoo.org/>`__: Template engine for conditional HTML formatting.
277277
* `s3fs <http://s3fs.readthedocs.io/>`__: necessary for Amazon S3 access (s3fs >= 0.0.7).
278278
* `blosc <https://pypi.org/project/blosc>`__: for msgpack compression using ``blosc``
279+
* `gcsfs <http://gcsfs.readthedocs.io/>`__: necessary for Google Cloud Storage access (gcsfs >= 0.1.0).
279280
* One of
280281
`qtpy <https://github.com/spyder-ide/qtpy>`__ (requires PyQt or PySide),
281282
`PyQt5 <https://www.riverbankcomputing.com/software/pyqt/download5>`__,

doc/source/whatsnew/v0.24.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Other Enhancements
1818
- :func:`Series.mode` and :func:`DataFrame.mode` now support the ``dropna`` parameter which can be used to specify whether NaN/NaT values should be considered (:issue:`17534`)
1919
- :func:`to_csv` now supports ``compression`` keyword when a file handle is passed. (:issue:`21227`)
2020
- :meth:`Index.droplevel` is now implemented also for flat indexes, for compatibility with :class:`MultiIndex` (:issue:`21115`)
21-
21+
- Added support for reading from Google Cloud Storage via the ``gcsfs`` library (:issue:`19454`)
2222

2323
.. _whatsnew_0240.api_breaking:
2424

pandas/conftest.py

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import importlib
2+
13
import pytest
24

35
import numpy as np
@@ -249,3 +251,17 @@ def any_int_dtype(request):
249251
"""
250252

251253
return request.param
254+
255+
256+
@pytest.fixture
257+
def mock():
258+
"""
259+
Fixture providing the 'mock' module.
260+
261+
Uses 'unittest.mock' for Python 3. Attempts to import the 3rd party 'mock'
262+
package for Python 2, skipping if not present.
263+
"""
264+
if PY3:
265+
return importlib.import_module("unittest.mock")
266+
else:
267+
return pytest.importorskip("mock")

pandas/io/common.py

+17-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def _is_url(url):
8888
"""
8989
try:
9090
return parse_url(url).scheme in _VALID_URLS
91-
except:
91+
except Exception:
9292
return False
9393

9494

@@ -165,7 +165,15 @@ def is_s3_url(url):
165165
"""Check for an s3, s3n, or s3a url"""
166166
try:
167167
return parse_url(url).scheme in ['s3', 's3n', 's3a']
168-
except: # noqa
168+
except Exception:
169+
return False
170+
171+
172+
def is_gcs_url(url):
173+
"""Check for a gcs url"""
174+
try:
175+
return parse_url(url).scheme in ['gcs', 'gs']
176+
except Exception:
169177
return False
170178

171179

@@ -208,6 +216,13 @@ def get_filepath_or_buffer(filepath_or_buffer, encoding=None,
208216
compression=compression,
209217
mode=mode)
210218

219+
if is_gcs_url(filepath_or_buffer):
220+
from pandas.io import gcs
221+
return gcs.get_filepath_or_buffer(filepath_or_buffer,
222+
encoding=encoding,
223+
compression=compression,
224+
mode=mode)
225+
211226
if isinstance(filepath_or_buffer, (compat.string_types,
212227
compat.binary_type,
213228
mmap.mmap)):

pandas/io/excel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
io : string, path object (pathlib.Path or py._path.local.LocalPath),
4747
file-like object, pandas ExcelFile, or xlrd workbook.
4848
The string could be a URL. Valid URL schemes include http, ftp, s3,
49-
and file. For file URLs, a host is expected. For instance, a local
49+
gcs, and file. For file URLs, a host is expected. For instance, a local
5050
file could be file://localhost/path/to/workbook.xlsx
5151
sheet_name : string, int, mixed list of strings/ints, or None, default 0
5252

pandas/io/gcs.py

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
""" GCS support for remote file interactivity """
2+
try:
3+
import gcsfs
4+
except ImportError:
5+
raise ImportError("The gcsfs library is required to handle GCS files")
6+
7+
8+
def get_filepath_or_buffer(filepath_or_buffer, encoding=None,
9+
compression=None, mode=None):
10+
11+
if mode is None:
12+
mode = 'rb'
13+
14+
fs = gcsfs.GCSFileSystem()
15+
filepath_or_buffer = fs.open(filepath_or_buffer, mode)
16+
return filepath_or_buffer, None, compression, True

pandas/io/json/json.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ def read_json(path_or_buf=None, orient=None, typ='frame', dtype=True,
231231
Parameters
232232
----------
233233
path_or_buf : a valid JSON string or file-like, default: None
234-
The string could be a URL. Valid URL schemes include http, ftp, s3, and
235-
file. For file URLs, a host is expected. For instance, a local file
236-
could be ``file://localhost/path/to/table.json``
234+
The string could be a URL. Valid URL schemes include http, ftp, s3,
235+
gcs, and file. For file URLs, a host is expected. For instance, a local
236+
file could be ``file://localhost/path/to/table.json``
237237
238238
orient : string,
239239
Indication of expected JSON string format.

pandas/tests/dtypes/test_inference.py

+3-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
DatetimeIndex, TimedeltaIndex, Timestamp,
2121
Panel, Period, Categorical, isna, Interval,
2222
DateOffset)
23-
from pandas.compat import u, PY2, PY3, StringIO, lrange
23+
from pandas.compat import u, PY2, StringIO, lrange
2424
from pandas.core.dtypes import inference
2525
from pandas.core.dtypes.common import (
2626
is_timedelta64_dtype,
@@ -128,7 +128,7 @@ def test_is_dict_like_fails(ll):
128128
assert not inference.is_dict_like(ll)
129129

130130

131-
def test_is_file_like():
131+
def test_is_file_like(mock):
132132
class MockFile(object):
133133
pass
134134

@@ -166,10 +166,7 @@ class MockFile(object):
166166
# Iterator but no read / write attributes
167167
data = [1, 2, 3]
168168
assert not is_file(data)
169-
170-
if PY3:
171-
from unittest import mock
172-
assert not is_file(mock.Mock())
169+
assert not is_file(mock.Mock())
173170

174171

175172
@pytest.mark.parametrize(

pandas/tests/io/parser/common.py

+3-6
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ def test_file_handles(self):
15461546
assert not m.closed
15471547
m.close()
15481548

1549-
def test_invalid_file_buffer(self):
1549+
def test_invalid_file_buffer(self, mock):
15501550
# see gh-15337
15511551

15521552
class InvalidBuffer(object):
@@ -1577,11 +1577,8 @@ def seek(self, pos, whence=0):
15771577

15781578
tm.assert_frame_equal(result, expected)
15791579

1580-
if PY3:
1581-
from unittest import mock
1582-
1583-
with tm.assert_raises_regex(ValueError, msg):
1584-
self.read_csv(mock.Mock())
1580+
with tm.assert_raises_regex(ValueError, msg):
1581+
self.read_csv(mock.Mock())
15851582

15861583
@tm.capture_stderr
15871584
def test_skip_bad_lines(self):

pandas/tests/io/test_gcs.py

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
import numpy as np
2+
import pytest
3+
4+
from pandas import DataFrame, date_range, read_csv
5+
from pandas.compat import StringIO
6+
from pandas.io.common import is_gcs_url
7+
from pandas.util import _test_decorators as td
8+
from pandas.util.testing import assert_frame_equal
9+
10+
11+
def test_is_gcs_url():
12+
assert is_gcs_url("gcs://pandas/somethingelse.com")
13+
assert is_gcs_url("gs://pandas/somethingelse.com")
14+
assert not is_gcs_url("s3://pandas/somethingelse.com")
15+
16+
17+
@td.skip_if_no('gcsfs')
18+
def test_read_csv_gcs(mock):
19+
df1 = DataFrame({'int': [1, 3], 'float': [2.0, np.nan], 'str': ['t', 's'],
20+
'dt': date_range('2018-06-18', periods=2)})
21+
with mock.patch('gcsfs.GCSFileSystem') as MockFileSystem:
22+
instance = MockFileSystem.return_value
23+
instance.open.return_value = StringIO(df1.to_csv(index=False))
24+
df2 = read_csv('gs://test/test.csv', parse_dates=['dt'])
25+
26+
assert_frame_equal(df1, df2)
27+
28+
29+
@td.skip_if_no('gcsfs')
30+
def test_gcs_get_filepath_or_buffer(mock):
31+
df1 = DataFrame({'int': [1, 3], 'float': [2.0, np.nan], 'str': ['t', 's'],
32+
'dt': date_range('2018-06-18', periods=2)})
33+
with mock.patch('pandas.io.gcs.get_filepath_or_buffer') as MockGetFilepath:
34+
MockGetFilepath.return_value = (StringIO(df1.to_csv(index=False)),
35+
None, None, False)
36+
df2 = read_csv('gs://test/test.csv', parse_dates=['dt'])
37+
38+
assert_frame_equal(df1, df2)
39+
assert MockGetFilepath.called
40+
41+
42+
@pytest.mark.skipif(td.safe_import('gcsfs'),
43+
reason='Only check when gcsfs not installed')
44+
def test_gcs_not_present_exception():
45+
with pytest.raises(ImportError) as e:
46+
read_csv('gs://test/test.csv')
47+
assert 'gcsfs library is required' in str(e.value)

pandas/util/_print_versions.py

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ def show_versions(as_json=False):
9696
("fastparquet", lambda mod: mod.__version__),
9797
("pandas_gbq", lambda mod: mod.__version__),
9898
("pandas_datareader", lambda mod: mod.__version__),
99+
("gcsfs", lambda mod: mod.__version__),
99100
]
100101

101102
deps_blob = list()

0 commit comments

Comments
 (0)