env-canada 0.6.1__tar.gz → 0.6.2__tar.gz

{env_canada-0.6.1 → env_canada-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: env_canada
-Version: 0.6.1
+Version: 0.6.2
 Summary: A package to access meteorological data from Environment Canada
 Home-page: https://github.com/michaeldavie/env_canada
 Author: Michael Davie
@@ -25,7 +25,7 @@ Requires-Dist: voluptuous
 # Environment Canada (env_canada)
 
 [![PyPI version](https://badge.fury.io/py/env-canada.svg)](https://badge.fury.io/py/env-canada)
-[![Snyk rating](https://snyk-widget.herokuapp.com/badge/pip/env-canada/badge.svg)](https://snyk.io/vuln/pip:env-canada@0.6.1?utm_source=badge)
+[![Snyk rating](https://snyk-widget.herokuapp.com/badge/pip/env-canada/badge.svg)](https://snyk.io/vuln/pip:env-canada@0.6.2?utm_source=badge)
 
 This package provides access to various data sources published by [Environment and Climate Change Canada](https://www.canada.ca/en/environment-climate-change.html).
 
@@ -116,7 +116,8 @@ Once updated asynchronously, historical weather data is contained with the `stat
 ```python
 import asyncio
 
-from env_canada import ECHistorical, get_historical_stations
+from env_canada import ECHistorical
+from env_canada.ec_historical import get_historical_stations
 
 # search for stations, response contains station_ids
 coordinates = [53.916944, -122.749444] # [lat, long]
@@ -165,7 +166,8 @@ For example :
 ```python
 import pandas as pd
 import asyncio
-from env_canada import ECHistoricalRange, get_historical_stations
+from env_canada import ECHistoricalRange
+from env_canada.ec_historical import get_historical_stations
 from datetime import datetime
 
 coordinates = ['48.508333', '-68.467667']

{env_canada-0.6.1 → env_canada-0.6.2}/README.md

@@ -1,7 +1,7 @@
 # Environment Canada (env_canada)
 
 [![PyPI version](https://badge.fury.io/py/env-canada.svg)](https://badge.fury.io/py/env-canada)
-[![Snyk rating](https://snyk-widget.herokuapp.com/badge/pip/env-canada/badge.svg)](https://snyk.io/vuln/pip:env-canada@0.6.1?utm_source=badge)
+[![Snyk rating](https://snyk-widget.herokuapp.com/badge/pip/env-canada/badge.svg)](https://snyk.io/vuln/pip:env-canada@0.6.2?utm_source=badge)
 
 This package provides access to various data sources published by [Environment and Climate Change Canada](https://www.canada.ca/en/environment-climate-change.html).
 
@@ -92,7 +92,8 @@ Once updated asynchronously, historical weather data is contained with the `stat
 ```python
 import asyncio
 
-from env_canada import ECHistorical, get_historical_stations
+from env_canada import ECHistorical
+from env_canada.ec_historical import get_historical_stations
 
 # search for stations, response contains station_ids
 coordinates = [53.916944, -122.749444] # [lat, long]
@@ -141,7 +142,8 @@ For example :
 ```python
 import pandas as pd
 import asyncio
-from env_canada import ECHistoricalRange, get_historical_stations
+from env_canada import ECHistoricalRange
+from env_canada.ec_historical import get_historical_stations
 from datetime import datetime
 
 coordinates = ['48.508333', '-68.467667']

env_canada-0.6.2/env_canada/__init__.py

@@ -0,0 +1,5 @@
+from .ec_aqhi import ECAirQuality
+from .ec_historical import ECHistorical, ECHistoricalRange
+from .ec_hydro import ECHydro
+from .ec_radar import ECRadar
+from .ec_weather import ECWeather

env_canada-0.6.2/env_canada/constants.py

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

{env_canada-0.6.1 → env_canada-0.6.2}/env_canada/ec_radar.py

@@ -1,17 +1,18 @@
-from aiohttp.client_exceptions import ClientConnectorError
 import asyncio
 import datetime
-from io import BytesIO
 import logging
 import math
 import os
-from PIL import Image, ImageDraw, ImageFont
+from io import BytesIO
 
-from .ec_cache import CacheClientSession as ClientSession
 import dateutil.parser
 import defusedxml.ElementTree as et
 import imageio.v2 as imageio
 import voluptuous as vol
+from aiohttp.client_exceptions import ClientConnectorError
+from PIL import Image, ImageDraw, ImageFont
+
+from .ec_cache import CacheClientSession as ClientSession
 
 ATTRIBUTION = {
     "english": "Data provided by Environment Canada",
@@ -331,6 +332,17 @@ class ECRadar(object):
     async def get_loop(self, fps=5):
         """Build an animated GIF of recent radar images."""
 
+        def build_image():
+            gif_frames = [imageio.imread(f, mode="RGBA") for f in frames]
+            gif_bytes = imageio.mimwrite(
+                imageio.RETURN_BYTES,
+                gif_frames,
+                format="GIF",
+                duration=duration,
+                subrectangles=True,
+            )
+            return gif_bytes
+
         """Build list of frame timestamps."""
         start, end = await self._get_dimensions()
         frame_times = [start]
@@ -361,12 +373,6 @@ class ECRadar(object):
         """Assemble animated GIF."""
         duration = 1000 / fps
 
-        gif_frames = [imageio.imread(f, mode="RGBA") for f in frames]
-        gif_bytes = imageio.mimwrite(
-            imageio.RETURN_BYTES,
-            gif_frames,
-            format="GIF",
-            duration=duration,
-            subrectangles=True,
-        )
+        loop = asyncio.get_running_loop()
+        gif_bytes = await loop.run_in_executor(None, build_image)
         return gif_bytes

{env_canada-0.6.1 → env_canada-0.6.2}/env_canada.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: env-canada
-Version: 0.6.1
+Name: env_canada
+Version: 0.6.2
 Summary: A package to access meteorological data from Environment Canada
 Home-page: https://github.com/michaeldavie/env_canada
 Author: Michael Davie
@@ -25,7 +25,7 @@ Requires-Dist: voluptuous
 # Environment Canada (env_canada)
 
 [![PyPI version](https://badge.fury.io/py/env-canada.svg)](https://badge.fury.io/py/env-canada)
-[![Snyk rating](https://snyk-widget.herokuapp.com/badge/pip/env-canada/badge.svg)](https://snyk.io/vuln/pip:env-canada@0.6.1?utm_source=badge)
+[![Snyk rating](https://snyk-widget.herokuapp.com/badge/pip/env-canada/badge.svg)](https://snyk.io/vuln/pip:env-canada@0.6.2?utm_source=badge)
 
 This package provides access to various data sources published by [Environment and Climate Change Canada](https://www.canada.ca/en/environment-climate-change.html).
 
@@ -116,7 +116,8 @@ Once updated asynchronously, historical weather data is contained with the `stat
 ```python
 import asyncio
 
-from env_canada import ECHistorical, get_historical_stations
+from env_canada import ECHistorical
+from env_canada.ec_historical import get_historical_stations
 
 # search for stations, response contains station_ids
 coordinates = [53.916944, -122.749444] # [lat, long]
@@ -165,7 +166,8 @@ For example :
 ```python
 import pandas as pd
 import asyncio
-from env_canada import ECHistoricalRange, get_historical_stations
+from env_canada import ECHistoricalRange
+from env_canada.ec_historical import get_historical_stations
 from datetime import datetime
 
 coordinates = ['48.508333', '-68.467667']

{env_canada-0.6.1 → env_canada-0.6.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="env_canada",
-    version="0.6.1",
+    version="0.6.2",
     author="Michael Davie",
     author_email="michael.davie@gmail.com",
     description="A package to access meteorological data from Environment Canada",

{env_canada-0.6.1 → env_canada-0.6.2}/tests/test_ec_weather.py

@@ -17,20 +17,12 @@ def test_ecweather(init_parameters):
     weather = ECWeather(**init_parameters)
     assert isinstance(weather, ECWeather)
 
-@pytest.fixture()
-def no_conditions():
-    return ECWeather(station_id="ON/s0000773")
-
-def test_update_no_conditions(no_conditions):
-    asyncio.run(no_conditions.update())
-    assert no_conditions.conditions == {}
-    assert no_conditions.daily_forecasts
-    assert no_conditions.hourly_forecasts
 
 @pytest.fixture()
 def with_conditions():
     return ECWeather(station_id="ON/s0000430")
 
+
 def test_update_with_conditions(with_conditions):
     asyncio.run(with_conditions.update())
-    assert with_conditions.conditions
+    assert with_conditions.conditions

env_canada-0.6.1/env_canada/__init__.py

@@ -1,5 +0,0 @@
-from .ec_aqhi import *
-from .ec_historical import *
-from .ec_hydro import *
-from .ec_radar import *
-from .ec_weather import *

env_canada-0.6.1/env_canada/constants.py

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