Update tests with new namespace

Author: pradal

src/openalea/astk/Weather.py

@@ -38,7 +38,7 @@ def septo3d_reader(data_file, sep):
     # ,
     # usecols=['An','Jour','hhmm','PAR','Tair','HR','Vent','Pluie'])
 
-    data['date'] = pandas.to_datetime(data['An'] * 1000 + data['Jour'], format='%Y%j')+pandas.to_timedelta(data.hhmm/100, unit='H')
+    data['date'] = pandas.to_datetime(data['An'] * 1000 + data['Jour'], format='%Y%j')+pandas.to_timedelta(data.hhmm/100, unit='h')
     data.index = data.date
     data = data.rename(columns={'PAR': 'PPFD', 'Tair': 'temperature_air',
                                 'HR': 'relative_humidity', 'Vent': 'wind_speed',
@@ -137,14 +137,14 @@ def date_range_index(self, start, end=None, by=24):
         start and end are expected in local time
         """
         if end is None:
-            seq = pandas.date_range(start=start, periods=by, freq='H',
+            seq = pandas.date_range(start=start, periods=by, freq='h',
                                     tz=self.timezone.zone)
             return seq.tz_convert('UTC')
         else:
-            seq = pandas.date_range(start=start, end=end, freq='H',
+            seq = pandas.date_range(start=start, end=end, freq='h',
                                     tz=self.timezone.zone)
             seq = seq.tz_convert('UTC')
-            bins = pandas.date_range(start=start, end=end, freq=str(by) + 'H',
+            bins = pandas.date_range(start=start, end=end, freq=str(by) + 'h',
                                      tz=self.timezone.zone)
             bins = bins.tz_convert('UTC')
             return [seq[(seq >= bins[i]) & (seq < bins[i + 1])] for i in
@@ -267,7 +267,7 @@ def sample_weather(periods=24):
     meteo_path = str(Path(datadir.__path__[0])/'meteo00-01.txt')
     #meteo_path = shared_data(alinea.septo3d, 'meteo00-01.txt')
     t_deb = "2000-10-01 01:00:00"
-    seq = pandas.date_range(start="2000-10-02", periods=periods, freq='H')
+    seq = pandas.date_range(start="2000-10-02", periods=periods, freq='h')
     weather = Weather(data_file=meteo_path)
     weather.check(
         ['temperature_air', 'PPFD', 'relative_humidity', 'wind_speed', 'rain',

src/openalea/astk/meteorology/sun_position_astk.py

@@ -289,7 +289,7 @@ def sun_position(dates=None, daydate=_day, latitude=_latitude,
     """
 
     if dates is None:
-        dates = pandas.date_range(daydate, periods=24, freq='H')
+        dates = pandas.date_range(daydate, periods=24, freq='h')
 
     if dates.tz is None:
         times = dates.tz_localize(timezone)
@@ -325,7 +325,7 @@ def sun_extraradiation(dates=None, daydate=_day, solar_constant=1366.1,
              dates is not already localised.
     """
     if dates is None:
-        dates = pandas.date_range(daydate, periods=24, freq='H')
+        dates = pandas.date_range(daydate, periods=24, freq='h')
 
     if dates.tz is None:
         times = dates.tz_localize(timezone)

test/test_sky_irradiance.py

@@ -1,5 +1,5 @@
 import numpy
-from alinea.astk.meteorology.sky_irradiance import (
+from openalea.astk.meteorology.sky_irradiance import (
     clear_sky_irradiances,
     actual_sky_irradiances,
     sky_irradiance)

test/test_sun_and_sky.py

@@ -1,11 +1,12 @@
-from alinea.astk.sun_and_sky import (
+import numpy
+import pandas
+
+from openalea.astk.sun_and_sky import (
     sky_discretisation, 
     sky_radiance_distribution, 
     sky_sources, 
     sun_sources, 
     sun_sky_sources)
-import numpy
-import pandas
 
 
 def test_sky_discretisation():

test/test_sun_position.py

@@ -1,9 +1,9 @@
 import numpy
 
-from alinea.astk.meteorology.sun_position import (
+from openalea.astk.meteorology.sun_position import (
     sun_position, 
     sun_extraradiation)
-from alinea.astk.meteorology.sun_position_astk import (
+from openalea.astk.meteorology.sun_position_astk import (
     sun_position as sun_position_astk, 
     sun_extraradiation as sun_extraradiation_astk)
 

test/test_weather.py

@@ -1,5 +1,5 @@
-from alinea.astk.Weather import Weather
-from alinea.astk.data_access import get_path
+from openalea.astk.Weather import Weather
+from openalea.astk.data_access import get_path
 
 
 def test_instantiate():