From 05903a2031b00ec6390cecc4a2462fb7da82296a Mon Sep 17 00:00:00 2001 From: Delaney Granizo-Mackenzie Date: Wed, 17 Dec 2014 13:41:57 -0500 Subject: [PATCH 1/2] BUG: Assigned dtypes to the cumulative risk metrics DataFrame. --- zipline/finance/risk/cumulative.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zipline/finance/risk/cumulative.py b/zipline/finance/risk/cumulative.py index 03f0b482..1d92afce 100644 --- a/zipline/finance/risk/cumulative.py +++ b/zipline/finance/risk/cumulative.py @@ -163,7 +163,8 @@ class RiskMetricsCumulative(object): self.latest_dt = cont_index[0] self.metrics = pd.DataFrame(index=cont_index, - columns=self.METRIC_NAMES) + columns=self.METRIC_NAMES, + dtype=float) self.drawdowns = pd.Series(index=cont_index) self.max_drawdowns = pd.Series(index=cont_index) From bed1ff3bce49a9e7b1533375c9dc1362e73c5c98 Mon Sep 17 00:00:00 2001 From: Delaney Granizo-Mackenzie Date: Wed, 17 Dec 2014 14:16:58 -0500 Subject: [PATCH 2/2] BUG: Miniconda was breaking the travis build. Updated version. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6f87c275..ed4565db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - "2.7" - "3.3" before_install: - - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-3.0.0-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.0.0-Linux-x86_64.sh -O miniconda.sh; fi + - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-3.7.0-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.7.0-Linux-x86_64.sh -O miniconda.sh; fi - chmod +x miniconda.sh - ./miniconda.sh -b - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then export PATH=/home/travis/miniconda/bin:$PATH; else export PATH=/home/travis/miniconda3/bin:$PATH; fi