python-weather 1.0.2__tar.gz → 1.1.0__tar.gz

{python-weather-1.0.2/python_weather.egg-info → python-weather-1.1.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: python-weather
-Version: 1.0.2
+Version: 1.1.0
 Summary: A free and asynchronous weather API wrapper made in Python, for Python.
 Author: null8626
 License: MIT
 Project-URL: repository, https://github.com/null8626/python-weather
-Project-URL: download_url, https://github.com/null8626/python-weather/archive/1.0.2.tar.gz
+Project-URL: download_url, https://github.com/null8626/python-weather/archive/1.1.0.tar.gz
 Keywords: weather,forecast,weather-api,weather-forecast
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: aiohttp
@@ -29,9 +29,10 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: aiohttp==3.9.0
 
 # [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url] [![Build Status][ci-image]][ci-url] [![license][github-license-image]][github-license-url] [![BLAZINGLY FAST!!!][blazingly-fast-image]][blazingly-fast-url]
 

{python-weather-1.0.2 → python-weather-1.1.0}/pyproject.toml

@@ -3,13 +3,13 @@ requires = ["setuptools"]
 
 [project]
 name = "python-weather"
-version = "1.0.2"
+version = "1.1.0"
 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.8.4"]
+dependencies = ["aiohttp==3.9.0"]
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Framework :: aiohttp",
@@ -34,8 +34,8 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12"
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 
 [project.urls]
 repository = "https://github.com/null8626/python-weather"
-download_url = "https://github.com/null8626/python-weather/archive/1.0.2.tar.gz"
+download_url = "https://github.com/null8626/python-weather/archive/1.1.0.tar.gz"

{python-weather-1.0.2 → python-weather-1.1.0}/python_weather/__init__.py

@@ -30,7 +30,7 @@ from .constants import METRIC, IMPERIAL
 from .client import Client
 from .errors import Error
 
-__version__ = '1.0.2'
+__version__ = '1.0.3'
 __all__ = (
   'METRIC', 'IMPERIAL', 'Client', 'Error', 'Kind', 'Locale', 'Phase',
   'Ultraviolet', 'WindDirection'

{python-weather-1.0.2 → python-weather-1.1.0}/python_weather/base.py

@@ -25,12 +25,12 @@ SOFTWARE.
 from enum import auto, Enum
 
 from .enums import WindDirection, Kind, Locale, Ultraviolet
-from .constants import METRIC, VALID_UNITS
+from .constants import _Unit
 
 class CustomizableBase:
   __slots__ = ('__unit', '__locale')
   
-  def __init__(self, unit: auto, locale: Locale):
+  def __init__(self, unit: _Unit, locale: Locale):
     self.unit = unit
     self.locale = locale
   
@@ -41,7 +41,7 @@ class CustomizableBase:
     return self.__unit
   
   @unit.setter
-  def unit(self, to: auto):
+  def unit(self, to: _Unit):
     """
     Sets the default measuring unit used to display information in this object.
     
@@ -56,7 +56,7 @@ class CustomizableBase:
       If the ``to`` argument is not either :attr:`METRIC` or :attr:`IMPERIAL`.
     """
     
-    if to not in VALID_UNITS:
+    if not isinstance(to, _Unit):
       raise Error('Invalid measuring unit specified!')
     
     self.__unit = to
@@ -91,7 +91,7 @@ class CustomizableBase:
 class BaseForecast(CustomizableBase):
   __slots__ = ('__inner',)
   
-  def __init__(self, json: dict, unit: auto, locale: Locale):
+  def __init__(self, json: dict, unit: _Unit, locale: Locale):
     self.__inner = json
     
     super().__init__(unit, locale)
@@ -100,15 +100,14 @@ class BaseForecast(CustomizableBase):
   def ultraviolet(self) -> Ultraviolet:
     """:class:`Ultraviolet`: The UV (:term:`ultraviolet`) index."""
     
-    return Ultraviolet(int(self.__inner['uvIndex']))
+    return Ultraviolet._new(int(self.__inner['uvIndex']))
   
   @property
   def feels_like(self) -> int:
     """:class:`int`: What it felt like, in Celcius or Fahrenheit."""
     
     return int(
-      self.__inner[
-        f'FeelsLike{"C" if self._CustomizableBase__unit == METRIC else "F"}']
+      self.__inner[f'FeelsLike{self._CustomizableBase__unit.temperature}']
     )
   
   @property
@@ -121,18 +120,14 @@ class BaseForecast(CustomizableBase):
   def temperature(self) -> int:
     """:class:`int`: The weather temperature in either Celcius or Fahrenheit."""
     
-    return int(
-      self.
-      __inner[f'temp_{"C" if self._CustomizableBase__unit == METRIC else "F"}']
-    )
+    return int(self.__inner[f'temp_{self._CustomizableBase__unit.temperature}'])
   
   @property
   def precipitation(self) -> float:
     """:class:`float`: The precipitation in either Millimeters or Inches."""
     
     return float(
-      self.__inner[
-        f'precip{"MM" if self._CustomizableBase__unit == METRIC else "Inches"}']
+      self.__inner[f'precip{self._CustomizableBase__unit.precipitation}']
     )
   
   @property
@@ -140,8 +135,7 @@ class BaseForecast(CustomizableBase):
     """:class:`float`: The pressure in either Pascal or Inches."""
     
     return float(
-      self.__inner[
-        f'pressure{"" if self._CustomizableBase__unit == METRIC else "Inches"}']
+      self.__inner[f'pressure{self._CustomizableBase__unit.pressure}']
     )
   
   @property
@@ -149,9 +143,7 @@ class BaseForecast(CustomizableBase):
     """:class:`int`: The visibility distance in either Kilometers or Miles."""
     
     return int(
-      self.__inner[
-        f'visibility{"" if self._CustomizableBase__unit == METRIC else "Miles"}'
-      ]
+      self.__inner[f'visibility{self._CustomizableBase__unit.visibility}']
     )
   
   @property
@@ -159,9 +151,7 @@ class BaseForecast(CustomizableBase):
     """:class:`int`: The wind speeds in either Kilometers per hour or Miles per hour."""
     
     return int(
-      self.__inner[
-        f'windspeed{"Kmph" if self._CustomizableBase__unit == METRIC else "Miles"}'
-      ]
+      self.__inner[f'windspeed{self._CustomizableBase__unit.velocity}']
     )
   
   @property

{python-weather-1.0.2 → python-weather-1.1.0}/python_weather/client.py

@@ -28,7 +28,7 @@ from typing import Optional
 from asyncio import sleep
 from enum import auto
 
-from .constants import METRIC, VALID_UNITS
+from .constants import _Unit, METRIC
 from .base import CustomizableBase
 from .forecast import Weather
 from .errors import Error
@@ -115,7 +115,7 @@ class Client(CustomizableBase):
     elif self.__session.closed:
       raise Error('Client is already closed')
     
-    if unit not in VALID_UNITS:
+    if not isinstance(unit, _Unit):
       unit = self._CustomizableBase__unit
     
     if not isinstance(locale, Locale):

{python-weather-1.0.2 → python-weather-1.1.0}/python_weather/constants.py

@@ -22,11 +22,36 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
 
+from typing import Union
 from re import compile
 from enum import auto
 
-METRIC = auto()
-IMPERIAL = auto()
+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)
 
 LATLON_REGEX = compile(r'^Lat (\-?[\d\.]+) and Lon (\-?[\d\.]+)$')
-VALID_UNITS = (METRIC, IMPERIAL)

{python-weather-1.0.2 → python-weather-1.1.0}/python_weather/enums.py

@@ -31,7 +31,7 @@ class BasicEnum(Enum):
   __slots__ = ()
   
   def __repr__(self) -> str:
-    """:class:`str`: The string representation of this object."""
+    """:class:`str`: The string representation of this :class:`Enum`."""
     
     return f'{self.__class__.__name__}.{self.name}'
   
@@ -40,10 +40,10 @@ class BasicEnum(Enum):
     
     return self.name.replace('_', ' ').title()
 
-class Ultraviolet(BasicEnum):
+class Ultraviolet(Enum):
   """Represents a :term:`UV index`."""
   
-  __slots__ = ()
+  __slots__ = ('__index',)
   
   LOW = 13
   MODERATE = auto()
@@ -51,6 +51,12 @@ class Ultraviolet(BasicEnum):
   VERY_HIGH = auto()
   EXTREME = auto()
   
+  def _new(index: int):
+    enum = Ultraviolet(index)
+    enum.__index = index
+    
+    return enum
+  
   @classmethod
   def _missing_(self, index: int):
     if index <= 2:
@@ -63,6 +69,104 @@ class Ultraviolet(BasicEnum):
       return self.VERY_HIGH
     else:
       return self.EXTREME
+  
+  def __repr__(self) -> str:
+    """:class:`str`: The string representation of this :class:`Enum`."""
+    
+    return f'<{self.__class__.__name__}.{self.name} index={self.__index}>'
+  
+  def __str__(self) -> str:
+    """:class:`str`: The stylized name for this :class:`Enum`."""
+    
+    return self.name.replace('_', ' ').title()
+  
+  def __lt__(self, other: Union["Ultraviolet", int, float]) -> bool:
+    """
+    Checks if this :class:`Enum`'s ultraviolet index is less than the other ultraviolet index.
+    
+    Parameters
+    ----------
+    other: Union[:class:`Ultraviolet`, :class:`int`, :class:`float`]
+      The other ultraviolet index to compare. Besides :class:`int` and :class:`float`, this also works for any type that can be compared with an :class:`int`.
+    
+    Raises
+    ------
+    TypeError
+      If the ``other`` argument's type is incompatible.
+    
+    Returns
+    -------
+    :class:`bool`
+    """
+    
+    if isinstance(other, self.__class__):
+      return self.__index < other.index
+    else:
+      return self.__index < other
+  
+  def __eq__(self, other: Union["Ultraviolet", int, float]) -> bool:
+    """
+    Checks if this :class:`Enum`'s ultraviolet index is equal to the other ultraviolet index.
+    
+    Parameters
+    ----------
+    other: Union[:class:`Ultraviolet`, :class:`int`, :class:`float`]
+      The other ultraviolet index to compare. Besides :class:`int` and :class:`float`, this also works for any type that can be compared with an :class:`int`.
+    
+    Raises
+    ------
+    TypeError
+      If the ``other`` argument's type is incompatible.
+    
+    Returns
+    -------
+    :class:`bool`
+    """
+    
+    if isinstance(other, self.__class__):
+      return self.__index == other.index
+    else:
+      return self.__index == other
+  
+  def __gt__(self, other: Union["Ultraviolet", int, float]) -> bool:
+    """
+    Checks if this :class:`Enum`'s ultraviolet index is greater than the other ultraviolet index.
+    
+    Parameters
+    ----------
+    other: Union[:class:`Ultraviolet`, :class:`int`, :class:`float`]
+      The other ultraviolet index to compare. Besides :class:`int` and :class:`float`, this also works for any type that can be compared with an :class:`int`.
+    
+    Raises
+    ------
+    TypeError
+      If the ``other`` argument's type is incompatible.
+    
+    Returns
+    -------
+    :class:`bool`
+    """
+    
+    if isinstance(other, self.__class__):
+      return self.__index > other.index
+    else:
+      return self.__index > other
+  
+  def __hash__(self) -> int:
+    """:class:`int`: A hashed version of this :class:`Enum`."""
+    
+    return self.__index
+  
+  def __int__(self) -> int:
+    """:class:`int`: The ultraviolet index."""
+    
+    return self.__index
+  
+  @property
+  def index(self) -> int:
+    """:class:`int`: The ultraviolet index."""
+    
+    return self.__index
 
 class WindDirection(Enum):
   """Represents a wind direction."""
@@ -93,7 +197,7 @@ class WindDirection(Enum):
     return enum
   
   def __repr__(self) -> str:
-    """:class:`str`: The string representation of this object."""
+    """:class:`str`: The string representation of this :class:`Enum`."""
     
     return f'<{self.__class__.__name__}.{self.name} degrees={self.__degrees!r}>'
   
@@ -102,60 +206,60 @@ class WindDirection(Enum):
     
     return self.name.replace('_', ' ').title()
   
-  def __contains__(self, degrees: Union[float, int]) -> bool:
+  def __contains__(self, other: Union["WindDirection", float, int]) -> bool:
     """
-    Checks if the degrees value is a part of this wind direction.
+    Checks if the other degrees value is a part of this :class:`Enum`'s wind direction category.
     
     Parameters
     ----------
-    degrees: Union[:class:`float`, :class:`int`]
-      The degrees value. Must be between 0 and 360.
+    other: Union[:class:`WindDirection`, :class:`int`, :class:`float`]
+      The other degrees value to compare. Besides :class:`int` and :class:`float`, this also works for any type that can be compared with a :class:`float`.
     
     Raises
     ------
-    Error
-      Invalid ``degrees`` argument.
+    TypeError
+      If the ``other`` argument's type is incompatible.
     
     Returns
     -------
     :class:`bool`
-      The boolean.
     """
     
-    if not ((isinstance(degrees, int) or isinstance(degrees, float)) and 0 <= degrees <= 360): # yapf: disable
-      raise Error('Invalid degrees value.')
-    elif self is self.NORTH:
-      return degrees > 348.75 or degrees <= 11.25
+    if isinstance(other, self.__class__):
+      other = other.degrees
+    
+    if self is self.NORTH:
+      return other > 348.75 or other <= 11.25
     elif self is self.NORTH_NORTHEAST:
-      return 11.25 < degrees <= 33.75
+      return 11.25 < other <= 33.75
     elif self is self.NORTHEAST:
-      return 33.75 < degrees <= 56.25
+      return 33.75 < other <= 56.25
     elif self is self.EAST_NORTHEAST:
-      return 56.25 < degrees <= 78.75
+      return 56.25 < other <= 78.75
     elif self is self.EAST:
-      return 78.75 < degrees <= 101.25
+      return 78.75 < other <= 101.25
     elif self is self.EAST_SOUTHEAST:
-      return 101.25 < degrees <= 123.75
+      return 101.25 < other <= 123.75
     elif self is self.SOUTHEAST:
-      return 123.75 < degrees <= 146.25
+      return 123.75 < other <= 146.25
     elif self is self.SOUTH_SOUTHEAST:
-      return 146.25 < degrees <= 168.75
+      return 146.25 < other <= 168.75
     elif self is self.SOUTH:
-      return 168.75 < degrees <= 191.25
+      return 168.75 < other <= 191.25
     elif self is self.SOUTH_SOUTHWEST:
-      return 191.25 < degrees <= 213.75
+      return 191.25 < other <= 213.75
     elif self is self.SOUTHWEST:
-      return 213.75 < degrees <= 236.25
+      return 213.75 < other <= 236.25
     elif self is self.WEST_SOUTHWEST:
-      return 236.25 < degrees <= 258.75
+      return 236.25 < other <= 258.75
     elif self is self.WEST:
-      return 258.75 < degrees <= 281.25
+      return 258.75 < other <= 281.25
     elif self is self.WEST_NORTHWEST:
-      return 281.25 < degrees <= 303.75
+      return 281.25 < other <= 303.75
     elif self is self.NORTHWEST:
-      return 303.75 < degrees <= 326.25
+      return 303.75 < other <= 326.25
     else:
-      return 326.25 < degrees <= 348.75
+      return 326.25 < other <= 348.75
   
   @property
   def degrees(self) -> int:
@@ -242,7 +346,7 @@ class Locale(Enum):
   ZULU = 'zu'
   
   def __repr__(self) -> str:
-    """:class:`str`: The string representation of this object."""
+    """:class:`str`: The string representation of this :class:`Enum`."""
     
     return f'{self.__class__.__name__}.{self.name}'
   

{python-weather-1.0.2 → python-weather-1.1.0}/python_weather/forecast.py

@@ -26,10 +26,9 @@ from typing import Iterable, Optional, Tuple
 from datetime import datetime, date, time
 from enum import auto
 
-from .enums import Kind, Phase, WindDirection, Locale, Ultraviolet
-from .constants import VALID_UNITS, LATLON_REGEX, METRIC
 from .base import BaseForecast, CustomizableBase
-from .errors import Error
+from .constants import _Unit, LATLON_REGEX
+from .enums import Phase, Locale
 
 class Area:
   """Represents the location of the weather forecast."""
@@ -164,7 +163,7 @@ class HourlyForecast(BaseForecast):
   
   __slots__ = ()
   
-  def __init__(self, json: dict, unit: auto, 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')
@@ -183,7 +182,7 @@ class HourlyForecast(BaseForecast):
     """:class:`int`: The dew point in either Celcius or Fahrenheit."""
     
     return int(
-      self._BaseForecast__inner[f'DewPoint{"C" if self._CustomizableBase__unit == METRIC else "F"}']
+      self._BaseForecast__inner[f'DewPoint{self._CustomizableBase__unit.temperature}']
     ) # yapf: disable
   
   @property
@@ -191,7 +190,7 @@ class HourlyForecast(BaseForecast):
     """:class:`int`: The heat index in either Celcius or Fahrenheit."""
     
     return int(
-      self._BaseForecast__inner[f'HeatIndex{"C" if self._CustomizableBase__unit == METRIC else "F"}']
+      self._BaseForecast__inner[f'HeatIndex{self._CustomizableBase__unit.temperature}']
     ) # yapf: disable
   
   @property
@@ -199,14 +198,14 @@ class HourlyForecast(BaseForecast):
     """:class:`int`: The wind chill value in either Celcius or Fahrenheit."""
     
     return int(
-      self._BaseForecast__inner[f'WindChill{"C" if self._CustomizableBase__unit == METRIC else "F"}']
+      self._BaseForecast__inner[f'WindChill{self._CustomizableBase__unit.temperature}']
     ) # yapf: disable
   
   @property
   def wind_gust(self) -> int:
     """:class:`int`: The wind gust value in either Kilometers per hour or Miles per hour."""
     
-    key = f'WindGust{"Kmph" if self._CustomizableBase__unit == METRIC else "Miles"}'
+    key = f'WindGust{self._CustomizableBase__unit.velocity}'
     return int(self._BaseForecast__inner[key])
   
   @property
@@ -284,7 +283,7 @@ class HourlyForecast(BaseForecast):
 class DailyForecast(CustomizableBase):
   __slots__ = ('__inner',)
   
-  def __init__(self, json: dict, unit: auto, locale: Locale):
+  def __init__(self, json: dict, unit: _Unit, locale: Locale):
     self.__inner = json
     
     super().__init__(unit, locale)
@@ -311,7 +310,7 @@ class DailyForecast(CustomizableBase):
     """:class:`int`: The lowest temperature in either Celcius or Fahrenheit."""
     
     return int(
-      self.__inner[f'mintemp{"C" if self._CustomizableBase__unit == METRIC else "F"}']
+      self.__inner[f'mintemp{self._CustomizableBase__unit.temperature}']
     ) # yapf: disable
   
   @property
@@ -319,7 +318,7 @@ class DailyForecast(CustomizableBase):
     """:class:`int`: The highest temperature in either Celcius or Fahrenheit."""
     
     return int(
-      self.__inner[f'maxtemp{"C" if self._CustomizableBase__unit == METRIC else "F"}']
+      self.__inner[f'maxtemp{self._CustomizableBase__unit.temperature}']
     ) # yapf: disable
   
   @property
@@ -327,7 +326,7 @@ class DailyForecast(CustomizableBase):
     """:class:`int`: The average temperature in either Celcius or Fahrenheit."""
     
     return int(
-      self.__inner[f'avgtemp{"C" if self._CustomizableBase__unit == METRIC else "F"}']
+      self.__inner[f'avgtemp{self._CustomizableBase__unit.temperature}']
     ) # yapf: disable
   
   @property
@@ -340,8 +339,9 @@ class DailyForecast(CustomizableBase):
   def snowfall(self) -> float:
     """:class:`float`: Total snowfall in either Centimeters or Inches."""
     
-    width = float(self.__inner['totalSnow_cm'])
-    return width if self._CustomizableBase__unit == METRIC else width / 2.54
+    return float(
+      self.__inner['totalSnow_cm']
+    ) / self._CustomizableBase__unit.cm_divisor
   
   @property
   def hourly(self) -> Iterable[HourlyForecast]:
@@ -358,7 +358,7 @@ class Weather(CustomizableBase):
   
   __slots__ = ('__inner',)
   
-  def __init__(self, json: dict, unit: auto, locale: Locale):
+  def __init__(self, json: dict, unit: _Unit, locale: Locale):
     self.__inner = json
     
     super().__init__(unit, locale)

{python-weather-1.0.2 → python-weather-1.1.0/python_weather.egg-info}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: python-weather
-Version: 1.0.2
+Version: 1.1.0
 Summary: A free and asynchronous weather API wrapper made in Python, for Python.
 Author: null8626
 License: MIT
 Project-URL: repository, https://github.com/null8626/python-weather
-Project-URL: download_url, https://github.com/null8626/python-weather/archive/1.0.2.tar.gz
+Project-URL: download_url, https://github.com/null8626/python-weather/archive/1.1.0.tar.gz
 Keywords: weather,forecast,weather-api,weather-forecast
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: aiohttp
@@ -29,9 +29,10 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: aiohttp==3.9.0
 
 # [python-weather][pypi-url] [![pypi][pypi-image]][pypi-url] [![downloads][downloads-image]][pypi-url] [![Build Status][ci-image]][ci-url] [![license][github-license-image]][github-license-url] [![BLAZINGLY FAST!!!][blazingly-fast-image]][blazingly-fast-url]
 

python-weather-1.1.0/python_weather.egg-info/requires.txt

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

python-weather-1.0.2/python_weather.egg-info/requires.txt

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