python-weather 2.0.3__tar.gz → 2.0.4__tar.gz

{python_weather-2.0.3/python_weather.egg-info → python_weather-2.0.4}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: python-weather
-Version: 2.0.3
+Version: 2.0.4
 Summary: A free and asynchronous weather API wrapper made in Python, for Python.
 Author: null8626
 License: MIT
-Project-URL: Donations, https://ko-fi.com/null8626
-Project-URL: Changelog, https://python-weather.readthedocs.io/en/latest/changelog.html
-Project-URL: Homepage, https://python-weather.readthedocs.io/en/latest/
 Project-URL: Documentation, https://python-weather.readthedocs.io/en/latest/
 Project-URL: Repository, https://github.com/null8626/python-weather
+Project-URL: Changelog, https://python-weather.readthedocs.io/en/latest/changelog.html
+Project-URL: Donate via GitHub Sponsors, https://github.com/sponsors/null8626
+Project-URL: Donate via Ko-fi, https://ko-fi.com/null8626
 Keywords: weather,forecast,weather-api,weather-forecast
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: aiohttp
@@ -35,14 +35,16 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp==3.9.5
+Requires-Dist: aiohttp>=3.10.8
 
-# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url] [![ko-fi][ko-fi-brief-image]][ko-fi-url]
+# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url] [![codacy-badge][codacy-url]][codacy-image] [![ko-fi][ko-fi-brief-image]][ko-fi-url]
 
 [pypi-image]: https://img.shields.io/pypi/v/python-weather.svg?style=flat-square
 [pypi-url]: https://pypi.org/project/python-weather/
 [downloads-image]: https://img.shields.io/pypi/dm/python-weather?style=flat-square
 [ko-fi-brief-image]: https://img.shields.io/badge/donations-ko--fi-red?color=ff5e5b&style=flat-square
+[codacy-url]: https://app.codacy.com/project/badge/Grade/0f7721b7e4314a748c75a04f0a7e0ce3
+[codacy-image]: https://app.codacy.com/gh/null8626/python-weather/dashboard
 [ko-fi-image]: https://ko-fi.com/img/githubbutton_sm.svg
 [ko-fi-url]: https://ko-fi.com/null8626
 
@@ -51,7 +53,7 @@ A free and asynchronous weather Python API wrapper made in Python, for Python.
 ## Installation
 
 ```console
-$ pip install python-weather
+pip install python-weather
 ```
 
 ## Example
@@ -65,7 +67,7 @@ import python_weather
 import asyncio
 import os
 
-async def getweather():
+async def getweather() -> None:
   # declare the client. the measuring unit used defaults to the metric system (celcius, km/h, etc.)
   async with python_weather.Client(unit=python_weather.IMPERIAL) as client:
     # fetch a weather forecast from a city
@@ -75,11 +77,11 @@ async def getweather():
     print(weather.temperature)
     
     # get the weather forecast for a few days
-    for daily in weather.daily_forecasts:
+    for daily in weather:
       print(daily)
       
       # hourly forecasts
-      for hourly in daily.hourly_forecasts:
+      for hourly in daily:
         print(f' --> {hourly!r}')
 
 if __name__ == '__main__':
@@ -91,6 +93,10 @@ if __name__ == '__main__':
   asyncio.run(getweather())
 ```
 
+## Data source
+
+This library depends on [`wttr.in`](https://github.com/chubin/wttr.in), which uses data from the [World Weather Online API](https://www.worldweatheronline.com/weather-api/).
+
 ## Donations
 
 If you want to support this project, consider donating! ❤

{python_weather-2.0.3 → python_weather-2.0.4}/README.md

@@ -1,9 +1,11 @@
-# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url] [![ko-fi][ko-fi-brief-image]][ko-fi-url]
+# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url] [![codacy-badge][codacy-url]][codacy-image] [![ko-fi][ko-fi-brief-image]][ko-fi-url]
 
 [pypi-image]: https://img.shields.io/pypi/v/python-weather.svg?style=flat-square
 [pypi-url]: https://pypi.org/project/python-weather/
 [downloads-image]: https://img.shields.io/pypi/dm/python-weather?style=flat-square
 [ko-fi-brief-image]: https://img.shields.io/badge/donations-ko--fi-red?color=ff5e5b&style=flat-square
+[codacy-url]: https://app.codacy.com/project/badge/Grade/0f7721b7e4314a748c75a04f0a7e0ce3
+[codacy-image]: https://app.codacy.com/gh/null8626/python-weather/dashboard
 [ko-fi-image]: https://ko-fi.com/img/githubbutton_sm.svg
 [ko-fi-url]: https://ko-fi.com/null8626
 
@@ -12,7 +14,7 @@ A free and asynchronous weather Python API wrapper made in Python, for Python.
 ## Installation
 
 ```console
-$ pip install python-weather
+pip install python-weather
 ```
 
 ## Example
@@ -26,7 +28,7 @@ import python_weather
 import asyncio
 import os
 
-async def getweather():
+async def getweather() -> None:
   # declare the client. the measuring unit used defaults to the metric system (celcius, km/h, etc.)
   async with python_weather.Client(unit=python_weather.IMPERIAL) as client:
     # fetch a weather forecast from a city
@@ -36,11 +38,11 @@ async def getweather():
     print(weather.temperature)
     
     # get the weather forecast for a few days
-    for daily in weather.daily_forecasts:
+    for daily in weather:
       print(daily)
       
       # hourly forecasts
-      for hourly in daily.hourly_forecasts:
+      for hourly in daily:
         print(f' --> {hourly!r}')
 
 if __name__ == '__main__':
@@ -52,8 +54,12 @@ if __name__ == '__main__':
   asyncio.run(getweather())
 ```
 
+## Data source
+
+This library depends on [`wttr.in`](https://github.com/chubin/wttr.in), which uses data from the [World Weather Online API](https://www.worldweatheronline.com/weather-api/).
+
 ## Donations
 
 If you want to support this project, consider donating! ❤
 
-[![ko-fi][ko-fi-image]][ko-fi-url]
+[![ko-fi][ko-fi-image]][ko-fi-url]

{python_weather-2.0.3 → python_weather-2.0.4}/pyproject.toml

@@ -3,13 +3,13 @@ requires = ["setuptools"]
 
 [project]
 name = "python-weather"
-version = "2.0.3"
+version = "2.0.4"
 description = "A free and asynchronous weather API wrapper made in Python, for Python."
 readme = "README.md"
 license = { text = "MIT" }
 authors = [{ name = "null8626" }]
 keywords = ["weather", "forecast", "weather-api", "weather-forecast"]
-dependencies = ["aiohttp==3.9.5"]
+dependencies = ["aiohttp>=3.10.8"]
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Framework :: aiohttp",
@@ -37,8 +37,8 @@ classifiers = [
 requires-python = ">=3.8"
 
 [project.urls]
-Donations = "https://ko-fi.com/null8626"
-Changelog = "https://python-weather.readthedocs.io/en/latest/changelog.html"
-Homepage = "https://python-weather.readthedocs.io/en/latest/"
 Documentation = "https://python-weather.readthedocs.io/en/latest/"
-Repository = "https://github.com/null8626/python-weather"
+Repository = "https://github.com/null8626/python-weather"
+Changelog = "https://python-weather.readthedocs.io/en/latest/changelog.html"
+"Donate via GitHub Sponsors" = "https://github.com/sponsors/null8626"
+"Donate via Ko-fi" = "https://ko-fi.com/null8626"

python_weather-2.0.4/python_weather/__init__.py

@@ -0,0 +1,47 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2021-2024 null8626
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from .enums import HeatIndex, Kind, Locale, Phase, UltraViolet, WindDirection
+from .constants import METRIC, IMPERIAL
+from .errors import Error, RequestError
+from .client import Client
+
+__title__ = 'python-weather'
+__author__ = 'null8626'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2021-2024 null8626'
+__version__ = '2.0.4'
+__all__ = (
+  'METRIC',
+  'IMPERIAL',
+  'Client',
+  'Error',
+  'RequestError',
+  'HeatIndex',
+  'Kind',
+  'Locale',
+  'Phase',
+  'UltraViolet',
+  'WindDirection',
+)

{python_weather-2.0.3 → python_weather-2.0.4}/python_weather/base.py

@@ -1,4 +1,29 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2021-2024 null8626
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
 from enum import auto
+from typing import Tuple
 
 from .errors import Error
 from .enums import WindDirection, Kind, Locale, UltraViolet
@@ -6,7 +31,7 @@ from .constants import _Unit
 
 
 class CustomizableBase:
-  __slots__ = ('__unit', '__locale')
+  __slots__: Tuple[str, ...] = ('__unit', '__locale')
 
   def __init__(self, unit: _Unit, locale: Locale):
     self.unit = unit
@@ -19,7 +44,7 @@ class CustomizableBase:
     return self.__unit
 
   @unit.setter
-  def unit(self, to: _Unit):
+  def unit(self, to: _Unit) -> None:
     """
     Sets the default measuring unit used to display information in this object.
 
@@ -39,7 +64,7 @@ class CustomizableBase:
     return self.__locale
 
   @locale.setter
-  def locale(self, to: Locale):
+  def locale(self, to: Locale) -> None:
     """
     Sets the default localization used to display information in this object.
 
@@ -55,7 +80,7 @@ class CustomizableBase:
 
 
 class BaseForecast(CustomizableBase):
-  __slots__ = ('__inner',)
+  __slots__: Tuple[str, ...] = ('__inner',)
 
   def __init__(self, json: dict, unit: _Unit, locale: Locale):
     self.__inner = json
@@ -70,7 +95,7 @@ class BaseForecast(CustomizableBase):
 
   @property
   def feels_like(self) -> int:
-    """What it felt like, in Celcius or Fahrenheit."""
+    """What it felt like, in celcius or fahrenheit."""
 
     return int(self.__inner[f'FeelsLike{self._CustomizableBase__unit.temperature}'])
 
@@ -82,31 +107,31 @@ class BaseForecast(CustomizableBase):
 
   @property
   def temperature(self) -> int:
-    """The temperature in either Celcius or Fahrenheit."""
+    """The temperature in either celcius or Fahrenheit."""
 
     return int(self.__inner[f'temp_{self._CustomizableBase__unit.temperature}'])
 
   @property
   def precipitation(self) -> float:
-    """The precipitation in either Millimeters or Inches."""
+    """The precipitation in either millimeters or inches."""
 
     return float(self.__inner[f'precip{self._CustomizableBase__unit.precipitation}'])
 
   @property
   def pressure(self) -> float:
-    """The pressure in either Pascal or Inches."""
+    """The pressure in either pascal or inches."""
 
     return float(self.__inner[f'pressure{self._CustomizableBase__unit.pressure}'])
 
   @property
   def visibility(self) -> int:
-    """The visibility distance in either Kilometers or Miles."""
+    """The visibility distance in either kilometers or miles."""
 
     return int(self.__inner[f'visibility{self._CustomizableBase__unit.visibility}'])
 
   @property
   def wind_speed(self) -> int:
-    """The wind speeds in either Kilometers per hour or Miles per hour."""
+    """The wind speeds in either kilometers/hour or miles/hour."""
 
     return int(self.__inner[f'windspeed{self._CustomizableBase__unit.velocity}'])
 

{python_weather-2.0.3 → python_weather-2.0.4}/python_weather/client.py

@@ -1,13 +1,37 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2021-2024 null8626
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
 from aiohttp import ClientSession, ClientTimeout, TCPConnector
 from urllib.parse import quote_plus
-from typing import Optional
+from typing import Optional, Tuple
 from asyncio import sleep
 from enum import auto
 
+from .errors import Error, RequestError
 from .constants import _Unit, METRIC
 from .base import CustomizableBase
 from .forecast import Forecast
-from .errors import Error
 from .enums import Locale
 
 
@@ -22,10 +46,10 @@ class Client(CustomizableBase):
   :param session: Whether to use an existing aiohttp client session for requesting or not. Defaults to ``None`` (creates a new one instead)
   :type session: Optional[:class:`aiohttp.ClientSession`]
 
-  :raises Error: If the ``unit`` argument is not ``None`` and it's also not ``METRIC`` or ``IMPERIAL``, or if the ``locale`` argument is not ``None`` and it's also not a part of the :class:`Locale` enum.
+  :raises Error: If ``unit`` is not ``METRIC`` or ``IMPERIAL``, or if ``locale`` is not ``None`` and not a part of the :class:`Locale` enum.
   """
 
-  __slots__ = ('__session',)
+  __slots__: Tuple[str, ...] = ('__own_session', '__session')
 
   def __init__(
     self,
@@ -36,13 +60,15 @@ class Client(CustomizableBase):
   ):
     super().__init__(unit, locale)
 
+    self.__own_session = session is None
     self.__session = session or ClientSession(
+      raise_for_status=True,
       timeout=ClientTimeout(total=5000.0),
       connector=TCPConnector(verify_ssl=False),
     )
 
   def __repr__(self) -> str:
-    return f'<{self.__class__.__name__} {self.__session!r}>'
+    return f'<{__class__.__name__} {self.__session!r}>'
 
   async def get(
     self,
@@ -56,9 +82,9 @@ class Client(CustomizableBase):
 
     :param location: The requested location name for said weather forecast.
     :type location: str
-    :param unit: Overrides the metric or imperial/customary system (``IMPERIAL``) used by the :class:`Client` object. Defaults to ``None`` (uses the one from the :class:`Client`).
+    :param unit: Overrides the unit used by this object. Defaults to the one used by this object.
     :type unit: Optional[:py:class:`enum.auto`]
-    :param locale: Overrides the locale/language used by the :class:`Client` object. Defaults to ``None`` (uses the one from the :class:`Client`).
+    :param locale: Overrides the locale used by this object. Defaults to the one used by this object.
     :type locale: Optional[Locale]
 
     :exception Error: If the aiohttp client session used by the :class:`Client` object is already closed, if the ``unit`` argument is not ``None`` and it's also not ``METRIC`` or ``IMPERIAL``, if the ``locale`` argument is not ``None`` and it's also not a part of the :class:`Locale` enum, or if the :class:`Client` cannot send a web request to the web server.
@@ -82,25 +108,25 @@ class Client(CustomizableBase):
     delay = 0.5
 
     while True:
-      async with self.__session.get(
-        f'https://{subdomain}wttr.in/{quote_plus(location)}?format=j1'
-      ) as resp:
-        try:
+      try:
+        async with self.__session.get(
+          f'https://{subdomain}wttr.in/{quote_plus(location)}?format=j1'
+        ) as resp:
           return Forecast(await resp.json(), unit, locale)
-        except Exception as e:
-          if delay == 2:
-            raise e  # okay, that's too much requests - just raise the error
+      except Exception as err:
+        if delay == 4:
+          raise RequestError(err)
 
-          await sleep(delay)
-          delay *= 2
+        await sleep(delay)
+        delay *= 2
 
-  async def close(self):
-    """Closes the :class:`Client` object. Nothing will happen if it's already closed."""
+  async def close(self) -> None:
+    """Closes the :class:`Client` object. Nothing will happen if the client uses a pre-existing :class:`aiohttp.ClientSession` or if the session is already closed."""
 
-    if not self.__session.closed:
+    if self.__own_session and not self.__session.closed:
       await self.__session.close()
 
-  async def __aenter__(self):
+  async def __aenter__(self) -> 'Client':
     return self
 
   async def __aexit__(self, *_, **__):

python_weather-2.0.4/python_weather/constants.py

@@ -0,0 +1,63 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2021-2024 null8626
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from typing import Union, Tuple
+import re
+
+
+class _Unit:
+  __slots__: Tuple[str, ...] = (
+    'temperature',
+    'velocity',
+    'pressure',
+    'precipitation',
+    'visibility',
+    'cm_divisor',
+  )
+
+  def __init__(
+    self,
+    temperature: str,
+    velocity: str,
+    pressure: str,
+    precipitation: str,
+    visibility: str,
+    cm_divisor: Union[int, float],
+  ):
+    self.temperature = temperature
+    self.velocity = velocity
+    self.pressure = pressure
+    self.precipitation = precipitation
+    self.visibility = visibility
+    self.cm_divisor = cm_divisor
+
+  def __repr__(self) -> str:
+    return f'<Unit [{self.temperature}, {self.velocity}]>'
+
+
+METRIC = _Unit('C', 'Kmph', '', 'MM', '', 1)
+IMPERIAL = _Unit('F', 'Miles', 'Inches', 'Inches', 'Miles', 2.54)
+
+WIND_DIRECTION_EMOJIS = ('↓', '↙', '←', '↖', '↑', '↗', '→', '↘')
+LATLON_REGEX = re.compile(r'^Lat (\-?[\d\.]+) and Lon (\-?[\d\.]+)$')

{python_weather-2.0.3 → python_weather-2.0.4}/python_weather/enums.py

@@ -1,11 +1,35 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2021-2024 null8626
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
 from enum import Enum
-from typing import Union
+from typing import Union, Tuple
 
 from .constants import WIND_DIRECTION_EMOJIS
 
 
 class BasicEnum(Enum):
-  __slots__ = ()
+  __slots__: Tuple[str, ...] = ()
 
   def __repr__(self) -> str:
     return f'{self.__class__.__name__}.{self.name}'
@@ -15,59 +39,45 @@ class BasicEnum(Enum):
 
 
 class IndexedEnum(Enum):
-  __slots__ = ('__index',)
+  __slots__: Tuple[str, ...] = ('index',)
+
+  index: int
+  """The index value."""
 
   def __lt__(self, other: Union['IndexedEnum', int, float]) -> bool:
-    if isinstance(other, self.__class__):
-      return self.__index < other.index
-    else:
-      return self.__index < other
+    return self.index < getattr(other, 'index', other)
 
   def __eq__(self, other: Union['IndexedEnum', int, float]) -> bool:
-    if isinstance(other, self.__class__):
-      return self.__index == other.index
-    else:
-      return self.__index == other
+    return self.index == getattr(other, 'index', other)
 
   def __gt__(self, other: Union['IndexedEnum', int, float]) -> bool:
-    if isinstance(other, self.__class__):
-      return self.__index > other.index
-    else:
-      return self.__index > other
+    return self.index > getattr(other, 'index', other)
 
   def __hash__(self) -> int:
-    return self.__index
+    return self.index
 
   def __int__(self) -> int:
-    return self.__index
-
-  @property
-  def index(self) -> int:
-    """The index value."""
-
-    return self.__index
-
-  @index.setter
-  def index(self, new_index: int) -> int:
-    self.__index = new_index
+    return self.index
 
 
 class HeatIndex(IndexedEnum):
   """Represents a heat index."""
 
+  __slots__: Tuple[str, ...] = ()
+
   CAUTION = None
   EXTREME_CAUTION = None
   DANGER = None
   EXTREME_DANGER = None
 
-  def _new(celcius_index: int, true_index: int):
+  def _new(celcius_index: int, true_index: int) -> 'HeatIndex':
     enum = HeatIndex(celcius_index)
     enum.index = true_index
 
     return enum
 
   @classmethod
-  def _missing_(self, celcius_index: int):
+  def _missing_(self, celcius_index: int) -> 'HeatIndex':
     if celcius_index <= 32:
       return self.CAUTION
     elif celcius_index <= 39:
@@ -81,20 +91,22 @@ class HeatIndex(IndexedEnum):
 class UltraViolet(BasicEnum, IndexedEnum):
   """Represents ultra-violet (UV) index."""
 
+  __slots__: Tuple[str, ...] = ()
+
   LOW = None
   MODERATE = None
   HIGH = None
   VERY_HIGH = None
   EXTREME = None
 
-  def _new(index: int):
+  def _new(index: int) -> 'UltraViolet':
     enum = UltraViolet(index)
     enum.index = index
 
     return enum
 
   @classmethod
-  def _missing_(self, index: int):
+  def _missing_(self, index: int) -> 'UltraViolet':
     if index <= 2:
       return self.LOW
     elif index <= 5:
@@ -110,7 +122,7 @@ class UltraViolet(BasicEnum, IndexedEnum):
 class WindDirection(BasicEnum):
   """Represents a wind direction."""
 
-  __slots__ = ('__degrees',)
+  __slots__: Tuple[str, ...] = ('__degrees',)
 
   NORTH = 'N'
   NORTH_NORTHEAST = 'NNE'
@@ -129,15 +141,14 @@ class WindDirection(BasicEnum):
   NORTHWEST = 'NW'
   NORTH_NORTHWEST = 'NNW'
 
-  def _new(value: str, degrees: float):
+  def _new(value: str, degrees: float) -> 'WindDirection':
     enum = WindDirection(value)
     enum.__degrees = degrees
 
     return enum
 
   def __contains__(self, other: Union['WindDirection', float, int]) -> bool:
-    if isinstance(other, self.__class__):
-      other = other.degrees
+    other = getattr(other, 'degrees', other)
 
     if self is self.NORTH:
       return other > 348.75 or other <= 11.25
@@ -191,7 +202,7 @@ class WindDirection(BasicEnum):
 class Locale(Enum):
   """Represents the list of supported locales/languages by this library."""
 
-  __slots__ = ()
+  __slots__: Tuple[str, ...] = ()
 
   AFRIKAANS = 'af'
   AMHARIC = 'am'
@@ -267,7 +278,7 @@ class Locale(Enum):
   ZULU = 'zu'
 
   def __repr__(self) -> str:
-    return f'{self.__class__.__name__}.{self.name}'
+    return f'{__class__.__name__}.{self.name}'
 
   def __str__(self) -> str:
     arr = self.name.title().split('_')
@@ -277,7 +288,7 @@ class Locale(Enum):
 class Kind(BasicEnum):
   """Represents a weather forecast kind."""
 
-  __slots__ = ()
+  __slots__: Tuple[str, ...] = ()
 
   SUNNY = 113
   PARTLY_CLOUDY = 116
@@ -299,7 +310,7 @@ class Kind(BasicEnum):
   THUNDERY_SNOW_SHOWERS = 392
 
   @classmethod
-  def _missing_(self, value: int):
+  def _missing_(self, value: int) -> 'Kind':
     if value == 248 or value == 260:
       return self.FOG
     elif value == 263 or value == 353:
@@ -381,7 +392,7 @@ class Kind(BasicEnum):
 class Phase(BasicEnum):
   """Represents a moon phase."""
 
-  __slots__ = ()
+  __slots__: Tuple[str, ...] = ()
 
   NEW_MOON = 'New Moon'
   WAXING_CRESCENT = 'Waxing Crescent'

python_weather-2.0.4/python_weather/errors.py

@@ -0,0 +1,45 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2021-2024 null8626
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from typing import Tuple
+
+
+class Error(Exception):
+  """Represents a ``python_weather`` error class. Extends :py:class:`Exception`."""
+
+  __slots__: Tuple[str, ...] = ()
+
+
+class RequestError(Error):
+  """Thrown upon HTTP request failure. Extends :class:`Error`."""
+
+  __slots__: Tuple[str, ...] = ('source',)
+
+  source: Exception
+  """The :class:`Exception` instance causing this exception."""
+
+  def __init__(self, source: Exception):
+    self.source = source
+
+    super().__init__()

{python_weather-2.0.3 → python_weather-2.0.4}/python_weather/forecast.py

@@ -1,4 +1,28 @@
-from typing import Iterable, Optional, Tuple
+"""
+The MIT License (MIT)
+
+Copyright (c) 2021-2024 null8626
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from typing import Iterable, Optional, Tuple, List
 from datetime import datetime, date, time
 
 from .base import BaseForecast, CustomizableBase
@@ -9,7 +33,7 @@ from .constants import _Unit, LATLON_REGEX
 class HourlyForecast(BaseForecast):
   """Represents a weather forecast of a specific hour."""
 
-  __slots__ = ()
+  __slots__: Tuple[str, ...] = ()
 
   def __init__(self, json: dict, unit: _Unit, locale: Locale):
     # for inheritance purposes
@@ -21,11 +45,11 @@ class HourlyForecast(BaseForecast):
     super().__init__(json, unit, locale)
 
   def __repr__(self) -> str:
-    return f'<{self.__class__.__name__} time={self.time!r} temperature={self.temperature!r} description={self.description!r} kind={self.kind!r}>'
+    return f'<{__class__.__name__} time={self.time!r} temperature={self.temperature!r} description={self.description!r} kind={self.kind!r}>'
 
   @property
   def dew_point(self) -> int:
-    """The dew point in either Celcius or Fahrenheit."""
+    """The dew point in either celcius or fahrenheit."""
 
     return int(
       self._BaseForecast__inner[f'DewPoint{self._CustomizableBase__unit.temperature}']
@@ -33,7 +57,7 @@ class HourlyForecast(BaseForecast):
 
   @property
   def heat_index(self) -> HeatIndex:
-    """The heat index in either Celcius or Fahrenheit."""
+    """The heat index in either celcius or fahrenheit."""
 
     celcius_index = int(self._BaseForecast__inner['HeatIndexC'])
 
@@ -48,7 +72,7 @@ class HourlyForecast(BaseForecast):
 
   @property
   def wind_chill(self) -> int:
-    """The wind chill value in either Celcius or Fahrenheit."""
+    """The wind chill value in either celcius or fahrenheit."""
 
     return int(
       self._BaseForecast__inner[f'WindChill{self._CustomizableBase__unit.temperature}']
@@ -56,10 +80,11 @@ class HourlyForecast(BaseForecast):
 
   @property
   def wind_gust(self) -> int:
-    """The wind gust value in either Kilometers per hour or Miles per hour."""
+    """The wind gust value in either kilometers/hour or miles/hour."""
 
-    key = f'WindGust{self._CustomizableBase__unit.velocity}'
-    return int(self._BaseForecast__inner[key])
+    return int(
+      self._BaseForecast__inner[f'WindGust{self._CustomizableBase__unit.velocity}']
+    )
 
   @property
   def chances_of_fog(self) -> int:
@@ -139,7 +164,7 @@ class HourlyForecast(BaseForecast):
 
 
 class DailyForecast(CustomizableBase):
-  __slots__ = ('__inner', '__astronomy')
+  __slots__: Tuple[str, ...] = ('__inner', '__astronomy')
 
   def __init__(self, json: dict, unit: _Unit, locale: Locale):
     self.__astronomy = json.pop('astronomy')[0]
@@ -148,9 +173,13 @@ class DailyForecast(CustomizableBase):
     super().__init__(unit, locale)
 
   def __repr__(self) -> str:
-    return (
-      f'<{self.__class__.__name__} date={self.date!r} temperature={self.temperature!r}>'
-    )
+    return f'<{__class__.__name__} date={self.date!r} temperature={self.temperature!r}>'
+
+  def __iter__(self) -> Iterable[HourlyForecast]:
+    return self.hourly_forecasts
+
+  def __list__(self) -> List[HourlyForecast]:
+    return list(iter(self))
 
   @property
   def moon_illumination(self) -> int:
@@ -208,19 +237,19 @@ class DailyForecast(CustomizableBase):
 
   @property
   def lowest_temperature(self) -> int:
-    """The lowest temperature in either Celcius or Fahrenheit."""
+    """The lowest temperature in either celcius or fahrenheit."""
 
     return int(self.__inner[f'mintemp{self._CustomizableBase__unit.temperature}'])
 
   @property
   def highest_temperature(self) -> int:
-    """The highest temperature in either Celcius or Fahrenheit."""
+    """The highest temperature in either celcius or fahrenheit."""
 
     return int(self.__inner[f'maxtemp{self._CustomizableBase__unit.temperature}'])
 
   @property
   def temperature(self) -> int:
-    """The average temperature in either Celcius or Fahrenheit."""
+    """The average temperature in either celcius or fahrenheit."""
 
     return int(self.__inner[f'avgtemp{self._CustomizableBase__unit.temperature}'])
 
@@ -232,7 +261,7 @@ class DailyForecast(CustomizableBase):
 
   @property
   def snowfall(self) -> float:
-    """Total snowfall in either Centimeters or Inches."""
+    """Total snowfall in either centimeters or inches."""
 
     return float(self.__inner['totalSnow_cm']) / self._CustomizableBase__unit.cm_divisor
 
@@ -249,7 +278,7 @@ class DailyForecast(CustomizableBase):
 class Forecast(BaseForecast):
   """Represents today's weather forecast, alongside daily and hourly weather forecasts."""
 
-  __slots__ = ('__inner', '__nearest')
+  __slots__: Tuple[str, ...] = ('__inner', '__nearest')
 
   def __init__(self, json: dict, unit: _Unit, locale: Locale):
     current = json['current_condition'][0]
@@ -259,7 +288,13 @@ class Forecast(BaseForecast):
     super().__init__(current, unit, locale)
 
   def __repr__(self) -> str:
-    return f'<{self.__class__.__name__} location={self.location!r} datetime={self.datetime!r} temperature={self.temperature!r}>'
+    return f'<{__class__.__name__} location={self.location!r} datetime={self.datetime!r} temperature={self.temperature!r}>'
+
+  def __iter__(self) -> Iterable[DailyForecast]:
+    return self.daily_forecasts
+
+  def __list__(self) -> List[DailyForecast]:
+    return list(iter(self))
 
   @property
   def local_population(self) -> int:
@@ -307,9 +342,9 @@ class Forecast(BaseForecast):
     """A tuple of this forecast's latitude and longitude."""
 
     try:
-      for req in filter(lambda x: x['type'] == 'LatLon', self.__inner['request']):
-        lat, lon = LATLON_REGEX.findall(req['query'])[0]
+      req = next(filter(lambda x: x['type'] == 'LatLon', self.__inner['request']))
+      match = LATLON_REGEX.match(req['query'])
 
-        return float(lat), float(lon)
+      return float(match[1]), float(match[2])
     except:
       return float(self.__nearest['latitude']), float(self.__nearest['longitude'])

{python_weather-2.0.3 → python_weather-2.0.4/python_weather.egg-info}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: python-weather
-Version: 2.0.3
+Version: 2.0.4
 Summary: A free and asynchronous weather API wrapper made in Python, for Python.
 Author: null8626
 License: MIT
-Project-URL: Donations, https://ko-fi.com/null8626
-Project-URL: Changelog, https://python-weather.readthedocs.io/en/latest/changelog.html
-Project-URL: Homepage, https://python-weather.readthedocs.io/en/latest/
 Project-URL: Documentation, https://python-weather.readthedocs.io/en/latest/
 Project-URL: Repository, https://github.com/null8626/python-weather
+Project-URL: Changelog, https://python-weather.readthedocs.io/en/latest/changelog.html
+Project-URL: Donate via GitHub Sponsors, https://github.com/sponsors/null8626
+Project-URL: Donate via Ko-fi, https://ko-fi.com/null8626
 Keywords: weather,forecast,weather-api,weather-forecast
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: aiohttp
@@ -35,14 +35,16 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp==3.9.5
+Requires-Dist: aiohttp>=3.10.8
 
-# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url] [![ko-fi][ko-fi-brief-image]][ko-fi-url]
+# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url] [![codacy-badge][codacy-url]][codacy-image] [![ko-fi][ko-fi-brief-image]][ko-fi-url]
 
 [pypi-image]: https://img.shields.io/pypi/v/python-weather.svg?style=flat-square
 [pypi-url]: https://pypi.org/project/python-weather/
 [downloads-image]: https://img.shields.io/pypi/dm/python-weather?style=flat-square
 [ko-fi-brief-image]: https://img.shields.io/badge/donations-ko--fi-red?color=ff5e5b&style=flat-square
+[codacy-url]: https://app.codacy.com/project/badge/Grade/0f7721b7e4314a748c75a04f0a7e0ce3
+[codacy-image]: https://app.codacy.com/gh/null8626/python-weather/dashboard
 [ko-fi-image]: https://ko-fi.com/img/githubbutton_sm.svg
 [ko-fi-url]: https://ko-fi.com/null8626
 
@@ -51,7 +53,7 @@ A free and asynchronous weather Python API wrapper made in Python, for Python.
 ## Installation
 
 ```console
-$ pip install python-weather
+pip install python-weather
 ```
 
 ## Example
@@ -65,7 +67,7 @@ import python_weather
 import asyncio
 import os
 
-async def getweather():
+async def getweather() -> None:
   # declare the client. the measuring unit used defaults to the metric system (celcius, km/h, etc.)
   async with python_weather.Client(unit=python_weather.IMPERIAL) as client:
     # fetch a weather forecast from a city
@@ -75,11 +77,11 @@ async def getweather():
     print(weather.temperature)
     
     # get the weather forecast for a few days
-    for daily in weather.daily_forecasts:
+    for daily in weather:
       print(daily)
       
       # hourly forecasts
-      for hourly in daily.hourly_forecasts:
+      for hourly in daily:
         print(f' --> {hourly!r}')
 
 if __name__ == '__main__':
@@ -91,6 +93,10 @@ if __name__ == '__main__':
   asyncio.run(getweather())
 ```
 
+## Data source
+
+This library depends on [`wttr.in`](https://github.com/chubin/wttr.in), which uses data from the [World Weather Online API](https://www.worldweatheronline.com/weather-api/).
+
 ## Donations
 
 If you want to support this project, consider donating! ❤

python_weather-2.0.4/python_weather.egg-info/requires.txt

@@ -0,0 +1 @@
+aiohttp>=3.10.8

python_weather-2.0.3/python_weather/__init__.py

@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from .enums import HeatIndex, Kind, Locale, Phase, UltraViolet, WindDirection
-from .constants import METRIC, IMPERIAL
-from .client import Client
-from .errors import Error
-
-__title__ = 'python-weather'
-__author__ = 'null8626'
-__license__ = 'MIT'
-__version__ = '2.0.3'
-__all__ = (
-  'METRIC',
-  'IMPERIAL',
-  'Client',
-  'Error',
-  'HeatIndex',
-  'Kind',
-  'Locale',
-  'Phase',
-  'UltraViolet',
-  'WindDirection',
-)

python_weather-2.0.3/python_weather/constants.py

@@ -1,39 +0,0 @@
-from typing import Union
-from re import compile
-
-
-class _Unit:
-  __slots__ = (
-    'temperature',
-    'velocity',
-    'pressure',
-    'precipitation',
-    'visibility',
-    'cm_divisor',
-  )
-
-  def __init__(
-    self,
-    temperature: str,
-    velocity: str,
-    pressure: str,
-    precipitation: str,
-    visibility: str,
-    cm_divisor: Union[int, float],
-  ):
-    self.temperature = temperature
-    self.velocity = velocity
-    self.pressure = pressure
-    self.precipitation = precipitation
-    self.visibility = visibility
-    self.cm_divisor = cm_divisor
-
-  def __repr__(self) -> str:
-    return f'<Unit [{self.temperature}, {self.velocity}]>'
-
-
-METRIC = _Unit('C', 'Kmph', '', 'MM', '', 1)
-IMPERIAL = _Unit('F', 'Miles', 'Inches', 'Inches', 'Miles', 2.54)
-
-WIND_DIRECTION_EMOJIS = ('↓', '↙', '←', '↖', '↑', '↗', '→', '↘')
-LATLON_REGEX = compile(r'^Lat (\-?[\d\.]+) and Lon (\-?[\d\.]+)$')

python_weather-2.0.3/python_weather/errors.py

@@ -1,4 +0,0 @@
-class Error(Exception):
-  """Represents a ``python_weather`` error class. Extends :py:class:`Exception`."""
-
-  __slots__ = ()

python_weather-2.0.3/python_weather.egg-info/requires.txt

@@ -1 +0,0 @@
-aiohttp==3.9.5