python-weather 2.1.0__tar.gz → 2.1.1__tar.gz

{python_weather-2.1.0 → python_weather-2.1.1}/MANIFEST.in

@@ -1,10 +1,17 @@
+prune .pytest_cache
 prune .ruff_cache
 prune .github
+prune tests
 prune docs
 exclude .gitattributes
 exclude .gitignore
 exclude .readthedocs.yml
+exclude .coverage
 exclude ruff.toml
 exclude LICENSE
 exclude changelog.yml
-exclude test.py
+exclude codacy-coverage
+exclude codecov*
+exclude coverage.xml
+exclude junit.xml
+global-exclude __pycache__/*

{python_weather-2.1.0/python_weather.egg-info → python_weather-2.1.1}/PKG-INFO

@@ -1,110 +1,104 @@
-Metadata-Version: 2.4
-Name: python-weather
-Version: 2.1.0
-Summary: A free and asynchronous weather API wrapper made in Python, for Python.
-Author: null8626
-License: MIT
-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: Intended Audience :: Education
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Information Technology
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Education
-Classifier: Topic :: Internet
-Classifier: Topic :: Scientific/Engineering
-Classifier: Topic :: Scientific/Engineering :: Astronomy
-Classifier: Topic :: Software Development
-Classifier: Topic :: Software Development :: Libraries
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: aiohttp>=3.12.4
-Dynamic: license-file
-
-# [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
-
-A free and asynchronous weather Python API wrapper made in Python, for Python.
-
-## Getting started
-
-Run the following command in your terminal:
-
-```console
-$ pip install python-weather
-```
-
-## Example
-
-For more information, please read the [documentation](https://python-weather.readthedocs.io/en/latest/).
-
-```py
-# Import the module.
-import python_weather
-
-import asyncio
-import os
-
-
-async def main() -> 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.
-    weather = await client.get('New York')
-    
-    # Fetch the temperature for today.
-    print(weather.temperature)
-    
-    # Fetch weather forecast for upcoming days.
-    for daily in weather:
-      print(daily)
-    
-      # Each daily forecast has their own hourly forecasts.
-      for hourly in daily:
-        print(f' --> {hourly!r}')
-
-if __name__ == '__main__':
-  
-  # See https://stackoverflow.com/questions/45600579/asyncio-event-loop-is-closed-when-getting-loop
-  # for more details.
-  if os.name == 'nt':
-    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
-  
-  asyncio.run(main())
-```
-
-## 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]
+Metadata-Version: 2.4
+Name: python-weather
+Version: 2.1.1
+Summary: A free and asynchronous weather API wrapper made in Python, for Python.
+Author: null8626
+License: MIT
+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-forecast
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Education
+Classifier: Topic :: Internet
+Classifier: Topic :: Scientific/Engineering
+Classifier: Topic :: Scientific/Engineering :: Astronomy
+Classifier: Topic :: Software Development
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: aiohttp>=3.13.2
+Dynamic: license-file
+
+# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![pypi downloads][pypi-downloads-image]][pypi-url] [![codacy-badge][codacy-image]][codacy-url] [![codecov-badge][codecov-image]][codecov-url] [![ko-fi][ko-fi-brief-image]][ko-fi-url]
+
+[pypi-url]: https://pypi.org/project/python-weather/
+[pypi-image]: https://img.shields.io/pypi/v/python-weather.svg?style=flat-square
+[pypi-downloads-image]: https://img.shields.io/pypi/dm/python-weather?style=flat-square
+[codacy-url]: https://app.codacy.com/gh/null8626/python-weather/dashboard
+[codacy-image]: https://app.codacy.com/project/badge/Grade/0f7721b7e4314a748c75a04f0a7e0ce3
+[codecov-url]: https://codecov.io/gh/null8626/python-weather
+[codecov-image]: https://codecov.io/gh/null8626/python-weather/graph/badge.svg
+[ko-fi-url]: https://ko-fi.com/null8626
+[ko-fi-image]: https://ko-fi.com/img/githubbutton_sm.svg
+[ko-fi-brief-image]: https://img.shields.io/badge/donations-ko--fi-red?color=ff5e5b&style=flat-square
+
+A free and asynchronous weather Python API wrapper made in Python, for Python.
+
+## Getting started
+
+Run the following command in your terminal:
+
+```console
+pip install python-weather
+```
+
+## Example
+
+For more information, please read the [documentation](https://python-weather.readthedocs.io/en/latest/).
+
+```py
+# Import the module.
+import python_weather
+
+import asyncio
+
+
+async def main() -> 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.
+    weather = await client.get('New York')
+    
+    # Fetch the temperature for today.
+    print(weather.temperature)
+    
+    # Fetch weather forecast for upcoming days.
+    for daily in weather:
+      print(daily)
+    
+      # Each daily forecast has their own hourly forecasts.
+      for hourly in daily:
+        print(f' --> {hourly!r}')
+
+if __name__ == '__main__':
+  asyncio.run(main())
+```
+
+## 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]

{python_weather-2.1.0 → python_weather-2.1.1}/README.md

@@ -1,13 +1,15 @@
-# [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]
+# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![pypi downloads][pypi-downloads-image]][pypi-url] [![codacy-badge][codacy-image]][codacy-url] [![codecov-badge][codecov-image]][codecov-url] [![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
+[pypi-image]: https://img.shields.io/pypi/v/python-weather.svg?style=flat-square
+[pypi-downloads-image]: https://img.shields.io/pypi/dm/python-weather?style=flat-square
+[codacy-url]: https://app.codacy.com/gh/null8626/python-weather/dashboard
+[codacy-image]: https://app.codacy.com/project/badge/Grade/0f7721b7e4314a748c75a04f0a7e0ce3
+[codecov-url]: https://codecov.io/gh/null8626/python-weather
+[codecov-image]: https://codecov.io/gh/null8626/python-weather/graph/badge.svg
 [ko-fi-url]: https://ko-fi.com/null8626
+[ko-fi-image]: https://ko-fi.com/img/githubbutton_sm.svg
+[ko-fi-brief-image]: https://img.shields.io/badge/donations-ko--fi-red?color=ff5e5b&style=flat-square
 
 A free and asynchronous weather Python API wrapper made in Python, for Python.
 
@@ -16,7 +18,7 @@ A free and asynchronous weather Python API wrapper made in Python, for Python.
 Run the following command in your terminal:
 
 ```console
-$ pip install python-weather
+pip install python-weather
 ```
 
 ## Example
@@ -28,7 +30,6 @@ For more information, please read the [documentation](https://python-weather.rea
 import python_weather
 
 import asyncio
-import os
 
 
 async def main() -> None:
@@ -51,12 +52,6 @@ async def main() -> None:
         print(f' --> {hourly!r}')
 
 if __name__ == '__main__':
-  
-  # See https://stackoverflow.com/questions/45600579/asyncio-event-loop-is-closed-when-getting-loop
-  # for more details.
-  if os.name == 'nt':
-    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
-  
   asyncio.run(main())
 ```
 

{python_weather-2.1.0 → python_weather-2.1.1}/pyproject.toml

@@ -3,13 +3,13 @@ requires = ["setuptools"]
 
 [project]
 name = "python-weather"
-version = "2.1.0"
+version = "2.1.1"
 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.12.4"]
+keywords = ["weather", "forecast", "weather-forecast"]
+dependencies = ["aiohttp>=3.13.2"]
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Intended Audience :: Education",
@@ -23,17 +23,16 @@ classifiers = [
   "Topic :: Scientific/Engineering :: Astronomy",
   "Topic :: Software Development",
   "Topic :: Software Development :: Libraries",
-  "License :: OSI Approved :: MIT License",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
-  "Programming Language :: Python :: 3.13"
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14"
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 [project.urls]
 Documentation = "https://python-weather.readthedocs.io/en/latest/"
@@ -41,3 +40,14 @@ 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"
+
+[tool.pytest.ini_options]
+minversion = "8.0"
+testpaths = ["tests"]
+
+[tool.coverage.report]
+exclude_lines = [
+  "^\\s*async def __a\\w+__\\(",
+  "# pragma: nocover",
+  "TYPE_CHECKING:$"
+]

{python_weather-2.1.0 → python_weather-2.1.1}/python_weather/__init__.py

@@ -25,12 +25,16 @@ SOFTWARE.
 from .enums import HeatIndex, Kind, Locale, Phase, UltraViolet, WindDirection
 from .constants import METRIC, IMPERIAL
 from .errors import Error, RequestError
+from .forecast import Forecast
 from .version import VERSION
 from .client import Client
 
 
 __title__ = 'python-weather'
 __author__ = 'null8626'
+__credits__ = (__author__,)
+__maintainer__ = __author__
+__status__ = 'Production'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2021-2025 null8626'
 __version__ = VERSION
@@ -39,6 +43,7 @@ __all__ = (
   'IMPERIAL',
   'Client',
   'Error',
+  'Forecast',
   'RequestError',
   'HeatIndex',
   'Kind',

{python_weather-2.1.0 → python_weather-2.1.1}/python_weather/base.py

@@ -28,7 +28,10 @@ from .errors import Error
 
 
 class CustomizableBase:
-  __slots__: tuple[str, ...] = ('__unit', '__locale')
+  __slots__: tuple[str, ...] = '_unit', '_locale'
+
+  _unit: _Unit
+  _locale: Locale
 
   def __init__(self, unit: _Unit, locale: Locale):
     self.unit = unit
@@ -38,7 +41,7 @@ class CustomizableBase:
   def unit(self) -> _Unit:
     """The measuring unit used."""
 
-    return self.__unit
+    return self._unit
 
   @unit.setter
   def unit(self, to: _Unit) -> None:
@@ -53,13 +56,13 @@ class CustomizableBase:
     if not isinstance(to, _Unit):
       raise Error('Invalid measuring unit specified!')
 
-    self.__unit = to
+    self._unit = to
 
   @property
   def locale(self) -> Locale:
     """The localization used."""
 
-    return self.__locale
+    return self._locale
 
   @locale.setter
   def locale(self, to: Locale) -> None:
@@ -75,11 +78,12 @@ class CustomizableBase:
     if not isinstance(to, Locale):
       raise Error(f'Expected {to!r} to be a Locale enum')
 
-    self.__locale = to
+    self._locale = to
 
 
 class BaseForecast:
   __slots__: tuple[str, ...] = (
+    'cloud_cover',
     'ultraviolet',
     'humidity',
     'wind_direction',
@@ -93,6 +97,9 @@ class BaseForecast:
     'description',
   )
 
+  cloud_cover: int
+  """The cloud cover value in percent."""
+
   ultraviolet: UltraViolet
   """The ultra-violet index."""
 
@@ -133,6 +140,7 @@ class BaseForecast:
       else json[f'lang_{locale.value}'][0]['value']
     )
 
+    self.cloud_cover = int(json['cloudcover'])
     self.ultraviolet = UltraViolet._new(int(json['uvIndex']))
     self.humidity = int(json['humidity'])
     self.wind_direction = WindDirection._new(

{python_weather-2.1.0 → python_weather-2.1.1}/python_weather/client.py

@@ -24,7 +24,6 @@ SOFTWARE.
 
 from aiohttp import ClientSession, ClientTimeout, ClientResponseError, TCPConnector
 from urllib.parse import quote_plus
-from typing import Optional
 from asyncio import sleep
 
 from .errors import Error, RequestError
@@ -39,56 +38,82 @@ class Client(CustomizableBase):
   """
   Interact with the API's endpoints.
 
+  Examples:
+
+  .. code-block:: python
+
+    # Explicit cleanup
+    client = python_weather.Client(unit=python_weather.IMPERIAL)
+
+    # ...
+
+    await client.close()
+
+    # Implicit cleanup
+    async with python_weather.Client(unit=python_weather.IMPERIAL) as client:
+      # ...
+
   :param unit: Whether to use the metric or imperial/customary system (:data:`~.constants.IMPERIAL`). Defaults to :data:`~.constants.METRIC`.
   :type unit: ``_Unit``
   :param locale: Whether to use a different locale/language as the description for the returned forecast. Defaults to :attr:`.Locale.ENGLISH`.
   :type locale: :class:`.Locale`
   :param session: Whether to use an existing :class:`~aiohttp.ClientSession` for requesting or not. Defaults to :py:obj:`None` (creates a new one instead).
-  :type session: Optional[:class:`~aiohttp.ClientSession`]
-  :param max_retries: Maximum amount of retries upon request failure before raising a :class:`.RequestError`. Use ``-1`` to disable (NOT recommended). Defaults to 3 retries.
-  :type max_retries: Optional[:class:`int`]
+  :type session: :class:`~aiohttp.ClientSession` | :py:obj:`None`
+  :param max_retries: Maximum amount of retries upon request failure before raising a :class:`.RequestError`.
+                      Use ``-1`` to disable (NOT recommended). Defaults to 3 retries.
+  :type max_retries: :class:`int` | :py:obj:`None`
 
   :exception Error: ``unit`` is not :data:`~.constants.METRIC` or :data:`~.constants.IMPERIAL` or ``locale`` is not a part of the :class:`.Locale` enum.
   """
 
-  __slots__: tuple[str, ...] = ('__own_session', '__session', '__max_retries')
+  __slots__: tuple[str, ...] = '__own_session', '__session', '_max_retries'
+
+  __own_session: bool
+  __session: ClientSession
+  _max_retries: int
 
   def __init__(
     self,
     *,
     unit: _Unit = METRIC,
     locale: Locale = Locale.ENGLISH,
-    session: Optional[ClientSession] = None,
-    max_retries: Optional[int] = None,
+    session: ClientSession | None = None,
+    max_retries: int | None = None,
   ):
     super().__init__(unit, locale)
 
     self.__own_session = session is None
     self.__session = session or ClientSession(
       timeout=ClientTimeout(total=5000.0),
-      connector=TCPConnector(verify_ssl=False),
+      connector=TCPConnector(ssl=False),
     )
-    self.__max_retries = max_retries or 3
+    self._max_retries = max_retries or 3
 
   def __repr__(self) -> str:
-    return f'<{__class__.__name__} {self.__session!r}>'
+    return f'<{__class__.__module__}.{__class__.__name__} {self.__session!r}>'
 
   async def get(
     self,
     location: str,
     *,
-    unit: Optional[_Unit] = None,
-    locale: Optional[Locale] = None,
+    unit: _Unit | None = None,
+    locale: Locale | None = None,
   ) -> Forecast:
     """
     Fetches a weather forecast for a specific location.
 
+    Example:
+
+    .. code-block:: python
+
+      weather = await client.get('New York')
+
     :param location: The requested location.
     :type location: :py:class:`str`
     :param unit: Overrides the unit used.
-    :type unit: Optional[``_Unit``]
+    :type unit: ``_Unit`` | :py:obj:`None`
     :param locale: Overrides the locale used.
-    :type locale: Optional[:class:`.Locale`]
+    :type locale: :class:`.Locale` | :py:obj:`None`
 
     :exception TypeError: ``location`` is not a :py:class:`str` or is empty.
     :exception Error: The client is already closed.
@@ -105,14 +130,16 @@ class Client(CustomizableBase):
       raise TypeError(f'Expected a proper location str, got {location!r}')
 
     if not isinstance(unit, _Unit):
-      unit = self._CustomizableBase__unit
+      unit = self._unit
 
     if not isinstance(locale, Locale):
-      locale = self._CustomizableBase__locale
+      locale = self._locale
 
     subdomain = f'{locale.value}.' if locale != Locale.ENGLISH else ''
     attempts = 0
+
     status = None
+    reason = None
 
     while True:
       try:
@@ -124,18 +151,28 @@ class Client(CustomizableBase):
           },
         ) as resp:
           status = resp.status
+          reason = resp.reason
+
           resp.raise_for_status()
 
           return Forecast(await resp.json(), unit, locale)
       except ClientResponseError:
-        if attempts == self.__max_retries:
-          raise RequestError(status) from None
+        if attempts == self._max_retries:
+          raise RequestError(status, reason) from None
 
         await sleep(0.5 * (2**attempts))
         attempts += 1
 
   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."""
+    """
+    Closes the :class:`.Client` object.
+
+    Example:
+
+    .. code-block:: python
+
+      await client.close()
+    """
 
     if self.__own_session and not self.__session.closed:
       await self.__session.close()

{python_weather-2.1.0 → python_weather-2.1.1}/python_weather/constants.py

@@ -22,7 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
 
-from typing import Union
 import re
 
 
@@ -36,6 +35,13 @@ class _Unit:
     'cm_divisor',
   )
 
+  temperature: str
+  velocity: str
+  pressure: str
+  precipitation: str
+  visibility: str
+  cm_divisor: float | int
+
   def __init__(
     self,
     temperature: str,
@@ -43,7 +49,7 @@ class _Unit:
     pressure: str,
     precipitation: str,
     visibility: str,
-    cm_divisor: Union[float, int],
+    cm_divisor: float | int,
   ):
     self.temperature = temperature
     self.velocity = velocity
@@ -59,5 +65,5 @@ class _Unit:
 METRIC = _Unit('C', 'Kmph', '', 'MM', '', 1)
 IMPERIAL = _Unit('F', 'Miles', 'Inches', 'Inches', 'Miles', 2.54)
 
-WIND_DIRECTION_EMOJIS = ('↓', '↙', '←', '↖', '↑', '↗', '→', '↘')
+WIND_DIRECTION_EMOJIS = '↓', '↙', '←', '↖', '↑', '↗', '→', '↘'
 LATLON_REGEX = re.compile(r'^Lat (\-?[\d\.]+) and Lon (\-?[\d\.]+)$')

{python_weather-2.1.0 → python_weather-2.1.1}/python_weather/enums.py

@@ -22,7 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
 
-from typing import Union
 from enum import Enum
 
 from .constants import WIND_DIRECTION_EMOJIS
@@ -44,19 +43,22 @@ class IndexedEnum(Enum):
   index: int
   """The index value."""
 
-  def __lt__(self, other: Union['IndexedEnum', float, int]) -> bool:
+  def __lt__(self, other: 'IndexedEnum | float | int') -> bool:
     return float(self.index) < float(other)
 
-  def __le__(self, other: Union['IndexedEnum', float, int]) -> bool:
+  def __le__(self, other: 'IndexedEnum | float | int') -> bool:
     return float(self.index) <= float(other)
 
-  def __eq__(self, other: Union['IndexedEnum', float, int]) -> bool:
-    return float(self.index) == float(other)
+  def __eq__(self, other: object) -> bool:
+    if other_float := getattr(other, '__float__', None):
+      return float(self.index) == other_float()
 
-  def __gt__(self, other: Union['IndexedEnum', float, int]) -> bool:
+    return False  # pragma: nocover
+
+  def __gt__(self, other: 'IndexedEnum | float | int') -> bool:
     return float(self.index) > float(other)
 
-  def __ge__(self, other: Union['IndexedEnum', float, int]) -> bool:
+  def __ge__(self, other: 'IndexedEnum | float | int') -> bool:
     return float(self.index) >= float(other)
 
   def __hash__(self) -> int:
@@ -79,6 +81,7 @@ class HeatIndex(IndexedEnum):
   DANGER = None
   EXTREME_DANGER = None
 
+  @staticmethod
   def _new(celcius_index: int, true_index: int) -> 'HeatIndex':
     enum = HeatIndex(celcius_index)
     enum.index = true_index
@@ -86,15 +89,16 @@ class HeatIndex(IndexedEnum):
     return enum
 
   @classmethod
-  def _missing_(self, celcius_index: int) -> 'HeatIndex':
-    if celcius_index <= 32:
-      return self.CAUTION
-    elif celcius_index <= 39:
-      return self.EXTREME_CAUTION
-    elif celcius_index <= 51:
-      return self.DANGER
-    else:
-      return self.EXTREME_DANGER
+  def _missing_(cls, value: object) -> 'HeatIndex | None':
+    if isinstance(value, int):
+      if value <= 32:
+        return cls.CAUTION
+      elif value <= 39:
+        return cls.EXTREME_CAUTION
+      elif value <= 51:
+        return cls.DANGER
+      else:
+        return cls.EXTREME_DANGER
 
 
 class UltraViolet(BasicEnum, IndexedEnum):
@@ -108,6 +112,7 @@ class UltraViolet(BasicEnum, IndexedEnum):
   VERY_HIGH = None
   EXTREME = None
 
+  @staticmethod
   def _new(index: int) -> 'UltraViolet':
     enum = UltraViolet(index)
     enum.index = index
@@ -115,17 +120,18 @@ class UltraViolet(BasicEnum, IndexedEnum):
     return enum
 
   @classmethod
-  def _missing_(self, index: int) -> 'UltraViolet':
-    if index <= 2:
-      return self.LOW
-    elif index <= 5:
-      return self.MODERATE
-    elif index <= 7:
-      return self.HIGH
-    elif index <= 10:
-      return self.VERY_HIGH
-    else:
-      return self.EXTREME
+  def _missing_(cls, value: object) -> 'UltraViolet | None':
+    if isinstance(value, int):
+      if value <= 2:
+        return cls.LOW
+      elif value <= 5:
+        return cls.MODERATE
+      elif value <= 7:
+        return cls.HIGH
+      elif value <= 10:
+        return cls.VERY_HIGH
+      else:
+        return cls.EXTREME
 
 
 class WindDirection(BasicEnum):
@@ -153,13 +159,14 @@ class WindDirection(BasicEnum):
   degrees: float
   """The wind direction's value in degrees."""
 
+  @staticmethod
   def _new(value: str, degrees: float) -> 'WindDirection':
     enum = WindDirection(value)
     enum.degrees = degrees
 
     return enum
 
-  def __contains__(self, other: Union['WindDirection', float, int]) -> bool:
+  def __contains__(self, other: 'WindDirection | float | int') -> bool:
     other = float(other)
 
     if self is self.NORTH:
@@ -291,7 +298,8 @@ class Locale(Enum):
 
   def __str__(self) -> str:
     arr = self.name.title().split('_')
-    return f'{arr[:-1].join(" ")} ({arr[-1]})' if len(arr) != 1 else arr[0]
+
+    return f'{" ".join(arr[:-1])} ({arr[-1]})' if len(arr) != 1 else arr[0]
 
 
 class Kind(BasicEnum):
@@ -319,31 +327,31 @@ class Kind(BasicEnum):
   THUNDERY_SNOW_SHOWERS = 392
 
   @classmethod
-  def _missing_(self, value: int) -> 'Kind':
+  def _missing_(cls, value: object) -> 'Kind | None':
     if value in (248, 260):
-      return self.FOG
+      return cls.FOG
     elif value in (263, 353):
-      return self.LIGHT_SHOWERS
+      return cls.LIGHT_SHOWERS
     elif value in (362, 365, 374):
-      return self.LIGHT_SLEET_SHOWERS
+      return cls.LIGHT_SLEET_SHOWERS
     elif value in (185, 281, 284, 311, 314, 317, 350, 377):
-      return self.LIGHT_SLEET
+      return cls.LIGHT_SLEET
     elif value == 386:
-      return self.THUNDERY_SHOWERS
+      return cls.THUNDERY_SHOWERS
     elif value == 320:
-      return self.LIGHT_SNOW
+      return cls.LIGHT_SNOW
     elif value in (329, 332, 338):
-      return self.HEAVY_SNOW
+      return cls.HEAVY_SNOW
     elif value in (293, 296):
-      return self.LIGHT_RAIN
+      return cls.LIGHT_RAIN
     elif value in (305, 356):
-      return self.HEAVY_SHOWERS
+      return cls.HEAVY_SHOWERS
     elif value in (308, 359):
-      return self.HEAVY_RAIN
+      return cls.HEAVY_RAIN
     elif value in (326, 368):
-      return self.LIGHT_SNOW_SHOWERS
+      return cls.LIGHT_SNOW_SHOWERS
     elif value in (371, 395):
-      return self.HEAVY_SNOW_SHOWERS
+      return cls.HEAVY_SNOW_SHOWERS
 
   @property
   def emoji(self) -> str:
@@ -383,10 +391,8 @@ class Kind(BasicEnum):
       return '⛈'
     elif self is self.THUNDERY_SNOW_SHOWERS:
       return '⛈'
-    elif self is self.VERY_CLOUDY:
-      return '☁️'
     else:
-      return '✨'
+      return '☁️'
 
 
 class Phase(BasicEnum):

{python_weather-2.1.0 → python_weather-2.1.1}/python_weather/errors.py

@@ -22,8 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
 
-from typing import Optional
-
 
 class Error(Exception):
   """The base error class. Extends :py:class:`Exception`."""
@@ -34,15 +32,19 @@ class Error(Exception):
 class RequestError(Error):
   """Thrown upon HTTP request failure. Extends :class:`.Error`."""
 
-  __slots__: tuple[str, ...] = ('status',)
+  __slots__: tuple[str, ...] = 'status', 'reason'
+
+  status: int | None
+  """The status code."""
 
-  status: Optional[int]
-  """The status code returned from the API."""
+  reason: str | None
+  """The reason for this status code."""
 
-  def __init__(self, status: Optional[int]):
+  def __init__(self, status: int | None, reason: str | None):
     self.status = status
+    self.reason = reason
 
-    super().__init__()
+    super().__init__(f'{status}: {reason}')
 
-  def __repr__(self) -> str:
-    return f'<{__class__.__name__} status={self.status}>'
+  def __repr__(self) -> str:  # pragma: nocover
+    return f'<{__class__.__module__}.{__class__.__name__} status={self.status} reason={self.reason!r}>'

{python_weather-2.1.0 → python_weather-2.1.1}/python_weather/forecast.py

@@ -23,13 +23,17 @@ SOFTWARE.
 """
 
 from datetime import datetime, date, time
-from collections.abc import Iterable
-from typing import Optional
+from collections.abc import Iterator
+from typing import TYPE_CHECKING
 
-from .enums import Phase, Locale, HeatIndex
-from .constants import _Unit, LATLON_REGEX
+from .enums import Phase, HeatIndex
+from .constants import LATLON_REGEX
 from .base import BaseForecast
 
+if TYPE_CHECKING:
+  from .constants import _Unit
+  from .enums import Locale
+
 
 class HourlyForecast(BaseForecast):
   """A weather forecast for a specific hour."""
@@ -45,7 +49,6 @@ class HourlyForecast(BaseForecast):
     'chances_of_sunshine',
     'chances_of_thunder',
     'chances_of_windy',
-    'cloud_cover',
     'time',
     'dew_point',
     'heat_index',
@@ -83,9 +86,6 @@ class HourlyForecast(BaseForecast):
   chances_of_windy: int
   """Chances of windy in percent."""
 
-  cloud_cover: int
-  """The cloud cover value in percent."""
-
   time: 'time'
   """The local time in hours and minutes."""
 
@@ -101,7 +101,7 @@ class HourlyForecast(BaseForecast):
   wind_gust: int
   """The wind gust value in either kilometers/hour or miles/hour."""
 
-  def __init__(self, json: dict, unit: _Unit, locale: Locale):
+  def __init__(self, json: dict, unit: '_Unit', locale: 'Locale'):
     # For inheritance purposes.
     if 'temp_C' not in json:
       json['temp_C'] = json.pop('tempC')
@@ -122,7 +122,6 @@ class HourlyForecast(BaseForecast):
     self.chances_of_sunshine = int(json['chanceofsunshine'])
     self.chances_of_thunder = int(json['chanceofthunder'])
     self.chances_of_windy = int(json['chanceofwindy'])
-    self.cloud_cover = int(json['cloudcover'])
     self.time = time() if len(t) < 3 else datetime.strptime(t, '%H%M').time()
     self.dew_point = int(json[f'DewPoint{unit.temperature}'])
     self.heat_index = HeatIndex._new(
@@ -135,7 +134,7 @@ class HourlyForecast(BaseForecast):
     super().__init__(json, unit, locale)
 
   def __repr__(self) -> str:
-    return f'<{__class__.__name__} time={self.time!r} temperature={self.temperature} description={self.description!r} kind={self.kind!r}>'
+    return f'<{__class__.__module__}.{__class__.__name__} time={self.time!r} temperature={self.temperature} kind={self.kind!r}>'
 
 
 class DailyForecast:
@@ -163,16 +162,16 @@ class DailyForecast:
   moon_phase: Phase
   """The moon's phase."""
 
-  moonrise: Optional[time]
+  moonrise: time | None
   """The local time when the moon rises."""
 
-  moonset: Optional[time]
+  moonset: time | None
   """The local time when the moon sets."""
 
-  sunrise: Optional[time]
+  sunrise: time | None
   """The local time when the sun rises."""
 
-  sunset: Optional[time]
+  sunset: time | None
   """The local time when the sun sets."""
 
   date: 'date'
@@ -196,7 +195,7 @@ class DailyForecast:
   hourly_forecasts: list[HourlyForecast]
   """The hourly forecasts of this day."""
 
-  def __init__(self, json: dict, unit: _Unit, locale: Locale):
+  def __init__(self, json: dict, unit: '_Unit', locale: 'Locale'):
     astronomy = json['astronomy'][0]
 
     self.moon_illumination = int(astronomy['moon_illumination'])
@@ -216,19 +215,19 @@ class DailyForecast:
     ]
 
   @staticmethod
-  def __parse_time(timestamp: str) -> Optional[time]:
+  def __parse_time(timestamp: str) -> time | None:
     try:
       return datetime.strptime(timestamp, '%I:%M %p').time()
-    except ValueError:
+    except ValueError:  # pragma: nocover
       ...
 
   def __repr__(self) -> str:
-    return f'<{__class__.__name__} date={self.date!r} temperature={self.temperature}>'
+    return f'<{__class__.__module__}.{__class__.__name__} date={self.date!r} temperature={self.temperature}>'
 
   def __len__(self) -> int:
     return len(self.hourly_forecasts)
 
-  def __iter__(self) -> Iterable[HourlyForecast]:
+  def __iter__(self) -> Iterator[HourlyForecast]:
     return iter(self.hourly_forecasts)
 
 
@@ -266,7 +265,7 @@ class Forecast(BaseForecast):
   daily_forecasts: list[DailyForecast]
   """Daily weather forecasts in this location."""
 
-  def __init__(self, json: dict, unit: _Unit, locale: Locale):
+  def __init__(self, json: dict, unit: '_Unit', locale: 'Locale'):
     current = json['current_condition'][0]
     nearest = json['nearest_area'][0]
 
@@ -280,9 +279,12 @@ class Forecast(BaseForecast):
       req = next(filter(lambda x: x['type'] == 'LatLon', json['request']))
       match = LATLON_REGEX.match(req['query'])
 
-      self.coordinates = (float(match[1]), float(match[2]))
-    except (KeyError, IndexError, StopIteration):
-      self.coordinates = (float(nearest['latitude']), float(nearest['longitude']))
+      if TYPE_CHECKING:
+        assert match is not None
+
+      self.coordinates = float(match[1]), float(match[2])
+    except (AssertionError, KeyError, StopIteration):
+      self.coordinates = float(nearest['latitude']), float(nearest['longitude'])
 
     self.daily_forecasts = [
       DailyForecast(elem, unit, locale) for elem in json['weather']
@@ -291,10 +293,10 @@ class Forecast(BaseForecast):
     super().__init__(current, unit, locale)
 
   def __repr__(self) -> str:
-    return f'<{__class__.__name__} location={self.location!r} datetime={self.datetime!r} temperature={self.temperature}>'
+    return f'<{__class__.__module__}.{__class__.__name__} location={self.location!r} datetime={self.datetime!r} temperature={self.temperature}>'
 
   def __len__(self) -> int:
     return len(self.daily_forecasts)
 
-  def __iter__(self) -> Iterable[DailyForecast]:
+  def __iter__(self) -> Iterator[DailyForecast]:
     return iter(self.daily_forecasts)

{python_weather-2.1.0 → python_weather-2.1.1/python_weather.egg-info}/PKG-INFO

@@ -1,110 +1,104 @@
-Metadata-Version: 2.4
-Name: python-weather
-Version: 2.1.0
-Summary: A free and asynchronous weather API wrapper made in Python, for Python.
-Author: null8626
-License: MIT
-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: Intended Audience :: Education
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Information Technology
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Education
-Classifier: Topic :: Internet
-Classifier: Topic :: Scientific/Engineering
-Classifier: Topic :: Scientific/Engineering :: Astronomy
-Classifier: Topic :: Software Development
-Classifier: Topic :: Software Development :: Libraries
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: aiohttp>=3.12.4
-Dynamic: license-file
-
-# [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
-
-A free and asynchronous weather Python API wrapper made in Python, for Python.
-
-## Getting started
-
-Run the following command in your terminal:
-
-```console
-$ pip install python-weather
-```
-
-## Example
-
-For more information, please read the [documentation](https://python-weather.readthedocs.io/en/latest/).
-
-```py
-# Import the module.
-import python_weather
-
-import asyncio
-import os
-
-
-async def main() -> 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.
-    weather = await client.get('New York')
-    
-    # Fetch the temperature for today.
-    print(weather.temperature)
-    
-    # Fetch weather forecast for upcoming days.
-    for daily in weather:
-      print(daily)
-    
-      # Each daily forecast has their own hourly forecasts.
-      for hourly in daily:
-        print(f' --> {hourly!r}')
-
-if __name__ == '__main__':
-  
-  # See https://stackoverflow.com/questions/45600579/asyncio-event-loop-is-closed-when-getting-loop
-  # for more details.
-  if os.name == 'nt':
-    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
-  
-  asyncio.run(main())
-```
-
-## 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]
+Metadata-Version: 2.4
+Name: python-weather
+Version: 2.1.1
+Summary: A free and asynchronous weather API wrapper made in Python, for Python.
+Author: null8626
+License: MIT
+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-forecast
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Education
+Classifier: Topic :: Internet
+Classifier: Topic :: Scientific/Engineering
+Classifier: Topic :: Scientific/Engineering :: Astronomy
+Classifier: Topic :: Software Development
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: aiohttp>=3.13.2
+Dynamic: license-file
+
+# [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![pypi downloads][pypi-downloads-image]][pypi-url] [![codacy-badge][codacy-image]][codacy-url] [![codecov-badge][codecov-image]][codecov-url] [![ko-fi][ko-fi-brief-image]][ko-fi-url]
+
+[pypi-url]: https://pypi.org/project/python-weather/
+[pypi-image]: https://img.shields.io/pypi/v/python-weather.svg?style=flat-square
+[pypi-downloads-image]: https://img.shields.io/pypi/dm/python-weather?style=flat-square
+[codacy-url]: https://app.codacy.com/gh/null8626/python-weather/dashboard
+[codacy-image]: https://app.codacy.com/project/badge/Grade/0f7721b7e4314a748c75a04f0a7e0ce3
+[codecov-url]: https://codecov.io/gh/null8626/python-weather
+[codecov-image]: https://codecov.io/gh/null8626/python-weather/graph/badge.svg
+[ko-fi-url]: https://ko-fi.com/null8626
+[ko-fi-image]: https://ko-fi.com/img/githubbutton_sm.svg
+[ko-fi-brief-image]: https://img.shields.io/badge/donations-ko--fi-red?color=ff5e5b&style=flat-square
+
+A free and asynchronous weather Python API wrapper made in Python, for Python.
+
+## Getting started
+
+Run the following command in your terminal:
+
+```console
+pip install python-weather
+```
+
+## Example
+
+For more information, please read the [documentation](https://python-weather.readthedocs.io/en/latest/).
+
+```py
+# Import the module.
+import python_weather
+
+import asyncio
+
+
+async def main() -> 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.
+    weather = await client.get('New York')
+    
+    # Fetch the temperature for today.
+    print(weather.temperature)
+    
+    # Fetch weather forecast for upcoming days.
+    for daily in weather:
+      print(daily)
+    
+      # Each daily forecast has their own hourly forecasts.
+      for hourly in daily:
+        print(f' --> {hourly!r}')
+
+if __name__ == '__main__':
+  asyncio.run(main())
+```
+
+## 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]

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

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

{python_weather-2.1.0 → python_weather-2.1.1}/setup.cfg

@@ -1,4 +1,4 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
+[egg_info]
+tag_build = 
+tag_date = 0
+

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

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