Skip to content

Commit 148abba

Browse files
authored
REF: misplaced repr tests (#32736)
1 parent beef620 commit 148abba

File tree

5 files changed

+29
-30
lines changed

5 files changed

+29
-30
lines changed

pandas/tests/frame/test_repr_info.py

+5
Original file line numberDiff line numberDiff line change
@@ -212,3 +212,8 @@ def test_repr_np_nat_with_object(self, arg, box, expected):
212212
# GH 25445
213213
result = repr(box([arg("NaT")], dtype=object))
214214
assert result == expected
215+
216+
def test_frame_datetime64_pre1900_repr(self):
217+
df = DataFrame({"year": date_range("1/1/1700", periods=50, freq="A-DEC")})
218+
# it works!
219+
repr(df)

pandas/tests/frame/test_timeseries.py

-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ def test_frame_append_datetime64_column(self):
2020
df["A"] = rng
2121
assert np.issubdtype(df["A"].dtype, np.dtype("M8[ns]"))
2222

23-
def test_frame_datetime64_pre1900_repr(self):
24-
df = DataFrame({"year": date_range("1/1/1700", periods=50, freq="A-DEC")})
25-
# it works!
26-
repr(df)
27-
2823
def test_frame_append_datetime64_col_other_units(self):
2924
n = 100
3025

pandas/tests/series/indexing/test_alter_index.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -523,9 +523,9 @@ def test_drop_unique_and_non_unique_index(
523523
],
524524
)
525525
def test_drop_exception_raised(data, index, drop_labels, axis, error_type, error_desc):
526-
526+
ser = Series(data, index=index)
527527
with pytest.raises(error_type, match=error_desc):
528-
Series(data, index=index).drop(drop_labels, axis=axis)
528+
ser.drop(drop_labels, axis=axis)
529529

530530

531531
def test_drop_with_ignore_errors():
@@ -565,6 +565,7 @@ def test_drop_empty_list(index, drop_labels):
565565
)
566566
def test_drop_non_empty_list(data, index, drop_labels):
567567
# GH 21494 and GH 16877
568+
dtype = object if data is None else None
569+
ser = pd.Series(data=data, index=index, dtype=dtype)
568570
with pytest.raises(KeyError, match="not found in axis"):
569-
dtype = object if data is None else None
570-
pd.Series(data=data, index=index, dtype=dtype).drop(drop_labels)
571+
ser.drop(drop_labels)

pandas/tests/series/test_repr.py

+19
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,25 @@ def test_index_repr_in_frame_with_nan(self):
218218

219219
assert repr(s) == exp
220220

221+
def test_format_pre_1900_dates(self):
222+
rng = date_range("1/1/1850", "1/1/1950", freq="A-DEC")
223+
rng.format()
224+
ts = Series(1, index=rng)
225+
repr(ts)
226+
227+
def test_series_repr_nat(self):
228+
series = Series([0, 1000, 2000, pd.NaT.value], dtype="M8[ns]")
229+
230+
result = repr(series)
231+
expected = (
232+
"0 1970-01-01 00:00:00.000000\n"
233+
"1 1970-01-01 00:00:00.000001\n"
234+
"2 1970-01-01 00:00:00.000002\n"
235+
"3 NaT\n"
236+
"dtype: datetime64[ns]"
237+
)
238+
assert result == expected
239+
221240

222241
class TestCategoricalRepr:
223242
def test_categorical_repr_unicode(self):

pandas/tests/series/test_timeseries.py

-21
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import numpy as np
44

5-
from pandas._libs.tslib import iNaT
6-
75
import pandas as pd
86
from pandas import DataFrame, DatetimeIndex, Series, date_range, timedelta_range
97
import pandas._testing as tm
@@ -88,19 +86,6 @@ def test_series_ctor_datetime64(self):
8886
series = Series(dates)
8987
assert np.issubdtype(series.dtype, np.dtype("M8[ns]"))
9088

91-
def test_series_repr_nat(self):
92-
series = Series([0, 1000, 2000, iNaT], dtype="M8[ns]")
93-
94-
result = repr(series)
95-
expected = (
96-
"0 1970-01-01 00:00:00.000000\n"
97-
"1 1970-01-01 00:00:00.000001\n"
98-
"2 1970-01-01 00:00:00.000002\n"
99-
"3 NaT\n"
100-
"dtype: datetime64[ns]"
101-
)
102-
assert result == expected
103-
10489
def test_promote_datetime_date(self):
10590
rng = date_range("1/1/2000", periods=20)
10691
ts = Series(np.random.randn(20), index=rng)
@@ -124,12 +109,6 @@ def test_promote_datetime_date(self):
124109
expected = rng.get_indexer(ts_slice.index)
125110
tm.assert_numpy_array_equal(result, expected)
126111

127-
def test_format_pre_1900_dates(self):
128-
rng = date_range("1/1/1850", "1/1/1950", freq="A-DEC")
129-
rng.format()
130-
ts = Series(1, index=rng)
131-
repr(ts)
132-
133112
def test_groupby_count_dateparseerror(self):
134113
dr = date_range(start="1/1/2012", freq="5min", periods=10)
135114

0 commit comments

Comments
 (0)