deprecations and test corrections

enlopy/utils.py

@@ -1,6 +1,8 @@
+import datetime as dt
+import logging
+
 import numpy as np
 import pandas as pd
-import logging
 
 __all__ = ['make_timeseries', 'clean_convert']
 
@@ -21,8 +23,8 @@ def make_timeseries(x=None, year=None, length=None, startdate=None, freq=None):
     if startdate is None:
         if year is None:
             logging.info('No info on the year was provided. Using current year')
-            year = pd.datetime.now().year
-        startdate = pd.datetime(year, 1, 1, 0, 0, 0)
+            year = dt.datetime.now().year
+        startdate = dt.datetime(year, 1, 1, 0, 0, 0)
 
     if x is None:
         if length is None:

tests/test_analysis.py

@@ -12,14 +12,14 @@ def test_reshape_timeseries():
 
 def test_reshape_multiannual():
     a = np.random.rand(8760*2)
-    a = make_timeseries(a, freq='h')
+    a = make_timeseries(a, year=2019, freq='h')
     b = reshape_timeseries(a, x='dayofyear', y='hour', aggfunc='sum')
     assert b.shape == (24,365)
     assert np.isclose(b.sum().sum(), a.sum())
 
 def test_reshape_multiannual_dataframe():
     a = np.random.rand(8760*2)
-    a = pd.DataFrame(make_timeseries(a, freq='h'))
+    a = pd.DataFrame(make_timeseries(a, year=2019, freq='h'))
     b = reshape_timeseries(a, x='dayofyear', y='hour', aggfunc='sum')
     assert b.shape == (24,365)
     assert np.isclose(b.sum().sum(), a.sum())