DEP: Replacing the assertRaisesRegexp which is deprecated by assertRaisesRegex

This deprecation will enable the upgrade to add support for python 3.7 and higher
This commit is contained in:
samatix 2020-01-12 17:35:15 +01:00
parent c825927d6e
commit 86ddd6072f
7 changed files with 30 additions and 28 deletions

View file

@ -275,8 +275,10 @@ class BundleCoreTestCase(WithInstanceTmpDir,
called[0] = True
now = pd.Timestamp.utcnow()
with self.assertRaisesRegexp(ValueError,
"ingest .* creates writers .* downgrade"):
with self.assertRaisesRegex(
ValueError,
"ingest .* creates writers .* downgrade"
):
self.ingest('bundle', self.environ, assets_versions=versions,
timestamp=now - pd.Timedelta(seconds=1))
assert_false(called[0])

View file

@ -336,9 +336,9 @@ class _DailyBarsTestCase(WithEquityDailyBarData,
# E.g.
# INVALID VALID INVALID VALID ... VALID INVALID
query_assets = (
[self.assets[-1] + 1] +
list(range(self.assets[0], self.assets[-1] + 1)) +
[self.assets[-1] + 3]
[self.assets[-1] + 1] +
list(range(self.assets[0], self.assets[-1] + 1)) +
[self.assets[-1] + 3]
)
columns = [CLOSE, VOLUME]
@ -609,10 +609,10 @@ class BcolzDailyBarTestCase(WithBcolzEquityDailyBarReader, _DailyBarsTestCase):
result = self.bcolz_daily_bar_ctable
expected_first_row = {
'1': 0,
'3': 5, # Asset 1 has 5 trading days.
'5': 12, # Asset 3 has 7 trading days.
'7': 33, # Asset 5 has 21 trading days.
'9': 44, # Asset 7 has 11 trading days.
'3': 5, # Asset 1 has 5 trading days.
'5': 12, # Asset 3 has 7 trading days.
'7': 33, # Asset 5 has 21 trading days.
'9': 44, # Asset 7 has 11 trading days.
'11': 49, # Asset 9 has 5 trading days.
}
expected_last_row = {
@ -621,14 +621,14 @@ class BcolzDailyBarTestCase(WithBcolzEquityDailyBarReader, _DailyBarsTestCase):
'5': 32,
'7': 43,
'9': 48,
'11': 57, # Asset 11 has 9 trading days.
'11': 57, # Asset 11 has 9 trading days.
}
expected_calendar_offset = {
'1': 0, # Starts on 6-01, 1st trading day of month.
'3': 15, # Starts on 6-22, 16th trading day of month.
'5': 1, # Starts on 6-02, 2nd trading day of month.
'7': 0, # Starts on 6-01, 1st trading day of month.
'9': 9, # Starts on 6-12, 10th trading day of month.
'1': 0, # Starts on 6-01, 1st trading day of month.
'3': 15, # Starts on 6-22, 16th trading day of month.
'5': 1, # Starts on 6-02, 2nd trading day of month.
'7': 0, # Starts on 6-01, 1st trading day of month.
'9': 9, # Starts on 6-12, 10th trading day of month.
'11': 10, # Starts on 6-15, 11th trading day of month.
}
self.assertEqual(result.attrs['first_row'], expected_first_row)
@ -706,7 +706,7 @@ class BcolzDailyBarWriterMissingDataTestCase(WithAssetFinder,
"[Timestamp('2015-06-15 00:00:00+0000', tz='UTC')]\n"
"Extra sessions: []"
)
with self.assertRaisesRegexp(AssertionError, expected_msg):
with self.assertRaisesRegex(AssertionError, expected_msg):
writer.write(bar_data)

View file

@ -197,7 +197,7 @@ class ComputeExtraRowsTestCase(WithTradingSessions, ZiplineTestCase):
# land prior to the first date of 2012. The downsampled terms will fail
# to request enough extra rows.
for i in range(0, 30, 5):
with self.assertRaisesRegexp(
with self.assertRaisesRegex(
NoFurtherDataError,
r'\s*Insufficient data to compute Pipeline'
):

View file

@ -226,7 +226,7 @@ class ConstantInputTestCase(WithConstantInputs,
p = Pipeline()
msg = "start_date must be before or equal to end_date .*"
with self.assertRaisesRegexp(ValueError, msg):
with self.assertRaisesRegex(ValueError, msg):
self.engine.run_pipeline(p, self.dates[2], self.dates[1])
def test_fail_usefully_on_insufficient_data(self):

View file

@ -208,7 +208,7 @@ class PipelineTestCase(TestCase):
r"but got 'fizzbuzz' instead."
)
with self.assertRaisesRegexp(ValueError, expected):
with self.assertRaisesRegex(ValueError, expected):
p.show_graph(format='fizzbuzz')
def test_infer_domain_no_terms(self):

View file

@ -1267,7 +1267,7 @@ class AssetFinderTestCase(WithTradingCalendars, ZiplineTestCase):
self.assertEqual(asset_1.sid, 1)
# We don't know about this ALT_ID yet.
with self.assertRaisesRegexp(
with self.assertRaisesRegex(
ValueNotFoundForField,
"Value '{}' was not found for field '{}'.".format(
'100000002',
@ -1294,7 +1294,7 @@ class AssetFinderTestCase(WithTradingCalendars, ZiplineTestCase):
"Multiple occurrences of the value '{}' found for field '{}'."
).format('100000000', 'ALT_ID')
with self.assertRaisesRegexp(
with self.assertRaisesRegex(
MultipleValuesFoundForField,
expected_in_repr,
):
@ -1377,7 +1377,7 @@ class AssetFinderTestCase(WithTradingCalendars, ZiplineTestCase):
# Since sid 2 has not yet started, we don't know about its
# ALT_ID.
with self.assertRaisesRegexp(
with self.assertRaisesRegex(
NoValueForSid,
"No '{}' value found for sid '{}'.".format('ALT_ID', 2),
):
@ -1395,7 +1395,7 @@ class AssetFinderTestCase(WithTradingCalendars, ZiplineTestCase):
)
# Sid 0 has historically held two values for ALT_ID by this dt.
with self.assertRaisesRegexp(
with self.assertRaisesRegex(
MultipleValuesFoundForSid,
"Multiple '{}' values found for sid '{}'.".format('ALT_ID', 0),
):

View file

@ -627,7 +627,7 @@ class MinuteEquityHistoryTestCase(WithHistory,
"""
Negative bar counts leak future information.
"""
with self.assertRaisesRegexp(
with self.assertRaisesRegex(
ValueError,
"bar_count must be >= 1, but got -1"
):
@ -1388,7 +1388,7 @@ class MinuteEquityHistoryTestCase(WithHistory,
'window, start the backtest on or after 2014-01-06.'
)
for field in OHLCP:
with self.assertRaisesRegexp(
with self.assertRaisesRegex(
HistoryWindowStartsBeforeData, exp_msg):
self.data_portal.get_history_window(
[self.ASSET1],
@ -2030,7 +2030,7 @@ class DailyEquityHistoryTestCase(WithHistory, zf.ZiplineTestCase):
'window, start the backtest on or after 2014-01-09.'
)
with self.assertRaisesRegexp(HistoryWindowStartsBeforeData, exp_msg):
with self.assertRaisesRegex(HistoryWindowStartsBeforeData, exp_msg):
self.data_portal.get_history_window(
[self.ASSET1],
second_day,
@ -2040,7 +2040,7 @@ class DailyEquityHistoryTestCase(WithHistory, zf.ZiplineTestCase):
'daily',
)[self.ASSET1]
with self.assertRaisesRegexp(HistoryWindowStartsBeforeData, exp_msg):
with self.assertRaisesRegex(HistoryWindowStartsBeforeData, exp_msg):
self.data_portal.get_history_window(
[self.ASSET1],
second_day,
@ -2054,7 +2054,7 @@ class DailyEquityHistoryTestCase(WithHistory, zf.ZiplineTestCase):
first_minute = \
self.trading_calendar.schedule.market_open[self.TRADING_START_DT]
with self.assertRaisesRegexp(HistoryWindowStartsBeforeData, exp_msg):
with self.assertRaisesRegex(HistoryWindowStartsBeforeData, exp_msg):
self.data_portal.get_history_window(
[self.ASSET2],
first_minute,