Skip to content

Commit db9d120

Browse files
authored
Consistently use delim_whitespace=True instead of sep=r'\s+' in pd.read_csv calls (#2337)
1 parent fce5cb6 commit db9d120

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

pygmt/datasets/samples.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ def _load_notre_dame_topography():
289289
The data table with columns "x", "y", and "z".
290290
"""
291291
fname = which("@Table_5_11.txt", download="c")
292-
return pd.read_csv(fname, sep=r"\s+", header=None, names=["x", "y", "z"])
292+
return pd.read_csv(fname, delim_whitespace=True, header=None, names=["x", "y", "z"])
293293

294294

295295
def _load_maunaloa_co2():
@@ -303,7 +303,7 @@ def _load_maunaloa_co2():
303303
"""
304304
fname = which("@MaunaLoa_CO2.txt", download="c")
305305
return pd.read_csv(
306-
fname, header=None, skiprows=1, sep=r"\s+", names=["date", "co2_ppm"]
306+
fname, header=None, skiprows=1, delim_whitespace=True, names=["date", "co2_ppm"]
307307
)
308308

309309

pygmt/tests/test_contour.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def fixture_data():
1919
"""
2020
Load the point data from the test file.
2121
"""
22-
return pd.read_table(POINTS_DATA, header=None, sep=r"\s+")
22+
return pd.read_table(POINTS_DATA, header=None, delim_whitespace=True)
2323

2424

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

pygmt/tests/test_grdtrack.py

Lines changed: 1 addition & 1 deletion
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, sep=r"\s+", header=None, names=["longitude", "latitude"]
54+
POINTS_DATA, delim_whitespace=True, header=None, names=["longitude", "latitude"]
5555
)
5656

5757

pygmt/tests/test_surface.py

Lines changed: 1 addition & 1 deletion
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, sep=r"\s+", header=None, names=["x", "y", "z"], skiprows=1
21+
fname, delim_whitespace=True, header=None, names=["x", "y", "z"], skiprows=1
2222
)
2323

2424

pygmt/tests/test_triangulate.py

Lines changed: 1 addition & 1 deletion
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, sep=r"\s+", header=None, names=["x", "y", "z"], skiprows=1
22+
fname, delim_whitespace=True, header=None, names=["x", "y", "z"], skiprows=1
2323
)[:10]
2424

2525

0 commit comments

Comments
 (0)