PyPI - env-canada - Versions diffs - 0.11.2__tar.gz → 0.12.0__tar.gz - Mend

env-canada 0.11.2tar.gz → 0.12.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (24) hide show

{env_canada-0.11.2/env_canada.egg-info → env_canada-0.12.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: env_canada
-Version: 0.11.2
+Version: 0.12.0
 Summary: A package to access meteorological data from Environment Canada
 Author-email: Michael Davie <michael.davie@gmail.com>
 Maintainer-email: Michael Davie <michael.davie@gmail.com>
@@ -17,9 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.0
 Requires-Dist: geopy>=2.3.0
-Requires-Dist: imageio>=2.28.0
 Requires-Dist: lxml>=5.3.0
-Requires-Dist: numpy>=1.22.2
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: Pillow>=10.0.1
 Requires-Dist: python-dateutil>=2.9

env_canada-0.12.0/env_canada/constants.py ADDED Viewed

	@@ -0,0 +1 @@
1	+ USER_AGENT = "env_canada/0.12.0"

{env_canada-0.11.2 → env_canada-0.12.0}/env_canada/ec_aqhi.py RENAMED Viewed

@@ -9,9 +9,11 @@ from lxml import etree as et
 from .constants import USER_AGENT
-AQHI_SITE_LIST_URL = "https://dd.weather.gc.ca/air_quality/doc/AQHI_XML_File_List.xml"
-AQHI_OBSERVATION_URL = "https://dd.weather.gc.ca/air_quality/aqhi/{}/observation/realtime/xml/AQ_OBS_{}_CURRENT.xml"
-AQHI_FORECAST_URL = "https://dd.weather.gc.ca/air_quality/aqhi/{}/forecast/realtime/xml/AQ_FCST_{}_CURRENT.xml"
+AQHI_SITE_LIST_URL = (
+    "https://dd.weather.gc.ca/today/air_quality/doc/AQHI_XML_File_List.xml"
+)
+AQHI_OBSERVATION_URL = "https://dd.weather.gc.ca/today/air_quality/aqhi/{}/observation/realtime/xml/AQ_OBS_{}_CURRENT.xml"
+AQHI_FORECAST_URL = "https://dd.weather.gc.ca/today/air_quality/aqhi/{}/forecast/realtime/xml/AQ_FCST_{}_CURRENT.xml"
 CLIENT_TIMEOUT = ClientTimeout(10)

{env_canada-0.11.2 → env_canada-0.12.0}/env_canada/ec_hydro.py RENAMED Viewed

@@ -8,8 +8,10 @@ from geopy import distance
 from .constants import USER_AGENT
-SITE_LIST_URL = "https://dd.weather.gc.ca/hydrometric/doc/hydrometric_StationList.csv"
-READINGS_URL = "https://dd.weather.gc.ca/hydrometric/csv/{prov}/hourly/{prov}_{station}_hourly_hydrometric.csv"
+SITE_LIST_URL = (
+    "https://dd.weather.gc.ca/today/hydrometric/doc/hydrometric_StationList.csv"
+)
+READINGS_URL = "https://dd.weather.gc.ca/today/hydrometric/csv/{prov}/hourly/{prov}_{station}_hourly_hydrometric.csv"
 __all__ = ["ECHydro"]

{env_canada-0.11.2 → env_canada-0.12.0}/env_canada/ec_weather.py RENAMED Viewed

@@ -21,9 +21,11 @@ from lxml.etree import _Element
 from . import ec_exc
 from .constants import USER_AGENT
-SITE_LIST_URL = "https://dd.weather.gc.ca/citypage_weather/docs/site_list_en.csv"
+SITE_LIST_URL = (
+    "https://dd.weather.gc.ca/today/citypage_weather/docs/site_list_towns_en.csv"
+)
-WEATHER_BASE_URL = "https://dd.weather.gc.ca/citypage_weather/{province}/{hour}/"
+WEATHER_BASE_URL = "https://dd.weather.gc.ca/today/citypage_weather/{province}/{hour}/"
 CLIENT_TIMEOUT = ClientTimeout(10)
@@ -35,7 +37,7 @@ ATTRIBUTION = {
 }
-__all__ = ["ECWeather", "ECWeatherUpdateFailed"]
+__all__ = ["ECWeather", "ECWeatherUpdateFailed", "get_ec_sites_list"]
 @dataclass
@@ -277,6 +279,37 @@ async def get_ec_sites():
     return sites
+async def get_ec_sites_list():
+    """
+    Get list of sites formatted for selection dropdowns.
+    Returns a list of dictionaries with the form:
+        {"label": "Toronto, ON", "value": "458"}
+    where the value is the last three digits of the site code.
+    """
+    LOG.debug("get_ec_sites_list() started")
+    sites_list = []
+    async with ClientSession(raise_for_status=True) as session:
+        response = await session.get(
+            SITE_LIST_URL, headers={"User-Agent": USER_AGENT}, timeout=CLIENT_TIMEOUT
+        )
+        sites_csv_string = await response.text()
+    sites_reader = csv.DictReader(sites_csv_string.splitlines()[1:])
+    for site in sites_reader:
+        if site["Province Codes"] != "HEF":
+            # Extract last 3 digits from site code (e.g., "s0000106" -> "106")
+            site_value = site["Codes"][5:]
+            # Create label with city name and province (e.g., "Toronto, ON")
+            label = f"{site['English Names']}, {site['Province Codes']}"
+            sites_list.append({"label": label, "value": site_value})
+    LOG.debug("get_ec_sites_list() done, retrieved %d sites", len(sites_list))
+    return sites_list
 def find_province_for_station(site_list, station_number):
     """Find the province code for a given station number."""
     for site in site_list:

{env_canada-0.11.2 → env_canada-0.12.0/env_canada.egg-info}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: env_canada
-Version: 0.11.2
+Version: 0.12.0
 Summary: A package to access meteorological data from Environment Canada
 Author-email: Michael Davie <michael.davie@gmail.com>
 Maintainer-email: Michael Davie <michael.davie@gmail.com>
@@ -17,9 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.0
 Requires-Dist: geopy>=2.3.0
-Requires-Dist: imageio>=2.28.0
 Requires-Dist: lxml>=5.3.0
-Requires-Dist: numpy>=1.22.2
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: Pillow>=10.0.1
 Requires-Dist: python-dateutil>=2.9

{env_canada-0.11.2 → env_canada-0.12.0}/env_canada.egg-info/SOURCES.txt RENAMED Viewed

@@ -2,6 +2,16 @@ LICENSE
 MANIFEST.in
 README.md
 pyproject.toml
+./env_canada/__init__.py
+./env_canada/constants.py
+./env_canada/ec_aqhi.py
+./env_canada/ec_cache.py
+./env_canada/ec_exc.py
+./env_canada/ec_historical.py
+./env_canada/ec_hydro.py
+./env_canada/ec_map.py
+./env_canada/ec_radar.py
+./env_canada/ec_weather.py
 env_canada/10x20.pbm
 env_canada/10x20.pil
 env_canada/__init__.py

{env_canada-0.11.2 → env_canada-0.12.0}/env_canada.egg-info/requires.txt RENAMED Viewed

@@ -1,8 +1,6 @@
 aiohttp>=3.9.0
 geopy>=2.3.0
-imageio>=2.28.0
 lxml>=5.3.0
-numpy>=1.22.2
 pandas>=2.2.3
 Pillow>=10.0.1
 python-dateutil>=2.9

{env_canada-0.11.2 → env_canada-0.12.0}/pyproject.toml RENAMED Viewed

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "env_canada"
 description="A package to access meteorological data from Environment Canada"
-version="0.11.2"
+version="0.12.0"
 authors = [
   {name = "Michael Davie", email = "michael.davie@gmail.com"},
 ]
@@ -22,9 +22,7 @@ classifiers = [
 dependencies = [
     "aiohttp >=3.9.0",
     "geopy >= 2.3.0",
-    "imageio >=2.28.0",
     "lxml >= 5.3.0",
-    "numpy >=1.22.2",
     "pandas >=2.2.3",
     "Pillow >=10.0.1",
     "python-dateutil >= 2.9",
@@ -65,6 +63,10 @@ asyncio_default_fixture_loop_scope = "function"
 [tool.setuptools]
 include-package-data = true
+packages = ["env_canada"]
+[tool.setuptools.package-dir]
+"" = "."
 [tool.ruff.lint]
 select = ["E4", "E7", "E9", "F", "B", "T201", "PD", "RUF", "ERA", "LOG", "G"]