Skip to content

Remove TestData from series-tests test_sorting.py #29149

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
Oct 22, 2019
Merged

Remove TestData from series-tests test_sorting.py #29149

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
48 changes: 26 additions & 22 deletions pandas/tests/series/test_sorting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@
import pandas.util.testing as tm
from pandas.util.testing import assert_almost_equal, assert_series_equal

from .common import TestData


class TestSeriesSorting(TestData):
def test_sort_values(self):
class TestSeriesSorting:
def test_sort_values(self, datetime_series):

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

ts = self.ts.copy()
ts = datetime_series.copy()
ts[:5] = np.NaN
vals = ts.values

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

# inplace=True
ts = self.ts.copy()
ts = datetime_series.copy()
ts.sort_values(ascending=False, inplace=True)
tm.assert_series_equal(ts, self.ts.sort_values(ascending=False))
tm.assert_index_equal(ts.index, self.ts.sort_values(ascending=False).index)
tm.assert_series_equal(ts, datetime_series.sort_values(ascending=False))
tm.assert_index_equal(
ts.index, datetime_series.sort_values(ascending=False).index
)

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

def test_sort_index(self):
rindex = list(self.ts.index)
def test_sort_index(self, datetime_series):
rindex = list(datetime_series.index)
random.shuffle(rindex)

random_order = self.ts.reindex(rindex)
random_order = datetime_series.reindex(rindex)
sorted_series = random_order.sort_index()
assert_series_equal(sorted_series, self.ts)
assert_series_equal(sorted_series, datetime_series)

# descending
sorted_series = random_order.sort_index(ascending=False)
assert_series_equal(sorted_series, self.ts.reindex(self.ts.index[::-1]))
assert_series_equal(
sorted_series, datetime_series.reindex(datetime_series.index[::-1])
)

# compat on level
sorted_series = random_order.sort_index(level=0)
assert_series_equal(sorted_series, self.ts)
assert_series_equal(sorted_series, datetime_series)

# compat on axis
sorted_series = random_order.sort_index(axis=0)
assert_series_equal(sorted_series, self.ts)
assert_series_equal(sorted_series, datetime_series)

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

sorted_series = random_order.sort_index(level=0, axis=0)
assert_series_equal(sorted_series, self.ts)
assert_series_equal(sorted_series, datetime_series)

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

def test_sort_index_inplace(self):
def test_sort_index_inplace(self, datetime_series):

# For #11402
rindex = list(self.ts.index)
rindex = list(datetime_series.index)
random.shuffle(rindex)

# descending
random_order = self.ts.reindex(rindex)
random_order = datetime_series.reindex(rindex)
result = random_order.sort_index(ascending=False, inplace=True)

assert result is None
tm.assert_series_equal(random_order, self.ts.reindex(self.ts.index[::-1]))
tm.assert_series_equal(
random_order, datetime_series.reindex(datetime_series.index[::-1])
)

# ascending
random_order = self.ts.reindex(rindex)
random_order = datetime_series.reindex(rindex)
result = random_order.sort_index(ascending=True, inplace=True)

assert result is None
tm.assert_series_equal(random_order, self.ts)
tm.assert_series_equal(random_order, datetime_series)

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