From d21aec17e2b9ff950c550966d600c844d1e206e0 Mon Sep 17 00:00:00 2001 From: Thomas Wiecki Date: Fri, 16 Oct 2015 15:53:11 +0200 Subject: [PATCH 1/2] MAINT Change relativedelta to Timedelta as pandas 0.17.0 deprecated relativedelta. --- zipline/utils/tradingcalendar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zipline/utils/tradingcalendar.py b/zipline/utils/tradingcalendar.py index 6759fec0..d8131796 100644 --- a/zipline/utils/tradingcalendar.py +++ b/zipline/utils/tradingcalendar.py @@ -23,7 +23,7 @@ start = pd.Timestamp('1990-01-01', tz='UTC') end_base = pd.Timestamp('today', tz='UTC') # Give an aggressive buffer for logic that needs to use the next trading # day or minute. -end = end_base + pd.datetools.relativedelta(years=1) +end = end_base + pd.Timedelta(days=365) def canonicalize_datetime(dt): From 659a367b098d8b864b554dc20b005dea8541e474 Mon Sep 17 00:00:00 2001 From: Thomas Wiecki Date: Fri, 16 Oct 2015 15:54:37 +0200 Subject: [PATCH 2/2] STY Remove unused import of to_datetime. --- zipline/data/us_equity_pricing.py | 1 - 1 file changed, 1 deletion(-) diff --git a/zipline/data/us_equity_pricing.py b/zipline/data/us_equity_pricing.py index 12ec6a4b..57718438 100644 --- a/zipline/data/us_equity_pricing.py +++ b/zipline/data/us_equity_pricing.py @@ -41,7 +41,6 @@ from pandas import ( DataFrame, DatetimeIndex, read_csv, - to_datetime, Timestamp, ) from six import (