Meteostat 1.5.2 (#57)

Author: clampr

meteostat/__init__.py

@@ -12,7 +12,7 @@
 """
 
 __appname__ = 'meteostat'
-__version__ = '1.5.1'
+__version__ = '1.5.2'
 
 from .interface.base import Base
 from .interface.timeseries import Timeseries

meteostat/core/warn.py

@@ -11,7 +11,7 @@
 import warnings
 
 
-def _warning_on_one_line(message, category, *args) -> str:  # pylint: disable=unused-argument
+def _warning_on_one_line(message, category, filename, lineno, line=None) -> str:  # pylint: disable=unused-argument
     """
     Print warning on a single line
     """

meteostat/interface/base.py

@@ -27,8 +27,8 @@ class Base:
     # Maximum age of a cached file in seconds
     max_age: int = 24 * 60 * 60
 
-    # Number of cores used for processing files
-    cores: int = 1
+    # Number of processes used for processing files
+    processes: int = 1
 
     # Number of threads used for processing files
     threads: int = 1

meteostat/interface/daily.py

@@ -151,7 +151,7 @@ def _get_data(self) -> None:
 
             # Data Processing
             return processing_handler(
-                datasets, self._load, self.cores, self.threads)
+                datasets, self._load, self.processes, self.threads)
 
         # Empty DataFrame
         return pd.DataFrame(columns=[*self._types])
@@ -251,7 +251,7 @@ def __init__(
         if isinstance(loc, pd.DataFrame):
             self._stations = loc.index
         elif isinstance(loc, Point):
-            stations = loc.get_stations('daily', start, end)
+            stations = loc.get_stations('daily', start, end, model)
             self._stations = stations.index
         else:
             if not isinstance(loc, list):

meteostat/interface/hourly.py

@@ -220,7 +220,7 @@ def _get_data(self) -> None:
 
             # Data Processing
             return processing_handler(
-                datasets, self._load, self.cores, self.threads)
+                datasets, self._load, self.processes, self.threads)
 
         return pd.DataFrame(columns=[*self._types])
 
@@ -318,7 +318,7 @@ def __init__(
         if isinstance(loc, pd.DataFrame):
             self._stations = loc.index
         elif isinstance(loc, Point):
-            stations = loc.get_stations('hourly', start, end)
+            stations = loc.get_stations('hourly', start, end, model)
             self._stations = stations.index
         else:
             if not isinstance(loc, list):

meteostat/interface/monthly.py

@@ -151,7 +151,7 @@ def _get_data(self) -> None:
                 ))
 
             # Data Processing
-            return processing_handler(datasets, self._load, self.cores, self.threads)
+            return processing_handler(datasets, self._load, self.processes, self.threads)
 
         # Empty DataFrame
         return pd.DataFrame(columns=[*self._types])
@@ -251,7 +251,7 @@ def __init__(
         if isinstance(loc, pd.DataFrame):
             self._stations = loc.index
         elif isinstance(loc, Point):
-            stations = loc.get_stations('monthly', start, end)
+            stations = loc.get_stations('monthly', start, end, model)
             self._stations = stations.index
         else:
             if not isinstance(loc, list):

meteostat/interface/normals.py

@@ -139,7 +139,7 @@ def _get_data(self) -> None:
 
             # Data Processing
             return processing_handler(
-                datasets, self._load, self.cores, self.threads)
+                datasets, self._load, self.processes, self.threads)
 
         # Empty DataFrame
         return pd.DataFrame(columns=[*self._types])

meteostat/interface/point.py

@@ -67,7 +67,7 @@ def __init__(
             self.adapt_temp = False
 
     def get_stations(self, freq: str = None, start: datetime = None,
-                     end: datetime = None) -> pd.DataFrame:
+                     end: datetime = None, model: bool = True) -> pd.DataFrame:
         """
         Get list of nearby weather stations
         """
@@ -88,7 +88,8 @@ def get_stations(self, freq: str = None, start: datetime = None,
                                         unfiltered['elevation']) <= self.alt_range]
 
         # Apply inventory filter
-        if freq and start and end:
+        age = (datetime.now() - end).days
+        if freq and start and end and (model == False or age > 180):
             stations = stations.inventory(freq, (start, end))
 
         # Apply altitude filter
@@ -100,6 +101,9 @@ def get_stations(self, freq: str = None, start: datetime = None,
         # Fill up stations
         selected: int = len(stations.index)
         if selected < self.max_count:
+            # Remove already included stations from unfiltered
+            unfiltered = unfiltered.loc[~unfiltered.index.isin(stations.index)]
+            # Append to existing DataFrame
             stations = stations.append(
                 unfiltered.head(
                     self.max_count - selected))

setup.py

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