hamsclientfork 0.2.14__tar.gz → 0.2.16__tar.gz

{hamsclientfork-0.2.14/hamsclientfork.egg-info → hamsclientfork-0.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hamsclientfork
-Version: 0.2.14
+Version: 0.2.16
 Summary: Library to get data from meteo swiss
 Home-page: https://github.com/Rudd-O/hamsclientfork
 Author: websylv
@@ -16,7 +16,6 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 License-File: LICENSE
 Requires-Dist: requests>=2.22.0
-Requires-Dist: pandas>=0.25.3
 Requires-Dist: beautifulsoup4>=4.8.2
 Requires-Dist: geopy>=2.0.0
 

{hamsclientfork-0.2.14 → hamsclientfork-0.2.16}/hamsclientfork/client.py

@@ -2,9 +2,9 @@ import geopy
 import geopy.distance
 import json
 import logging
-import pandas as pd
 import requests  # type: ignore
 import datetime
+import csv
 
 from bs4 import BeautifulSoup
 from enum import Enum
@@ -287,13 +287,17 @@ class meteoSwissClient:
 
     def get_current_condition(self):
         _LOGGER.debug("Update current condition")
-        data = pd.read_csv(CURRENT_CONDITION_URL, sep=";", header=0)
+        with requests.get(CURRENT_CONDITION_URL) as response:
+            response.raise_for_status()
+            response.encoding = "iso_8859_1"
+            lines = response.text.split("\n")
+            csv_reader = csv.DictReader(lines, delimiter=";")
+            data = [row for row in csv_reader if row]
         conditions = {}
         condition_list = []
         for station in self._stations:
             _LOGGER.debug("Get current condition for : %s" % station)
-            stationData = data.loc[data["Station/Location"].str.contains(station)]
-            stationData = stationData.to_dict("records")
+            stationData = [d for d in data if d["Station/Location"] == station]
             condition_list.extend(stationData)
             if stationData:
                 conditions[station] = stationData[0]
@@ -306,16 +310,19 @@ class meteoSwissClient:
 
     def __get_all_stations(self) -> dict[str, Any]:
         _LOGGER.debug("Getting all stations from : %s" % (STATION_URL))
-        data = pd.read_csv(
-            STATION_URL,
-            sep=";",
-            header=0,
-            skipfooter=4,
-            encoding="latin1",
-            engine="python",
-        )
+        with requests.get(STATION_URL) as response:
+            response.encoding = "iso_8859_1"
+            lines = response.text.split("\n")
+            csv_reader = csv.DictReader(lines, delimiter=";")
+            data = [row for row in csv_reader if row]
+
         stationList = {}
-        for index, line in data.iterrows():
+        for line in data:
+            if (
+                line["Type de station"] != STATION_TYPE_PRECIPITATION
+                and line["Type de station"] != STATION_TYPE_WEATHER
+            ):
+                continue
             stationData = {}
             stationData["code"] = line["Abr."]
             stationData["name"] = line["Station"]
@@ -327,7 +334,7 @@ class meteoSwissClient:
             elif line["Type de station"] == STATION_TYPE_WEATHER:
                 stationData["type"] = StationType.WEATHER
             else:
-                assert 0, "unknown station type %s" % line["Type de station"]
+                _LOGGER.debug("unknown station type %s" % line["Type de station"])
             stationList[stationData["code"]] = stationData
         return stationList
 

{hamsclientfork-0.2.14 → hamsclientfork-0.2.16/hamsclientfork.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hamsclientfork
-Version: 0.2.14
+Version: 0.2.16
 Summary: Library to get data from meteo swiss
 Home-page: https://github.com/Rudd-O/hamsclientfork
 Author: websylv
@@ -16,7 +16,6 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 License-File: LICENSE
 Requires-Dist: requests>=2.22.0
-Requires-Dist: pandas>=0.25.3
 Requires-Dist: beautifulsoup4>=4.8.2
 Requires-Dist: geopy>=2.0.0
 

{hamsclientfork-0.2.14 → hamsclientfork-0.2.16}/hamsclientfork.egg-info/requires.txt

@@ -1,4 +1,3 @@
 requests>=2.22.0
-pandas>=0.25.3
 beautifulsoup4>=4.8.2
 geopy>=2.0.0

{hamsclientfork-0.2.14 → hamsclientfork-0.2.16}/setup.py

@@ -15,7 +15,7 @@ def read(filename):
 
 setup(
     name="hamsclientfork",
-    version="0.2.14",
+    version="0.2.16",
     url="https://github.com/Rudd-O/hamsclientfork",
     license="MIT",
     author="websylv",
@@ -25,7 +25,6 @@ setup(
     packages=find_packages(exclude=("tests",)),
     install_requires=[
         "requests>=2.22.0",
-        "pandas>=0.25.3",
         "beautifulsoup4>=4.8.2",
         "geopy>=2.0.0",
     ],