Skip to content

Commit c304fe5

Browse files
SaturnFromTitanjreback
authored andcommitted
Remove TestData from series-tests test_sorting.py (#29149)
1 parent 0a2c418 commit c304fe5

File tree

1 file changed

+26
-22
lines changed

1 file changed

+26
-22
lines changed

pandas/tests/series/test_sorting.py

+26-22
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,17 @@
77
import pandas.util.testing as tm
88
from pandas.util.testing import assert_almost_equal, assert_series_equal
99

10-
from .common import TestData
1110

12-
13-
class TestSeriesSorting(TestData):
14-
def test_sort_values(self):
11+
class TestSeriesSorting:
12+
def test_sort_values(self, datetime_series):
1513

1614
# check indexes are reordered corresponding with the values
1715
ser = Series([3, 2, 4, 1], ["A", "B", "C", "D"])
1816
expected = Series([1, 2, 3, 4], ["D", "B", "A", "C"])
1917
result = ser.sort_values()
2018
tm.assert_series_equal(expected, result)
2119

22-
ts = self.ts.copy()
20+
ts = datetime_series.copy()
2321
ts[:5] = np.NaN
2422
vals = ts.values
2523

@@ -69,10 +67,12 @@ def test_sort_values(self):
6967
ts.sort_values(ascending="foobar")
7068

7169
# inplace=True
72-
ts = self.ts.copy()
70+
ts = datetime_series.copy()
7371
ts.sort_values(ascending=False, inplace=True)
74-
tm.assert_series_equal(ts, self.ts.sort_values(ascending=False))
75-
tm.assert_index_equal(ts.index, self.ts.sort_values(ascending=False).index)
72+
tm.assert_series_equal(ts, datetime_series.sort_values(ascending=False))
73+
tm.assert_index_equal(
74+
ts.index, datetime_series.sort_values(ascending=False).index
75+
)
7676

7777
# GH 5856/5853
7878
# Series.sort_values operating on a view
@@ -86,55 +86,59 @@ def test_sort_values(self):
8686
with pytest.raises(ValueError, match=msg):
8787
s.sort_values(inplace=True)
8888

89-
def test_sort_index(self):
90-
rindex = list(self.ts.index)
89+
def test_sort_index(self, datetime_series):
90+
rindex = list(datetime_series.index)
9191
random.shuffle(rindex)
9292

93-
random_order = self.ts.reindex(rindex)
93+
random_order = datetime_series.reindex(rindex)
9494
sorted_series = random_order.sort_index()
95-
assert_series_equal(sorted_series, self.ts)
95+
assert_series_equal(sorted_series, datetime_series)
9696

9797
# descending
9898
sorted_series = random_order.sort_index(ascending=False)
99-
assert_series_equal(sorted_series, self.ts.reindex(self.ts.index[::-1]))
99+
assert_series_equal(
100+
sorted_series, datetime_series.reindex(datetime_series.index[::-1])
101+
)
100102

101103
# compat on level
102104
sorted_series = random_order.sort_index(level=0)
103-
assert_series_equal(sorted_series, self.ts)
105+
assert_series_equal(sorted_series, datetime_series)
104106

105107
# compat on axis
106108
sorted_series = random_order.sort_index(axis=0)
107-
assert_series_equal(sorted_series, self.ts)
109+
assert_series_equal(sorted_series, datetime_series)
108110

109111
msg = "No axis named 1 for object type <class 'pandas.core.series.Series'>"
110112
with pytest.raises(ValueError, match=msg):
111113
random_order.sort_values(axis=1)
112114

113115
sorted_series = random_order.sort_index(level=0, axis=0)
114-
assert_series_equal(sorted_series, self.ts)
116+
assert_series_equal(sorted_series, datetime_series)
115117

116118
with pytest.raises(ValueError, match=msg):
117119
random_order.sort_index(level=0, axis=1)
118120

119-
def test_sort_index_inplace(self):
121+
def test_sort_index_inplace(self, datetime_series):
120122

121123
# For #11402
122-
rindex = list(self.ts.index)
124+
rindex = list(datetime_series.index)
123125
random.shuffle(rindex)
124126

125127
# descending
126-
random_order = self.ts.reindex(rindex)
128+
random_order = datetime_series.reindex(rindex)
127129
result = random_order.sort_index(ascending=False, inplace=True)
128130

129131
assert result is None
130-
tm.assert_series_equal(random_order, self.ts.reindex(self.ts.index[::-1]))
132+
tm.assert_series_equal(
133+
random_order, datetime_series.reindex(datetime_series.index[::-1])
134+
)
131135

132136
# ascending
133-
random_order = self.ts.reindex(rindex)
137+
random_order = datetime_series.reindex(rindex)
134138
result = random_order.sort_index(ascending=True, inplace=True)
135139

136140
assert result is None
137-
tm.assert_series_equal(random_order, self.ts)
141+
tm.assert_series_equal(random_order, datetime_series)
138142

139143
@pytest.mark.parametrize("level", ["A", 0]) # GH 21052
140144
def test_sort_index_multiindex(self, level):

0 commit comments

Comments
 (0)