Skip to content

Tests: Replace deprecated "np.random.seed()" with "np.random.Generator()" (NPY002 warning by ruff) #2787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seisman merged 3 commits into from
Nov 2, 2023
Merged

Tests: Replace deprecated "np.random.seed()" with "np.random.Generator()" (NPY002 warning by ruff) #2787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c06c70
Follow NPY002 in test 'test_io.py'
Oct 31, 2023
7416955
Follow NPY002 in test 'test_x2sys_cross.py'
Oct 31, 2023
f48a00c
Fix tests
Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pygmt/tests/test_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ def test_io_load_dataarray():
GMTDataArrayAccessor information loaded.
"""
with GMTTempFile(suffix=".nc") as tmpfile:
rng = np.random.default_rng()
grid = xr.DataArray(
data=np.random.rand(2, 2), coords=[[0.1, 0.2], [0.3, 0.4]], dims=("x", "y")
data=rng.random((2, 2)), coords=[[0.1, 0.2], [0.3, 0.4]], dims=("x", "y")
)
grid.to_netcdf(tmpfile.name)
dataarray = load_dataarray(tmpfile.name)
Expand Down
12 changes: 6 additions & 6 deletions pygmt/tests/test_x2sys_cross.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ def test_x2sys_cross_input_two_dataframes(mock_x2sys_home):
# Create pandas.DataFrame track tables
tracks = []
for i in range(2):
np.random.seed(seed=i)
track = pd.DataFrame(data=np.random.rand(10, 3), columns=("x", "y", "z"))
rng = np.random.default_rng(seed=i)
track = pd.DataFrame(data=rng.random((10, 3)), columns=("x", "y", "z"))
track["time"] = pd.date_range(start=f"2020-{i}1-01", periods=10, freq="min")
tracks.append(track)

output = x2sys_cross(tracks=tracks, tag=tag, coe="e")

assert isinstance(output, pd.DataFrame)
assert output.shape == (30, 12)
assert output.shape == (26, 12)
Copy link
Member

@seisman seisman Oct 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes make sense to me, but ping the original author @weiji14 to review.

columns = list(output.columns)
assert columns[:6] == ["x", "y", "t_1", "t_2", "dist_1", "dist_2"]
assert columns[6:] == ["head_1", "head_2", "vel_1", "vel_2", "z_X", "z_M"]
Expand Down Expand Up @@ -160,16 +160,16 @@ def test_x2sys_cross_input_two_filenames(mock_x2sys_home):

# Create temporary xyz files
for i in range(2):
np.random.seed(seed=i)
rng = np.random.default_rng(seed=i)
with open(
os.path.join(os.getcwd(), f"track_{i}.xyz"), mode="w", encoding="utf8"
) as fname:
np.savetxt(fname=fname, X=np.random.rand(10, 3))
np.savetxt(fname=fname, X=rng.random((10, 3)))

output = x2sys_cross(tracks=["track_0.xyz", "track_1.xyz"], tag=tag, coe="e")

assert isinstance(output, pd.DataFrame)
assert output.shape == (24, 12)
assert output.shape == (18, 12)
columns = list(output.columns)
assert columns[:6] == ["x", "y", "i_1", "i_2", "dist_1", "dist_2"]
assert columns[6:] == ["head_1", "head_2", "vel_1", "vel_2", "z_X", "z_M"]
Expand Down