hamsclientfork 0.2.19__tar.gz → 0.2.20__tar.gz

{hamsclientfork-0.2.19/hamsclientfork.egg-info → hamsclientfork-0.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: hamsclientfork
-Version: 0.2.19
+Version: 0.2.20
 Summary: Library to get data from meteo swiss
 Home-page: https://github.com/Rudd-O/hamsclientfork
 Author: websylv
@@ -18,6 +18,15 @@ License-File: LICENSE
 Requires-Dist: requests>=2.22.0
 Requires-Dist: beautifulsoup4>=4.8.2
 Requires-Dist: geopy>=2.0.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 meteoswiss
 ==========

{hamsclientfork-0.2.19 → hamsclientfork-0.2.20}/hamsclientfork/__init__.py

@@ -1,7 +1,7 @@
 """meteoswiss - Library to get data from meteo swiss"""
 
-__version__ = "0.2.6"
+__version__ = "0.2.20"
 __author__ = "websylv <div@webhu.org>"
 __all__ = ["meteoSwissClient", "StationType"]
 
-from .client import meteoSwissClient, StationType
+from .client import StationType, meteoSwissClient

{hamsclientfork-0.2.19 → hamsclientfork-0.2.20}/hamsclientfork/client.py

@@ -1,15 +1,15 @@
-import geopy
-import geopy.distance
+import csv
+import datetime
 import json
 import logging
-import requests  # type: ignore
-import datetime
-import csv
-
-from bs4 import BeautifulSoup
 from enum import Enum
 from typing import Any, TypedDict
 
+import geopy
+import geopy.distance
+import requests  # type: ignore
+from bs4 import BeautifulSoup
+
 
 class StationType(str, Enum):
     """Station type."""
@@ -313,13 +313,16 @@ class meteoSwissClient:
         for station in self._stations:
             _LOGGER.debug("Get current condition for : %s" % station)
             stationData = [d for d in data if d["Station/Location"] == station]
+            _LOGGER.debug("stationData: %s", stationData)
             rainData = [d for d in rain_data if d["Station/Location"] == station]
+            _LOGGER.debug("rainData: %s", rainData)
             if rainData and not stationData:
                 stationData = rainData
             elif rainData and stationData:
-                # Add all values from the rain data to the station data.
-                for k, v in rainData.items():
-                    stationData[k] = v
+                # Add all values from each rain data to each station data.
+                for sd, rd in zip(stationData, rainData):
+                    for k, v in rd.items():
+                        sd[k] = v
             else:
                 # if
                 # (stationData and not rainData)

{hamsclientfork-0.2.19 → hamsclientfork-0.2.20/hamsclientfork.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: hamsclientfork
-Version: 0.2.19
+Version: 0.2.20
 Summary: Library to get data from meteo swiss
 Home-page: https://github.com/Rudd-O/hamsclientfork
 Author: websylv
@@ -18,6 +18,15 @@ License-File: LICENSE
 Requires-Dist: requests>=2.22.0
 Requires-Dist: beautifulsoup4>=4.8.2
 Requires-Dist: geopy>=2.0.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 meteoswiss
 ==========

{hamsclientfork-0.2.19 → hamsclientfork-0.2.20}/setup.py

@@ -2,11 +2,10 @@ import io
 import os
 import re
 
-from setuptools import find_packages
-from setuptools import setup
+from setuptools import find_packages, setup
 
 
-def read(filename):
+def read(filename: str):
     filename = os.path.join(os.path.dirname(__file__), filename)
     text_type = type("")
     with io.open(filename, mode="r", encoding="utf-8") as fd:
@@ -15,7 +14,13 @@ def read(filename):
 
 setup(
     name="hamsclientfork",
-    version="0.2.19",
+    version=[
+        ln
+        for ln in read("hamsclientfork/__init__.py").splitlines()
+        if ln.startswith("__version__")
+    ][0]
+    .partition(" = ")[2]
+    .replace('"', ""),
     url="https://github.com/Rudd-O/hamsclientfork",
     license="MIT",
     author="websylv",