Meteostat 1.4.2

Author: clampr

examples/normals/point.py

@@ -15,7 +15,7 @@
 vancouver = Point(49.2497, -123.1193, 70)
 
 # Get normals
-data = Normals(vancouver, (1961, 1990))
+data = Normals(vancouver, 1961, 1990)
 data = data.fetch()
 
 # Plot chart

meteostat/__init__.py

@@ -12,7 +12,7 @@
 """
 
 __appname__ = 'meteostat'
-__version__ = '1.4.1'
+__version__ = '1.4.2'
 
 from .interface.stations import Stations
 from .interface.point import Point

meteostat/interface/normals.py

@@ -33,8 +33,11 @@ class Normals(Base):
     # The list of weather Stations
     _stations: pd.Index = None
 
-    # The period
-    _period: Union[int, str] = 'auto'
+    # The first year of the period
+    _start: int = None
+
+    # The last year of the period
+    _end: int = None
 
     # The data frame
     _data: pd.DataFrame = pd.DataFrame()
@@ -108,14 +111,14 @@ def _load(
                 df.to_pickle(path)
 
         # Filter time period and append to DataFrame
-        if df.index.size > 0 and self._period not in ['auto', 'all']:
+        if df.index.size > 0 and self._end:
 
             # Get time index
             end = df.index.get_level_values('end')
 
             # Filter & append
             self._data = self._data.append(
-                df.loc[end == self._period])
+                df.loc[end == self._end])
 
         else:
 
@@ -206,18 +209,20 @@ def _resolve_point(
     def __init__(
         self,
         loc: Union[pd.DataFrame, Point, list, str],
-        period: Union[tuple, str] = 'auto'
+        start: int = None,
+        end: int = None
     ) -> None:
 
         # Set list of weather stations
         if isinstance(loc, pd.DataFrame):
             self._stations = loc.index
 
         elif isinstance(loc, Point):
-            if isinstance(period, tuple):
-                start = datetime(period[0], 1, 1)
-                end = datetime(period[1], 12, 31)
-                stations = loc.get_stations('monthly', start, end)
+            if start and end:
+                stations = loc.get_stations(
+                    'monthly', datetime(
+                        start, 1, 1), datetime(
+                        end, 12, 31))
             else:
                 stations = loc.get_stations()
 
@@ -229,8 +234,9 @@ def __init__(
 
             self._stations = pd.Index(loc)
 
-        # The reference period
-        self._period = period[1] if isinstance(period, tuple) else period
+        # Set period
+        self._start = start
+        self._end = end
 
         # Get data for all weather stations
         self._get_data()
@@ -239,11 +245,6 @@ def __init__(
         if isinstance(loc, Point):
             self._resolve_point(loc.method, stations, loc.alt, loc.adapt_temp)
 
-        # Aggregate if period is auto
-        if self._period == 'auto' and self._data.index.size > 0:
-            self._data = self._data.groupby(
-                level=['station', 'month']).agg('last')
-
         # Clear cache
         if self.max_age > 0:
             self.clear_cache()
@@ -265,7 +266,7 @@ def fetch(self) -> pd.DataFrame:
             temp = temp.reset_index(level='station', drop=True)
 
         # Remove start & end year if period is set
-        if isinstance(self._period, int) and 'start' in temp.index.names:
+        if self._start and self._end:
             temp = temp.reset_index(level='start', drop=True)
             temp = temp.reset_index(level='end', drop=True)
 

setup.py

@@ -15,7 +15,7 @@
 # Setup
 setup(
     name='meteostat',
-    version='1.4.1',
+    version='1.4.2',
     author='Meteostat',
     author_email='[email protected]',
     description='Access and analyze historical weather and climate data with Python.',