Skip to content

Commit 79fb1dd

Browse files
authored
CLN: update tslibs/tseries test locations/imports (#34614)
1 parent 3d44136 commit 79fb1dd

File tree

4 files changed

+30
-29
lines changed

4 files changed

+30
-29
lines changed

pandas/tests/tseries/frequencies/test_freq_code.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest
22

3-
from pandas._libs.tslibs import to_offset
3+
from pandas._libs.tslibs import Resolution, offsets, to_offset
44
from pandas._libs.tslibs.frequencies import (
55
FreqGroup,
66
_attrname_to_abbrevs,
@@ -9,9 +9,6 @@
99
get_freq_group,
1010
get_to_timestamp_base,
1111
)
12-
from pandas._libs.tslibs.resolution import Resolution as _reso
13-
14-
import pandas.tseries.offsets as offsets
1512

1613

1714
@pytest.fixture(params=list(_period_code_map.items()))
@@ -103,19 +100,19 @@ def test_get_to_timestamp_base(freqstr, exp_freqstr):
103100
],
104101
)
105102
def test_get_attrname_from_abbrev(freqstr, expected):
106-
assert _reso.get_reso_from_freq(freqstr).attrname == expected
103+
assert Resolution.get_reso_from_freq(freqstr).attrname == expected
107104

108105

109106
@pytest.mark.parametrize("freq", ["A", "Q", "M"])
110107
def test_get_freq_unsupported_(freq):
111108
# Lowest-frequency resolution is for Day
112109
with pytest.raises(KeyError, match=freq.lower()):
113-
_reso.get_reso_from_freq(freq)
110+
Resolution.get_reso_from_freq(freq)
114111

115112

116113
@pytest.mark.parametrize("freq", ["D", "H", "T", "S", "L", "U", "N"])
117114
def test_get_freq_roundtrip2(freq):
118-
obj = _reso.get_reso_from_freq(freq)
115+
obj = Resolution.get_reso_from_freq(freq)
119116
result = _attrname_to_abbrevs[obj.attrname]
120117
assert freq == result
121118

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import pytest
2+
3+
from pandas._libs.tslibs import offsets
4+
5+
from pandas.tseries.frequencies import is_subperiod, is_superperiod
6+
7+
8+
@pytest.mark.parametrize(
9+
"p1,p2,expected",
10+
[
11+
# Input validation.
12+
(offsets.MonthEnd(), None, False),
13+
(offsets.YearEnd(), None, False),
14+
(None, offsets.YearEnd(), False),
15+
(None, offsets.MonthEnd(), False),
16+
(None, None, False),
17+
(offsets.YearEnd(), offsets.MonthEnd(), True),
18+
(offsets.Hour(), offsets.Minute(), True),
19+
(offsets.Second(), offsets.Milli(), True),
20+
(offsets.Milli(), offsets.Micro(), True),
21+
(offsets.Micro(), offsets.Nano(), True),
22+
],
23+
)
24+
def test_super_sub_symmetry(p1, p2, expected):
25+
assert is_superperiod(p1, p2) is expected
26+
assert is_subperiod(p2, p1) is expected

pandas/tests/tslibs/test_libfrequencies.py

-22
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from pandas._libs.tslibs.parsing import get_rule_month
55

66
from pandas.tseries import offsets
7-
from pandas.tseries.frequencies import is_subperiod, is_superperiod # TODO: move tests
87

98

109
@pytest.mark.parametrize(
@@ -56,27 +55,6 @@ def test_period_str_to_code(obj, expected):
5655
assert _period_str_to_code(obj) == expected
5756

5857

59-
@pytest.mark.parametrize(
60-
"p1,p2,expected",
61-
[
62-
# Input validation.
63-
(offsets.MonthEnd(), None, False),
64-
(offsets.YearEnd(), None, False),
65-
(None, offsets.YearEnd(), False),
66-
(None, offsets.MonthEnd(), False),
67-
(None, None, False),
68-
(offsets.YearEnd(), offsets.MonthEnd(), True),
69-
(offsets.Hour(), offsets.Minute(), True),
70-
(offsets.Second(), offsets.Milli(), True),
71-
(offsets.Milli(), offsets.Micro(), True),
72-
(offsets.Micro(), offsets.Nano(), True),
73-
],
74-
)
75-
def test_super_sub_symmetry(p1, p2, expected):
76-
assert is_superperiod(p1, p2) is expected
77-
assert is_subperiod(p2, p1) is expected
78-
79-
8058
@pytest.mark.parametrize(
8159
"freq,expected,aliases",
8260
[

0 commit comments

Comments
 (0)