Skip to content

Backport PR #31411 on branch 1.0.x (COMPAT: dont pass dtype to datetime64) #31421

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
merged 1 commit into from
Jan 29, 2020
Merged

Backport PR #31411 on branch 1.0.x (COMPAT: dont pass dtype to datetime64) #31421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pandas/tests/scalar/timedelta/test_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ def test_td_rfloordiv_invalid_scalar(self):
# GH#18846
td = Timedelta(hours=3, minutes=3)

dt64 = np.datetime64("2016-01-01", dtype="datetime64[us]")
dt64 = np.datetime64("2016-01-01", "us")
with pytest.raises(TypeError):
td.__rfloordiv__(dt64)

Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/scalar/timestamp/test_timestamp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,15 +575,15 @@ def test_bounds_with_different_units(self):

for date_string in out_of_bounds_dates:
for unit in time_units:
dt64 = np.datetime64(date_string, dtype="M8[{unit}]".format(unit=unit))
dt64 = np.datetime64(date_string, unit)
with pytest.raises(ValueError):
Timestamp(dt64)

in_bounds_dates = ("1677-09-23", "2262-04-11")

for date_string in in_bounds_dates:
for unit in time_units:
dt64 = np.datetime64(date_string, dtype="M8[{unit}]".format(unit=unit))
dt64 = np.datetime64(date_string, unit)
Timestamp(dt64)

def test_min_valid(self):
Expand Down