simple-dwd-weatherforecast 2.0.32__tar.gz → 2.0.34__tar.gz

{simple_dwd_weatherforecast-2.0.32/simple_dwd_weatherforecast.egg-info → simple_dwd_weatherforecast-2.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.0.32
+Version: 2.0.34
 Summary: A simple tool to retrieve a weather forecast from DWD OpenData
 Home-page: https://github.com/FL550/simple_dwd_weatherforecast.git
 Author: Max Fermor

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/setup.py

@@ -5,20 +5,20 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="simple_dwd_weatherforecast",
-    version="2.0.32",
+    version="2.0.34",
     author="Max Fermor",
     description="A simple tool to retrieve a weather forecast from DWD OpenData",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/FL550/simple_dwd_weatherforecast.git",
     packages=setuptools.find_packages(),
-    package_data={'': ['stations.json', 'uv_stations.json']},
+    package_data={"": ["stations.json", "uv_stations.json"]},
     include_package_data=True,
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
-    python_requires='>=3.6',
-    install_requires=['lxml','requests', 'Pillow', 'arrow']
+    python_requires=">=3.6",
+    install_requires=["lxml", "requests", "Pillow", "arrow"],
 )

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/simple_dwd_weatherforecast/dwdforecast.py

@@ -1,22 +1,23 @@
+import csv
+import importlib
+import json
+import math
 from collections import OrderedDict, defaultdict
-import requests
+from datetime import datetime, timedelta, timezone
+from enum import Enum
 from io import BytesIO
 from zipfile import ZipFile
-from enum import Enum
-from lxml import etree
-from datetime import datetime, timedelta, timezone
+
 import arrow
-import math
-import json
-import csv
-import importlib
+import requests
+from lxml import etree
 
-with importlib.resources.files("simple_dwd_weatherforecast").joinpath(
+with importlib.resources.files("simple_dwd_weatherforecast").joinpath(  # type: ignore
     "stations.json"
 ).open("r", encoding="utf-8") as file:
     stations = json.load(file)
 
-with importlib.resources.files("simple_dwd_weatherforecast").joinpath(
+with importlib.resources.files("simple_dwd_weatherforecast").joinpath(  # type: ignore
     "uv_stations.json"
 ).open("r", encoding="utf-8") as file:
     uv_stations = json.load(file)
@@ -32,6 +33,7 @@ def get_station_by_name(station_name: str):
     for station in stations.items():
         if station[1]["name"] == station_name:
             return station
+    return None
 
 
 def get_nearest_station_id(lat: float, lon: float):
@@ -40,14 +42,21 @@ def get_nearest_station_id(lat: float, lon: float):
 
 def get_stations_sorted_by_distance(lat: float, lon: float):
     """
-    Given a latitude and longitude, this function returns a list of stations sorted by their distance from the provided location.
+    Return stations sort by distance.
 
-    Parameters:
-        lat (float): The latitude of the location.
-        lon (float): The longitude of the location.
+    Given a latitude and longitude, this function returns a list of stations sorted by
+    their distance from the provided location.
+
+    Args:
+    ----
+        lat: The latitude of the location.
+        lon: The longitude of the location.
 
     Returns:
-        list: A list of stations sorted by distance, where each element is a list containing the station ID and its distance from the location.
+    -------
+        list: A list of stations sorted by distance, where each element is a list
+           containing the station ID and its distance from the location.
+
     """
     result = []
     for station in stations.items():
@@ -70,40 +79,40 @@ def get_distance(lat, lon, _lat, _lon):
 
 def get_region(station_id: str):
     if (
-        station_id in stations.keys()
-        and stations[station_id]["bundesland"] in Weather.region_codes.keys()
+        station_id in stations
+        and stations[station_id]["bundesland"] in Weather.region_codes
     ):
         return stations[station_id]["bundesland"]
     return None
 
 
 class WeatherDataType(Enum):
-    CONDITION = ["condition", "present_weather"]
-    TEMPERATURE = ["TTT", "dry_bulb_temperature_at_2_meter_above_ground"]  # Unit: K
-    DEWPOINT = ["Td", "dew_point_temperature_at_2_meter_above_ground"]  # Unit: K
-    PRESSURE = ["PPPP", "pressure_reduced_to_mean_sea_level"]  # Unit: Pa
-    WIND_SPEED = [
+    CONDITION = ("condition", "present_weather")
+    TEMPERATURE = ("TTT", "dry_bulb_temperature_at_2_meter_above_ground")  # Unit: K
+    DEWPOINT = ("Td", "dew_point_temperature_at_2_meter_above_ground")  # Unit: K
+    PRESSURE = ("PPPP", "pressure_reduced_to_mean_sea_level")  # Unit: Pa
+    WIND_SPEED = (
         "FF",
         "maximum_wind_speed_as_10_minutes_mean_during_last_hour",
-    ]  # Unit: m/s
-    WIND_DIRECTION = [
+    )  # Unit: m/s
+    WIND_DIRECTION = (
         "DD",
         "mean_wind_direction_during_last_10 min_at_10_meters_above_ground",
-    ]  # Unit: Degrees
-    WIND_GUSTS = ["FX1", "maximum_wind_speed_last_hour"]  # Unit: m/s
-    PRECIPITATION = ["RR1c", "precipitation_amount_last_hour"]  # Unit: kg/m^2
-    PRECIPITATION_PROBABILITY = ["wwP", ""]  # Unit: % (0..100)
-    PRECIPITATION_DURATION = ["DRR1", ""]  # Unit: s
-    CLOUD_COVERAGE = ["N", "cloud_cover_total"]  # Unit: % (0..100)
-    VISIBILITY = ["VV", "horizontal_visibility"]  # Unit: m
-    SUN_DURATION = ["SunD1", ""]  # Unit: s
-    SUN_IRRADIANCE = ["Rad1h", "global_radiation_last_hour"]  # Unit: kJ/m^2
-    FOG_PROBABILITY = ["wwM", ""]  # Unit: % (0..100)
-    HUMIDITY = ["humidity", "relative_humidity"]  # Unit: %
+    )  # Unit: Degrees
+    WIND_GUSTS = ("FX1", "maximum_wind_speed_last_hour")  # Unit: m/s
+    PRECIPITATION = ("RR1c", "precipitation_amount_last_hour")  # Unit: kg/m^2
+    PRECIPITATION_PROBABILITY = ("wwP", "")  # Unit: % (0..100)
+    PRECIPITATION_DURATION = ("DRR1", "")  # Unit: s
+    CLOUD_COVERAGE = ("N", "cloud_cover_total")  # Unit: % (0..100)
+    VISIBILITY = ("VV", "horizontal_visibility")  # Unit: m
+    SUN_DURATION = ("SunD1", "")  # Unit: s
+    SUN_IRRADIANCE = ("Rad1h", "global_radiation_last_hour")  # Unit: kJ/m^2
+    FOG_PROBABILITY = ("wwM", "")  # Unit: % (0..100)
+    HUMIDITY = ("humidity", "relative_humidity")  # Unit: %
 
 
 class Weather:
-    """A class for interacting with weather data from dwd.de"""
+    """A class for interacting with weather data from dwd.de."""
 
     NOT_AVAILABLE = "---"
 
@@ -254,15 +263,17 @@ class Weather:
             self.region = get_region(station_id)
             self.nearest_uv_index_station = self.get_nearest_station_id_with_uv()
         else:
-            raise ValueError("Not a valid station_id")
+            msg = "Not a valid station_id"
+            raise ValueError(msg)
 
     def get_nearest_station_id_with_uv(self):
         nearest_distance = float("inf")
         nearest_station_id = None
+        _station = self.station
         for station in uv_stations.items():
             distance = get_distance(
-                self.station["lat"],
-                self.station["lon"],
+                self.station["lat"],  # type: ignore
+                self.station["lon"],  # type: ignore
                 station[1]["lat"],
                 station[1]["lon"],
             )
@@ -274,17 +285,34 @@ class Weather:
         return nearest_station_id
 
     def get_station_name(self):
-        return self.station["name"]
+        return self.station["name"]  # type: ignore
 
     def is_in_timerange(self, timestamp: datetime):
         return (
-            list(self.forecast_data.keys())[0]
+            list(self.forecast_data.keys())[0]  # type: ignore
             <= self.strip_to_hour_str(timestamp)
-            <= list(self.forecast_data.keys())[-1]
+            <= list(self.forecast_data.keys())[-1]  # type: ignore
         )
 
-    def is_valid_timeframe(_, timeframe: int) -> bool:
-        if 24 < timeframe or timeframe <= 0:
+    def is_in_timerange_day(self, timestamp: datetime):
+        return (
+            self.strip_to_day(
+                arrow.get(
+                    list(self.forecast_data.keys())[0],  # type: ignore
+                    "YYYY-MM-DDTHH:mm:ss.SSSZ",  # type: ignore
+                ).datetime
+            )
+            <= self.strip_to_day(timestamp)
+            <= self.strip_to_day(
+                arrow.get(
+                    list(self.forecast_data.keys())[-1],  # type: ignore
+                    "YYYY-MM-DDTHH:mm:ss.SSSZ",  # type: ignore
+                ).datetime
+            )
+        )
+
+    def is_valid_timeframe(self, timeframe: int) -> bool:
+        if timeframe > 24 or timeframe <= 0:
             return False
         return 24 % timeframe == 0
 
@@ -299,7 +327,7 @@ class Weather:
         if shouldUpdate:
             self.update()
         if self.is_in_timerange(timestamp):
-            return self.forecast_data[self.strip_to_hour_str(timestamp)][
+            return self.forecast_data[self.strip_to_hour_str(timestamp)][  # type: ignore
                 weatherDataType.value[0]
             ]
         return None
@@ -311,7 +339,7 @@ class Weather:
         if self.is_in_timerange(timestamp):
             return str(
                 self.weather_codes[
-                    self.forecast_data[self.strip_to_hour_str(timestamp)][
+                    self.forecast_data[self.strip_to_hour_str(timestamp)][  # type: ignore
                         WeatherDataType.CONDITION.value[0]
                     ]
                 ][0]
@@ -330,9 +358,11 @@ class Weather:
         return None
 
     def get_daily_condition(self, timestamp: datetime, shouldUpdate=True):
+        print("testieng")
         if shouldUpdate:
             self.update()
-        if self.is_in_timerange(timestamp):
+        if self.is_in_timerange_day(timestamp):
+            print("working")
             return self.get_condition(self.get_day_values(timestamp))
         return None
 
@@ -400,7 +430,7 @@ class Weather:
         else:
             print("no report for this station available. Have you updated first?")
 
-    def get_uv_index(self, days_from_today: int, shouldUpdate=True) -> int:
+    def get_uv_index(self, days_from_today: int, shouldUpdate=True) -> int | None:
         if not self.uv_reports and shouldUpdate:
             self.update(
                 force_hourly=False,
@@ -444,11 +474,11 @@ class Weather:
     ):
         if shouldUpdate:
             self.update()
-        if self.is_in_timerange(timestamp):
+        if self.is_in_timerange_day(timestamp):
             return self.get_max(self.get_day_values(timestamp), weatherDataType)
         return None
 
-    def get_max(_, weather_data, weatherDataType: WeatherDataType):
+    def get_max(self, weather_data, weatherDataType: WeatherDataType):
         value = None
         for item in weather_data:
             value_new = item[weatherDataType.value[0]]
@@ -481,11 +511,11 @@ class Weather:
     ):
         if shouldUpdate:
             self.update()
-        if self.is_in_timerange(timestamp):
+        if self.is_in_timerange_day(timestamp):
             return self.get_min(self.get_day_values(timestamp), weatherDataType)
         return None
 
-    def get_min(_, weather_data, weatherDataType: WeatherDataType):
+    def get_min(self, weather_data, weatherDataType: WeatherDataType):
         value = None
         for item in weather_data:
             value_new = item[weatherDataType.value[0]]
@@ -519,11 +549,11 @@ class Weather:
     ):
         if shouldUpdate:
             self.update()
-        if self.is_in_timerange(timestamp):
+        if self.is_in_timerange_day(timestamp):
             return self.get_sum(self.get_day_values(timestamp), weatherDataType)
         return None
 
-    def get_sum(_, weather_data, weatherDataType):
+    def get_sum(self, weather_data, weatherDataType):
         value_sum = 0.0
         for item in weather_data:
             value = item[weatherDataType.value[0]]
@@ -551,11 +581,11 @@ class Weather:
     ):
         if shouldUpdate:
             self.update()
-        if self.is_in_timerange(timestamp):
+        if self.is_in_timerange_day(timestamp):
             return self.get_avg(self.get_day_values(timestamp), weatherDataType)
         return None
 
-    def get_avg(_, weather_data, weatherDataType):
+    def get_avg(self, weather_data, weatherDataType):
         value_sum = 0.0
         count = len(weather_data)
         if count != 0:
@@ -574,24 +604,25 @@ class Weather:
         for _ in range(timeframe):
             hour_str = self.strip_to_hour_str(time_step)
             time_step += timedelta(hours=1)
-            if hour_str not in self.forecast_data:
+            if hour_str not in self.forecast_data:  # type: ignore
                 continue
-            result.append(self.forecast_data[hour_str])
+            result.append(self.forecast_data[hour_str])  # type: ignore
         return result
 
     def get_day_values(self, timestamp: datetime):
         "timestamp has to be checked prior to be in timerange"
         result = []
         first_entry_date = arrow.get(
-            next(iter(self.forecast_data)), "YYYY-MM-DDTHH:mm:ss.SSSZ"
-        ).datetime
+            next(iter(self.forecast_data)),  # type: ignore
+            "YYYY-MM-DDTHH:mm:ss.SSSZ",  # type: ignore
+        ).datetime  # type: ignore
         if timestamp.day != first_entry_date.day:
             time_step = self.strip_to_day(timestamp)
             for _ in range(24):
                 hour_str = self.strip_to_hour_str(time_step)
-                if hour_str not in self.forecast_data:
+                if hour_str not in self.forecast_data:  # type: ignore
                     break
-                result.append(self.forecast_data[hour_str])
+                result.append(self.forecast_data[hour_str])  # type: ignore
                 time_step += timedelta(hours=1)
         else:
             time_step = first_entry_date
@@ -607,17 +638,17 @@ class Weather:
             ) + timedelta(days=1)
             timediff = endtime - time_step
             for _ in range(round(timediff.total_seconds() / 3600)):
-                result.append(self.forecast_data[self.strip_to_hour_str(time_step)])
+                result.append(self.forecast_data[self.strip_to_hour_str(time_step)])  # type: ignore
                 time_step += timedelta(hours=1)
         return result
 
-    def strip_to_hour_str(_, timestamp: datetime):
+    def strip_to_hour_str(self, timestamp: datetime):
         return timestamp.strftime("%Y-%m-%dT%H:00:00.000Z")
 
-    def strip_to_hour(_, timestamp: datetime):
+    def strip_to_hour(self, timestamp: datetime):
         return datetime(timestamp.year, timestamp.month, timestamp.day, timestamp.hour)
 
-    def strip_to_day(_, timestamp: datetime):
+    def strip_to_day(self, timestamp: datetime):
         return datetime(timestamp.year, timestamp.month, timestamp.day)
 
     def update(
@@ -677,7 +708,8 @@ class Weather:
 
         self.loaded_station_name = self.parse_station_name(tree)
 
-        value = lambda wdt: self.get_weather_type(tree, wdt)
+        def value(wdt):
+            return self.get_weather_type(tree, wdt)
 
         values = [
             (wdt, value(wdt))
@@ -725,9 +757,9 @@ class Weather:
             ):
                 item = placemark.find(".//kml:name", namespaces=self.namespaces)
 
-                if item.text == self.station_id:
+                if item is not None and item.text == self.station_id:
                     return placemark
-                placemark.clear()
+                # placemark.clear()
 
     def parse_issue_time(self, tree):
         issue_time_new = arrow.get(
@@ -760,7 +792,9 @@ class Weather:
         if None in (temperature, dewpoint):
             return
 
-        celsius = lambda t: t - 273.1
+        def celsius(t):
+            return t - 273.1
+
         T = celsius(temperature)
         TD = celsius(dewpoint)
 
@@ -873,7 +907,7 @@ class Weather:
         headers = {
             "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.116 Safari/537.36"
         }
-        headers["If-None-Match"] = self.etags[url] if url in self.etags else ""
+        headers["If-None-Match"] = self.etags[url] if url in self.etags else ""  # type: ignore
         try:
             request = requests.get(url, headers=headers, timeout=30)
             # If resource has not been modified, return
@@ -881,7 +915,7 @@ class Weather:
                 return
             elif request.status_code != 200:
                 raise Exception(f"Unexpected status code {request.status_code}")
-            self.etags[url] = request.headers["ETag"]
+            self.etags[url] = request.headers["ETag"]  # type: ignore
             uv_reports = json.loads(request.text)["content"]
             # Match with existing stations
             for uv_report in uv_reports:
@@ -889,22 +923,22 @@ class Weather:
                     self.uv_index_stations_reference_names[uv_report["city"]]
                 )
                 # uv_report.update({"lat": station[1]["lat"], "lon": station[1]["lon"]})
-                self.uv_reports[station[0]] = uv_report
+                self.uv_reports[station[0]] = uv_report  # type: ignore
         except Exception as error:
-            print(f"Error in download_weather_report: {type(error)} args: {error.args}")
+            print(f"Error in download_uv_index: {type(error)} args: {error.args}")
 
     def download_weather_report(self, region_code):
         url = f"https://www.dwd.de/DWD/wetter/wv_allg/deutschland/text/vhdl13_{region_code}.html"
         headers = {
             "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.116 Safari/537.36"
         }
-        headers["If-None-Match"] = self.etags[url] if url in self.etags else ""
+        headers["If-None-Match"] = self.etags[url] if url in self.etags else ""  # type: ignore
         try:
             request = requests.get(url, headers=headers, timeout=30)
             # If resource has not been modified, return
             if request.status_code == 304:
                 return
-            self.etags[url] = request.headers["ETag"]
+            self.etags[url] = request.headers["ETag"]  # type: ignore
             weather_report = request.text
             a = weather_report.find(">")
             if a != -1:
@@ -915,22 +949,22 @@ class Weather:
 
     def download_latest_kml(self, stationid, force_hourly=False):
         if force_hourly:
-            url = f"https://opendata.dwd.de/weather/local_forecasts/mos/MOSMIX_S/all_stations/kml/MOSMIX_S_LATEST_240.kmz"
+            url = "https://opendata.dwd.de/weather/local_forecasts/mos/MOSMIX_S/all_stations/kml/MOSMIX_S_LATEST_240.kmz"
         else:
             url = f"https://opendata.dwd.de/weather/local_forecasts/mos/MOSMIX_L/single_stations/{stationid}/kml/MOSMIX_L_LATEST_{stationid}.kmz"
-        headers = {"If-None-Match": self.etags[url] if url in self.etags else ""}
+        headers = {"If-None-Match": self.etags[url] if url in self.etags else ""}  # type: ignore
         try:
             request = requests.get(url, headers=headers, timeout=30)
             # If resource has not been modified, return
             if request.status_code == 304:
                 return
-            self.etags[url] = request.headers["ETag"]
+            self.etags[url] = request.headers["ETag"]  # type: ignore
             with ZipFile(BytesIO(request.content), "r") as kmz:
                 # large RAM allocation
                 with kmz.open(kmz.namelist()[0], "r") as kml:
                     self.parse_kml(kml, force_hourly)
         except Exception as error:
-            print(f"Error in download_weather_report: {type(error)} args: {error.args}")
+            print(f"Error in download_latest_kml: {type(error)} args: {error.args}")
 
     def download_latest_report(self):
         station_id = self.station_id
@@ -939,7 +973,7 @@ class Weather:
         url = (
             f"https://opendata.dwd.de/weather/weather_reports/poi/{station_id}-BEOB.csv"
         )
-        headers = {"If-None-Match": self.etags[url] if url in self.etags else ""}
+        headers = {"If-None-Match": self.etags[url] if url in self.etags else ""}  # type: ignore
         try:
             response = requests.get(url, headers=headers, timeout=30)
             if response.status_code == 200:
@@ -979,4 +1013,4 @@ class Weather:
                 # Handle other status codes
                 print(f"Failed to download report. Status code: {response.status_code}")
         except Exception as error:
-            print(f"Error in download_weather_report: {type(error)} args: {error.args}")
+            print(f"Error in download_latest_report: {type(error)} args: {error.args}")

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/simple_dwd_weatherforecast/dwdmap.py

@@ -6,7 +6,7 @@ from enum import Enum
 
 
 class WeatherMapType(Enum):
-    NIEDERSCHLAGSRADAR = "dwd:Niederschlagsradar"
+    NIEDERSCHLAGSRADAR = "dwd:Niederschlagsradar,dwd:NCEW_EU"
     MAXTEMP = "dwd:GefuehlteTempMax"
     UVINDEX = "dwd:UVI_CS"
     POLLENFLUG = "dwd:Pollenflug"
@@ -78,7 +78,6 @@ def get_map(
         raise ValueError(
             "Width and height must not exceed 1200 and 1400 respectively. Please be kind to the DWD servers."
         )
-
     url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.1.0&request=GetMap&layers={map_type.value},{background_type.value}&bbox={minx},{miny},{maxx},{maxy}&width={image_width}&height={image_height}&srs=EPSG:4326&styles=&format=image/png"
     request = requests.get(url, stream=True)
     if request.status_code == 200:

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34/simple_dwd_weatherforecast.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.0.32
+Version: 2.0.34
 Summary: A simple tool to retrieve a weather forecast from DWD OpenData
 Home-page: https://github.com/FL550/simple_dwd_weatherforecast.git
 Author: Max Fermor

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_daily_avg.py

@@ -46,3 +46,11 @@ class Weather_get_daily_avg(unittest.TestCase):
             self.dwd_weather.get_daily_avg(WeatherDataType.TEMPERATURE, test_time),
             278.09,
         )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_midnight(self, mock_update):
+        test_time = datetime(2020, 11, 6, 0, 0)
+        self.assertEqual(
+            self.dwd_weather.get_daily_avg(WeatherDataType.TEMPERATURE, test_time),
+            278.09,
+        )

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_daily_condition.py

@@ -8,8 +8,7 @@ from dummy_data import parsed_data
 class Weather_get_daily_condition(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):
@@ -50,3 +49,11 @@ class Weather_get_daily_condition(unittest.TestCase):
             self.dwd_weather.get_daily_condition(test_time),
             "cloudy",
         )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_same_day(self, _):
+        test_time = datetime(2020, 11, 6, 0, 0)
+        self.assertEqual(
+            self.dwd_weather.get_daily_condition(test_time),
+            "sunny",
+        )

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_daily_max.py

@@ -9,8 +9,7 @@ from dummy_data import parsed_data
 class Weather_get_daily_max(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):
@@ -45,3 +44,11 @@ class Weather_get_daily_max(unittest.TestCase):
             self.dwd_weather.get_daily_max(WeatherDataType.TEMPERATURE, test_time),
             283.05,
         )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_midnight(self, mock_update):
+        test_time = datetime(2020, 11, 6, 0, 0)
+        self.assertEqual(
+            self.dwd_weather.get_daily_max(WeatherDataType.TEMPERATURE, test_time),
+            283.05,
+        )

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_daily_min.py

@@ -9,8 +9,7 @@ from dummy_data import parsed_data
 class Weather_get_daily_min(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):
@@ -45,3 +44,11 @@ class Weather_get_daily_min(unittest.TestCase):
             self.dwd_weather.get_daily_min(WeatherDataType.TEMPERATURE, test_time),
             272.95,
         )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_midnight(self, mock_update):
+        test_time = datetime(2020, 11, 6, 0, 0)
+        self.assertEqual(
+            self.dwd_weather.get_daily_min(WeatherDataType.TEMPERATURE, test_time),
+            272.95,
+        )

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_daily_sum.py

@@ -9,8 +9,7 @@ from dummy_data import parsed_data
 class Weather_get_daily_sum(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):
@@ -45,3 +44,11 @@ class Weather_get_daily_sum(unittest.TestCase):
             self.dwd_weather.get_daily_sum(WeatherDataType.TEMPERATURE, test_time),
             5561.8,
         )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_midnight(self, mock_update):
+        test_time = datetime(2020, 11, 6, 0, 0)
+        self.assertEqual(
+            self.dwd_weather.get_daily_sum(WeatherDataType.TEMPERATURE, test_time),
+            5561.8,
+        )

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_day_values.py

@@ -7,8 +7,7 @@ from dummy_data import parsed_data
 class Weather_get_day_values(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     def test_day_not_current_day(self):
         test_time = datetime(2020, 11, 7, 10, 0)

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_forecast_condition.py

@@ -8,8 +8,7 @@ from dummy_data import parsed_data
 class Weather_get_forecast_condition(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_forecast_data.py

@@ -9,8 +9,7 @@ from dummy_data import parsed_data
 class Weather_get_forecast_data(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_station_name.py

@@ -1,5 +1,4 @@
 import unittest
-from unittest.mock import patch
 from simple_dwd_weatherforecast import dwdforecast
 from dummy_data import parsed_data
 
@@ -7,7 +6,7 @@ from dummy_data import parsed_data
 class Weather_get_station_name(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     def test_get_station_name(self):
         self.assertEqual(self.dwd_weather.get_station_name(), "Burbach-Wuergendorf")

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_timeframe_avg.py

@@ -9,8 +9,7 @@ from dummy_data import parsed_data
 class Weather_get_timeframe_avg(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_timeframe_condition.py

@@ -8,8 +8,7 @@ from dummy_data import parsed_data
 class Weather_get_timeframe_condition(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_timeframe_max.py

@@ -9,8 +9,7 @@ from dummy_data import parsed_data
 class Weather_get_timeframe_max(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_timeframe_min.py

@@ -9,8 +9,7 @@ from dummy_data import parsed_data
 class Weather_get_timeframe_min(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_timeframe_sum.py

@@ -9,8 +9,7 @@ from dummy_data import parsed_data
 class Weather_get_timeframe_sum(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
     def test_shouldupdate(self, mock_update):

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_get_timeframe_values.py

@@ -7,8 +7,7 @@ from dummy_data import parsed_data
 class Weather_get_timeframe_values(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     def test_timeframe_6(self):
         test_time = datetime(2020, 11, 7, 1, 0)

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_is_in_timerange.py

@@ -7,8 +7,7 @@ from dummy_data import parsed_data
 class Weather_is_in_timerange(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     def test_is_in_timerange(self):
         test_time = datetime(2020, 11, 7, 3, 30)
@@ -21,3 +20,15 @@ class Weather_is_in_timerange(unittest.TestCase):
     def test_is_in_timerange_future(self):
         test_time = datetime(2102, 11, 5, 7, 30)
         self.assertFalse(self.dwd_weather.is_in_timerange(test_time))
+
+    def test_is_in_timerange_day(self):
+        test_time = datetime(2020, 11, 6, 0, 0)
+        self.assertTrue(self.dwd_weather.is_in_timerange_day(test_time))
+
+    def test_is_in_timerange_day_past(self):
+        test_time = datetime(2000, 11, 5, 17, 30)
+        self.assertFalse(self.dwd_weather.is_in_timerange(test_time))
+
+    def test_is_in_timerange_day_future(self):
+        test_time = datetime(2102, 11, 5, 7, 30)
+        self.assertFalse(self.dwd_weather.is_in_timerange(test_time))

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_is_valid_timeframe.py

@@ -6,8 +6,7 @@ from dummy_data import parsed_data
 class Weather_is_valid_timeframe(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     def test_is_day(self):
         self.assertTrue(self.dwd_weather.is_valid_timeframe(24))
@@ -25,4 +24,4 @@ class Weather_is_valid_timeframe(unittest.TestCase):
         self.assertFalse(self.dwd_weather.is_valid_timeframe(0))
 
     def test_is_negative(self):
-        self.assertFalse(self.dwd_weather.is_valid_timeframe(-5))
+        self.assertFalse(self.dwd_weather.is_valid_timeframe(-5))

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_station.py

@@ -17,7 +17,7 @@ class StationTestCase(unittest.TestCase):
 
     def test_is_valid_station_id_empty_string(self):
         self.assertFalse(dwdforecast.load_station_id(""))
-        self.assertFalse(dwdforecast.load_station_id(1))
+        self.assertFalse(dwdforecast.load_station_id("1"))
 
     def test_get_station_by_name(self):
-        self.assertEqual(dwdforecast.get_station_by_name("Ulm")[0], "10838")
+        self.assertEqual(dwdforecast.get_station_by_name("Ulm")[0], "10838")  # type: ignore

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_update.py

@@ -9,8 +9,7 @@ import time
 class WeatherUpdate(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     @patch(
         "simple_dwd_weatherforecast.dwdforecast.Weather.download_latest_report",

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_update_hourly.py

@@ -2,15 +2,14 @@ import unittest
 from unittest.mock import patch
 from simple_dwd_weatherforecast import dwdforecast
 from dummy_data import parsed_data
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timezone
 import time
 
 
 class WeatherUpdate(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("H889")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     def test_download(self):
         self.dwd_weather.update(force_hourly=True)

{simple_dwd_weatherforecast-2.0.32 → simple_dwd_weatherforecast-2.0.34}/tests/test_weather.py

@@ -6,8 +6,7 @@ from dummy_data import parsed_data
 class WeatherInit(unittest.TestCase):
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("L821")
-        self.dwd_weather.forecast_data = parsed_data
-        self.dwd_weather.station_name = "BAD HOMBURG"
+        self.dwd_weather.forecast_data = parsed_data  # type: ignore
 
     def test_init_with_wrong_id(self):
         with self.assertRaises(ValueError) as _:
@@ -19,7 +18,7 @@ class WeatherInit(unittest.TestCase):
 
     def test_init_with_no_id(self):
         with self.assertRaises(TypeError) as _:
-            dwdforecast.Weather()
+            dwdforecast.Weather()  # type: ignore
 
     def test_uv_index(self):
         self.assertEqual(self.dwd_weather.nearest_uv_index_station, "10637")