Merge pull request #43 from wholmgren/timedelta

timedelta and pandas compatibility

Author: bmu

.travis.yml

@@ -3,6 +3,12 @@ python:
     - 2.7
     - 3.3
     - 3.4
+env:
+    - PD_VERSION=0.13.1
+    - PD_VERSION="0.14.*"
+    - PD_VERSION="0.15.*"
+    - PD_VERSION="0.16.*"
+
 # setup miniconda for numpy, scipy, pandas
 before_install:
     - echo "before install"
@@ -19,7 +25,7 @@ before_install:
 
 install:
     - echo "install"
-    - conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy pandas nose pytz ephem
+    - conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy pandas=$PD_VERSION nose pytz ephem
     - conda install --yes coverage
     - pip install coveralls
     - python setup.py install

pvlib/irradiance.py

@@ -10,6 +10,8 @@
 import logging
 pvl_logger = logging.getLogger('pvlib')
 
+import datetime
+
 import numpy as np
 import pandas as pd
 
@@ -167,7 +169,7 @@ def _doy_to_timestamp(doy, epoch='2013-12-31'):
     -------
     pd.Timestamp
     """
-    return pd.Timestamp('2013-12-31') + pd.Timedelta(days=float(doy))
+    return pd.Timestamp('2013-12-31') + datetime.timedelta(days=float(doy))
 
 
 def aoi_projection(surf_tilt, surf_az, sun_zen, sun_az):

setup.py

@@ -32,7 +32,7 @@
 setuptools_kwargs = {
     'zip_safe': False,
     'install_requires': ['numpy >= 1.7.0',
-                         'pandas >= 0.15',
+                         'pandas >= 0.13.1',
                          'pytz',
                          'six',
                          'pyephem',