wassname/catalyst
1
0
Fork 0
mirror of https://github.com/wassname/catalyst.git synced 2026-07-06 05:14:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Fix merge issues.

Browse Source
This commit is contained in:
Jean Bredeche
2016-06-08 14:16:17 -04:00
parent 02a91ec4ab
commit b5633aa87c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_history.py
+3 -3
View File
@@ -504,7 +504,7 @@ class MinuteEquityHistoryTestCase(WithHistory, ZiplineTestCase):
pd.Timestamp('2015-01-07', tz='UTC'),
start_val=1000),
create_minute_df_for_asset(
cls.env,
cls.trading_schedule,
pd.Timestamp('2015-01-08', tz='UTC'),
pd.Timestamp('2015-01-08', tz='UTC'),
start_val=1000)
@@ -564,7 +564,7 @@ class MinuteEquityHistoryTestCase(WithHistory, ZiplineTestCase):
# before any of the adjustments, 1/4 and 1/5
window1 = self.data_portal.get_history_window(
[asset],
self.env.get_open_and_close(jan5)[1],
self.trading_schedule.start_and_end(jan5)[1],
2,
'1d',
'close'
@@ -625,7 +625,7 @@ class MinuteEquityHistoryTestCase(WithHistory, ZiplineTestCase):
# before any of the dividends
window1 = self.data_portal.get_history_window(
[asset],
self.env.get_open_and_close(jan5)[1],
self.trading_schedule.start_and_end(jan5)[1],
2,
'1d',
'close'