Skip to content

Commit 21a8722

Browse files
authored
Replace deprecated delim_whitespace parameter to sep='\s+' in pd.read_csv (#2932)
1 parent 5e4388b commit 21a8722

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

pygmt/datasets/samples.py

+6-8
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def _load_japan_quakes():
2626
return pd.read_csv(
2727
fname,
2828
header=1,
29-
delim_whitespace=True,
29+
sep=r"\s+",
3030
names=[
3131
"year",
3232
"month",
@@ -52,7 +52,7 @@ def _load_ocean_ridge_points():
5252
fname = which("@ridge.txt", download="c")
5353
return pd.read_csv(
5454
fname,
55-
delim_whitespace=True,
55+
sep=r"\s+",
5656
names=["longitude", "latitude"],
5757
skiprows=1,
5858
comment=">",
@@ -102,9 +102,7 @@ def _load_fractures_compilation():
102102
the fractures.
103103
"""
104104
fname = which("@fractures_06.txt", download="c")
105-
data = pd.read_csv(
106-
fname, header=None, delim_whitespace=True, names=["azimuth", "length"]
107-
)
105+
data = pd.read_csv(fname, header=None, sep=r"\s+", names=["azimuth", "length"])
108106
return data[["length", "azimuth"]]
109107

110108

@@ -167,7 +165,7 @@ def _load_rock_sample_compositions():
167165
fname = which("@ternary.txt", download="c")
168166
return pd.read_csv(
169167
fname,
170-
delim_whitespace=True,
168+
sep=r"\s+",
171169
header=None,
172170
names=["limestone", "water", "air", "permittivity"],
173171
)
@@ -183,7 +181,7 @@ def _load_notre_dame_topography():
183181
The data table with columns "x", "y", and "z".
184182
"""
185183
fname = which("@Table_5_11.txt", download="c")
186-
return pd.read_csv(fname, delim_whitespace=True, header=None, names=["x", "y", "z"])
184+
return pd.read_csv(fname, sep=r"\s+", header=None, names=["x", "y", "z"])
187185

188186

189187
def _load_maunaloa_co2():
@@ -197,7 +195,7 @@ def _load_maunaloa_co2():
197195
"""
198196
fname = which("@MaunaLoa_CO2.txt", download="c")
199197
return pd.read_csv(
200-
fname, header=None, skiprows=1, delim_whitespace=True, names=["date", "co2_ppm"]
198+
fname, header=None, skiprows=1, sep=r"\s+", names=["date", "co2_ppm"]
201199
)
202200

203201

pygmt/tests/test_contour.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def fixture_data():
1818
"""
1919
Load the point data from the test file.
2020
"""
21-
return pd.read_table(POINTS_DATA, header=None, delim_whitespace=True)
21+
return pd.read_table(POINTS_DATA, header=None, sep=r"\s+")
2222

2323

2424
@pytest.fixture(scope="module", name="region")

pygmt/tests/test_grdtrack.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def fixture_dataframe():
5151
Load a pandas DataFrame with points.
5252
"""
5353
return pd.read_csv(
54-
POINTS_DATA, delim_whitespace=True, header=None, names=["longitude", "latitude"]
54+
POINTS_DATA, sep=r"\s+", header=None, names=["longitude", "latitude"]
5555
)
5656

5757

pygmt/tests/test_surface.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def fixture_data():
1818
"""
1919
fname = which("@Table_5_11_mean.xyz", download="c")
2020
return pd.read_csv(
21-
fname, delim_whitespace=True, header=None, names=["x", "y", "z"], skiprows=1
21+
fname, sep=r"\s+", header=None, names=["x", "y", "z"], skiprows=1
2222
)
2323

2424

pygmt/tests/test_triangulate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def fixture_dataframe():
1919
"""
2020
fname = which("@Table_5_11_mean.xyz", download="c")
2121
return pd.read_csv(
22-
fname, delim_whitespace=True, header=None, names=["x", "y", "z"], skiprows=1
22+
fname, sep=r"\s+", header=None, names=["x", "y", "z"], skiprows=1
2323
)[:10]
2424

2525

0 commit comments

Comments
 (0)