Merge pull request #847 from quantopian/fix-numpy1.10-failures

MAINT: Fix type coercion warnings with numpy 1.10.
This commit is contained in:
Scott Sanderson
2015-11-17 11:39:23 -05:00
2 changed files with 5 additions and 5 deletions
+3 -3
View File
@@ -20,7 +20,7 @@ import random
from unittest import TestCase
from nose_parameterized import parameterized
import numpy as np
import pandas as pd
from six import iteritems
from six.moves import range, map
@@ -254,8 +254,8 @@ class TestStatelessRules(RuleTestCase):
cls.class_ = StatelessRule
cls.sept_days = cls.env.days_in_range(
np.datetime64(datetime.date(year=2014, month=9, day=1)),
np.datetime64(datetime.date(year=2014, month=9, day=30)),
pd.Timestamp('2014-09-01'),
pd.Timestamp('2014-09-30'),
)
cls.sept_week = cls.env.minutes_for_days_in_range(
+2 -2
View File
@@ -149,10 +149,10 @@ class SyntheticDailyBarWriter(BcolzDailyBarWriter):
)
# Add 10,000 * column-index to OHLCV columns
data[:, :5] += arange(5) * (10 * 1000)
data[:, :5] += arange(5, dtype=uint32) * (10 * 1000)
# Add days since Jan 1 2001 for OHLCV columns.
data[:, :5] += (dates - self.PSEUDO_EPOCH).days[:, None]
data[:, :5] += (dates - self.PSEUDO_EPOCH).days[:, None].astype(uint32)
frame = DataFrame(
data,