Skip to content

Commit 4c79859

Browse files
committed
Merge pull request #7042 from jreback/test_offset
TST: clean skipping tests in test_offsets
2 parents b5ede83 + a803bad commit 4c79859

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

pandas/tseries/tests/test_offsets.py

+32-32
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def test_to_m8():
9797
### DateOffset Tests
9898
#####
9999

100-
class TestBase(tm.TestCase):
100+
class Base(tm.TestCase):
101101
_offset = None
102102

103103
offset_types = [getattr(offsets, o) for o in offsets.__all__]
@@ -119,8 +119,8 @@ def _get_offset(self, klass, value=1):
119119

120120
def test_apply_out_of_range(self):
121121
if self._offset is None:
122-
raise nose.SkipTest("_offset not defined to test out-of-range")
123-
if self._offset in self.skip_np_u1p7:
122+
return
123+
if _np_version_under1p7 and self._offset in self.skip_np_u1p7:
124124
raise nose.SkipTest('numpy >= 1.7 required')
125125

126126
# try to create an out-of-bounds result timestamp; if we can't create the offset
@@ -132,11 +132,11 @@ def test_apply_out_of_range(self):
132132
self.assertIsInstance(result, datetime)
133133
except (OutOfBoundsDatetime):
134134
raise
135-
except (ValueError, KeyError):
136-
raise nose.SkipTest("cannot create out_of_range offset")
135+
except (ValueError, KeyError) as e:
136+
raise nose.SkipTest("cannot create out_of_range offset: {0} {1}".format(str(self).split('.')[-1],e))
137137

138138

139-
class TestOps(TestBase):
139+
class TestOps(Base):
140140

141141
def test_return_type(self):
142142
for offset in self.offset_types:
@@ -157,7 +157,7 @@ def test_return_type(self):
157157
self.assert_((-offset).apply(NaT) is NaT)
158158

159159

160-
class TestDateOffset(TestBase):
160+
class TestDateOffset(Base):
161161
_multiprocess_can_split_ = True
162162

163163
def setUp(self):
@@ -197,7 +197,7 @@ def test_eq(self):
197197
self.assertNotEqual(offset1, offset2)
198198

199199

200-
class TestBusinessDay(TestBase):
200+
class TestBusinessDay(Base):
201201
_multiprocess_can_split_ = True
202202
_offset = BDay
203203

@@ -376,7 +376,7 @@ def test_offsets_compare_equal(self):
376376
self.assertFalse(offset1 != offset2)
377377

378378

379-
class TestCustomBusinessDay(TestBase):
379+
class TestCustomBusinessDay(Base):
380380
_multiprocess_can_split_ = True
381381
_offset = CDay
382382

@@ -641,7 +641,7 @@ def test_offsets_compare_equal(self):
641641
offset2 = self._object()
642642
self.assertFalse(offset1 != offset2)
643643

644-
class TestCustomBusinessMonthEnd(CustomBusinessMonthBase, TestBase):
644+
class TestCustomBusinessMonthEnd(CustomBusinessMonthBase, Base):
645645
_object = CBMonthEnd
646646

647647
def test_different_normalize_equals(self):
@@ -756,7 +756,7 @@ def test_datetimeindex(self):
756756
self.assertEqual(DatetimeIndex(start='20120101',end='20130101',freq=CBMonthEnd(calendar=USFederalHolidayCalendar())).tolist()[0],
757757
datetime(2012,1,31))
758758

759-
class TestCustomBusinessMonthBegin(CustomBusinessMonthBase, TestBase):
759+
class TestCustomBusinessMonthBegin(CustomBusinessMonthBase, Base):
760760
_object = CBMonthBegin
761761

762762
def test_different_normalize_equals(self):
@@ -878,7 +878,7 @@ def assertOnOffset(offset, date, expected):
878878
(expected, actual, offset, date))
879879

880880

881-
class TestWeek(TestBase):
881+
class TestWeek(Base):
882882
_offset = Week
883883

884884
def test_repr(self):
@@ -949,7 +949,7 @@ def test_offsets_compare_equal(self):
949949
self.assertFalse(offset1 != offset2)
950950

951951

952-
class TestWeekOfMonth(TestBase):
952+
class TestWeekOfMonth(Base):
953953
_offset = WeekOfMonth
954954

955955
def test_constructor(self):
@@ -1028,7 +1028,7 @@ def test_onOffset(self):
10281028
offset = WeekOfMonth(week=week, weekday=weekday)
10291029
self.assertEqual(offset.onOffset(date), expected)
10301030

1031-
class TestLastWeekOfMonth(TestBase):
1031+
class TestLastWeekOfMonth(Base):
10321032
_offset = LastWeekOfMonth
10331033

10341034
def test_constructor(self):
@@ -1100,7 +1100,7 @@ def test_onOffset(self):
11001100
self.assertEqual(offset.onOffset(date), expected, msg=date)
11011101

11021102

1103-
class TestBMonthBegin(TestBase):
1103+
class TestBMonthBegin(Base):
11041104
_offset = BMonthBegin
11051105

11061106
def test_offset(self):
@@ -1162,7 +1162,7 @@ def test_offsets_compare_equal(self):
11621162
self.assertFalse(offset1 != offset2)
11631163

11641164

1165-
class TestBMonthEnd(TestBase):
1165+
class TestBMonthEnd(Base):
11661166
_offset = BMonthEnd
11671167

11681168
def test_offset(self):
@@ -1225,7 +1225,7 @@ def test_offsets_compare_equal(self):
12251225
self.assertFalse(offset1 != offset2)
12261226

12271227

1228-
class TestMonthBegin(TestBase):
1228+
class TestMonthBegin(Base):
12291229
_offset = MonthBegin
12301230

12311231
def test_offset(self):
@@ -1266,7 +1266,7 @@ def test_offset(self):
12661266
assertEq(offset, base, expected)
12671267

12681268

1269-
class TestMonthEnd(TestBase):
1269+
class TestMonthEnd(Base):
12701270
_offset = MonthEnd
12711271

12721272
def test_offset(self):
@@ -1334,7 +1334,7 @@ def test_onOffset(self):
13341334
assertOnOffset(offset, date, expected)
13351335

13361336

1337-
class TestBQuarterBegin(TestBase):
1337+
class TestBQuarterBegin(Base):
13381338
_offset = BQuarterBegin
13391339

13401340
def test_repr(self):
@@ -1425,7 +1425,7 @@ def test_offset(self):
14251425
self.assertEqual(datetime(2007, 4, 3) + offset, datetime(2007, 4, 2))
14261426

14271427

1428-
class TestBQuarterEnd(TestBase):
1428+
class TestBQuarterEnd(Base):
14291429
_offset = BQuarterEnd
14301430

14311431
def test_repr(self):
@@ -1545,7 +1545,7 @@ def makeFY5253NearestEndMonth(*args, **kwds):
15451545
def makeFY5253LastOfMonth(*args, **kwds):
15461546
return FY5253(*args, variation="last", **kwds)
15471547

1548-
class TestFY5253LastOfMonth(TestBase):
1548+
class TestFY5253LastOfMonth(Base):
15491549

15501550
def test_onOffset(self):
15511551

@@ -1619,7 +1619,7 @@ def test_apply(self):
16191619
current = current + offset
16201620
self.assertEqual(current, datum)
16211621

1622-
class TestFY5253NearestEndMonth(TestBase):
1622+
class TestFY5253NearestEndMonth(Base):
16231623

16241624
def test_get_target_month_end(self):
16251625
self.assertEqual(makeFY5253NearestEndMonth(startingMonth=8, weekday=WeekDay.SAT).get_target_month_end(datetime(2013,1,1)), datetime(2013,8,31))
@@ -1737,7 +1737,7 @@ def test_apply(self):
17371737
current = current + offset
17381738
self.assertEqual(current, datum)
17391739

1740-
class TestFY5253LastOfMonthQuarter(TestBase):
1740+
class TestFY5253LastOfMonthQuarter(Base):
17411741

17421742
def test_isAnchored(self):
17431743
self.assert_(makeFY5253LastOfMonthQuarter(startingMonth=1, weekday=WeekDay.SAT, qtr_with_extra_week=4).isAnchored())
@@ -1879,7 +1879,7 @@ def test_get_weeks(self):
18791879
self.assertEqual(sat_dec_4.get_weeks(datetime(2011, 4, 2)), [13, 13, 13, 14])
18801880
self.assertEqual(sat_dec_1.get_weeks(datetime(2010, 12, 25)), [13, 13, 13, 13])
18811881

1882-
class TestFY5253NearestEndMonthQuarter(TestBase):
1882+
class TestFY5253NearestEndMonthQuarter(Base):
18831883

18841884
def test_onOffset(self):
18851885

@@ -1955,7 +1955,7 @@ def test_offset(self):
19551955

19561956
assertEq(offset2, datetime(2013,1,15), datetime(2013, 3, 30))
19571957

1958-
class TestQuarterBegin(TestBase):
1958+
class TestQuarterBegin(Base):
19591959

19601960
def test_repr(self):
19611961
self.assertEqual(repr(QuarterBegin()), "<QuarterBegin: startingMonth=3>")
@@ -2030,7 +2030,7 @@ def test_offset(self):
20302030
self.assertEqual(datetime(2010, 2, 1) + offset, datetime(2010, 1, 1))
20312031

20322032

2033-
class TestQuarterEnd(TestBase):
2033+
class TestQuarterEnd(Base):
20342034
_offset = QuarterEnd
20352035

20362036
def test_repr(self):
@@ -2168,7 +2168,7 @@ def test_onOffset(self):
21682168
assertOnOffset(offset, date, expected)
21692169

21702170

2171-
class TestBYearBegin(TestBase):
2171+
class TestBYearBegin(Base):
21722172
_offset = BYearBegin
21732173

21742174
def test_misspecified(self):
@@ -2216,7 +2216,7 @@ def test_offset(self):
22162216
assertEq(offset, base, expected)
22172217

22182218

2219-
class TestYearBegin(TestBase):
2219+
class TestYearBegin(Base):
22202220
_offset = YearBegin
22212221

22222222
def test_misspecified(self):
@@ -2289,7 +2289,7 @@ def test_onOffset(self):
22892289
assertOnOffset(offset, date, expected)
22902290

22912291

2292-
class TestBYearEndLagged(TestBase):
2292+
class TestBYearEndLagged(Base):
22932293

22942294
def test_bad_month_fail(self):
22952295
self.assertRaises(Exception, BYearEnd, month=13)
@@ -2330,7 +2330,7 @@ def test_onOffset(self):
23302330
assertOnOffset(offset, date, expected)
23312331

23322332

2333-
class TestBYearEnd(TestBase):
2333+
class TestBYearEnd(Base):
23342334
_offset = BYearEnd
23352335

23362336
def test_offset(self):
@@ -2379,7 +2379,7 @@ def test_onOffset(self):
23792379
assertOnOffset(offset, date, expected)
23802380

23812381

2382-
class TestYearEnd(TestBase):
2382+
class TestYearEnd(Base):
23832383
_offset = YearEnd
23842384

23852385
def test_misspecified(self):
@@ -2431,7 +2431,7 @@ def test_onOffset(self):
24312431
assertOnOffset(offset, date, expected)
24322432

24332433

2434-
class TestYearEndDiffMonth(TestBase):
2434+
class TestYearEndDiffMonth(Base):
24352435

24362436
def test_offset(self):
24372437
tests = []

0 commit comments

Comments
 (0)