python-ember-mug 1.1.0b1__tar.gz → 1.2.0__tar.gz

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: python-ember-mug
-Version: 1.1.0b1
+Version: 1.2.0
 Summary: Python Library for Ember Mugs.
+Project-URL: Changelog, https://sopelj.github.io/python-ember-mug/changelog/
 Project-URL: Documentation, https://sopelj.github.io/python-ember-mug/
 Project-URL: Source code, https://github.com/sopelj/python-ember-mug/
 Project-URL: Bug Tracker, https://github.com/sopelj/python-ember-mug/issues
-Project-URL: Changelog, https://github.com/sopelj/python-ember-mug/blob/main/CHANGELOG.md
-Author-email: Jesse Sopel <jesse.sopel@gmail.com>
+Author-email: Jesse Sopel <jesse@sopelj.ca>
 License-Expression: MIT
 License-File: LICENSE
 Classifier: Intended Audience :: Developers
@@ -15,20 +15,23 @@ Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.11
 Requires-Dist: bleak-retry-connector>=3.5.0
-Requires-Dist: bleak>=0.22.2
+Requires-Dist: bleak>=0.22.2; python_version < '3.13'
+Requires-Dist: bleak>=0.22.3; python_version <= '3.13'
+Provides-Extra: dev
+Requires-Dist: ipython; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: black; extra == 'docs'
 Requires-Dist: mkdocs-autorefs; extra == 'docs'
 Requires-Dist: mkdocs-gen-files; extra == 'docs'
-Requires-Dist: mkdocs-include-markdown-plugin<8.0.0,>=3.6.1; extra == 'docs'
+Requires-Dist: mkdocs-include-markdown-plugin<8.0.0,>=7.0.0; extra == 'docs'
 Requires-Dist: mkdocs-literate-nav; extra == 'docs'
 Requires-Dist: mkdocs-material-extensions; extra == 'docs'
-Requires-Dist: mkdocs-material<10.0.0,>=8.4.1; extra == 'docs'
-Requires-Dist: mkdocs>=1.1.21; extra == 'docs'
-Requires-Dist: mkdocstrings-python; extra == 'docs'
-Requires-Dist: mkdocstrings[python]; extra == 'docs'
+Requires-Dist: mkdocs-material<10.0.0,>=9.5.44; extra == 'docs'
+Requires-Dist: mkdocs>=1.6.1; extra == 'docs'
+Requires-Dist: mkdocstrings-python>=1.12.0; extra == 'docs'
 Requires-Dist: termynal; extra == 'docs'
 Provides-Extra: test
 Requires-Dist: pytest-asyncio; extra == 'test'
@@ -42,16 +45,16 @@ Description-Content-Type: text/markdown
 [![python](https://img.shields.io/pypi/pyversions/python-ember-mug.svg)](https://pypi.org/project/python-ember-mug/)
 [![Build Status](https://github.com/sopelj/python-ember-mug/actions/workflows/tests.yml/badge.svg)](https://github.com/sopelj/python-ember-mug/actions/workflows/tests.yml)
 [![codecov](https://codecov.io/gh/sopelj/python-ember-mug/graph/badge.svg?token=2Lw2iVjKsG)](https://codecov.io/gh/sopelj/python-ember-mug)
-![Project Maintenance](https://img.shields.io/maintenance/yes/2024.svg)
+![Project Maintenance](https://img.shields.io/maintenance/yes/2025.svg)
 [![Maintainer](https://img.shields.io/badge/maintainer-%40sopelj-blue.svg)](https://github.com/sopelj)
 [![License](https://img.shields.io/github/license/sopelj/python-ember-mug.svg)](https://github.com/sopelj/python-ember-mug/blob/main/LICENSE)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen)](https://github.com/pre-commit/pre-commit)
 
 Python Library for interacting with Ember Mugs, Cups, and Travel Mugs via Bluetooth
 
-* [Documentation](https://sopelj.github.io/python-ember-mug)
-* [GitHub](https://github.com/sopelj/python-ember-mug)
-* [PyPI](https://pypi.org/project/python-ember-mug/)
+* [📘 Documentation](https://sopelj.github.io/python-ember-mug)
+* [💻 GitHub](https://github.com/sopelj/python-ember-mug)
+* [🐍 PyPI](https://pypi.org/project/python-ember-mug/)
 
 ## Summary
 
@@ -123,7 +126,7 @@ async with mug.connection():
     print(mug.data.formatted)
 ```
 
-### CLI
+### CLI Mode
 
 It can also be run via command line either directly with `ember-mug --help` or as a module with `python -m ember_mug --help`
 There are four options with different subsections. You can see them by specifying them before help. eg `ember-mug poll --help`

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/README.md

@@ -4,16 +4,16 @@
 [![python](https://img.shields.io/pypi/pyversions/python-ember-mug.svg)](https://pypi.org/project/python-ember-mug/)
 [![Build Status](https://github.com/sopelj/python-ember-mug/actions/workflows/tests.yml/badge.svg)](https://github.com/sopelj/python-ember-mug/actions/workflows/tests.yml)
 [![codecov](https://codecov.io/gh/sopelj/python-ember-mug/graph/badge.svg?token=2Lw2iVjKsG)](https://codecov.io/gh/sopelj/python-ember-mug)
-![Project Maintenance](https://img.shields.io/maintenance/yes/2024.svg)
+![Project Maintenance](https://img.shields.io/maintenance/yes/2025.svg)
 [![Maintainer](https://img.shields.io/badge/maintainer-%40sopelj-blue.svg)](https://github.com/sopelj)
 [![License](https://img.shields.io/github/license/sopelj/python-ember-mug.svg)](https://github.com/sopelj/python-ember-mug/blob/main/LICENSE)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen)](https://github.com/pre-commit/pre-commit)
 
 Python Library for interacting with Ember Mugs, Cups, and Travel Mugs via Bluetooth
 
-* [Documentation](https://sopelj.github.io/python-ember-mug)
-* [GitHub](https://github.com/sopelj/python-ember-mug)
-* [PyPI](https://pypi.org/project/python-ember-mug/)
+* [📘 Documentation](https://sopelj.github.io/python-ember-mug)
+* [💻 GitHub](https://github.com/sopelj/python-ember-mug)
+* [🐍 PyPI](https://pypi.org/project/python-ember-mug/)
 
 ## Summary
 
@@ -85,7 +85,7 @@ async with mug.connection():
     print(mug.data.formatted)
 ```
 
-### CLI
+### CLI Mode
 
 It can also be run via command line either directly with `ember-mug --help` or as a module with `python -m ember_mug --help`
 There are four options with different subsections. You can see them by specifying them before help. eg `ember-mug poll --help`

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/ember_mug/__init__.py

@@ -6,4 +6,4 @@ __all__ = ("EmberMug",)
 
 __author__ = """Jesse Sopel"""
 __email__ = "jesse.sopel@gmail.com"
-__version__ = "1.1.0b1"
+__version__ = "1.2.0"

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/ember_mug/__main__.py

@@ -1,4 +1,5 @@
 """Module to run the cli interface."""
+
 from .cli import run_cli
 
 if __name__ == "__main__":

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/ember_mug/cli/__init__.py

@@ -1,4 +1,5 @@
 """CLI Interface."""
+
 import asyncio
 
 from .commands import EmberMugCli

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/ember_mug/cli/commands.py

@@ -1,4 +1,5 @@
 """CLI Interface."""
+
 from __future__ import annotations
 
 import asyncio

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/ember_mug/cli/helpers.py

@@ -1,4 +1,5 @@
 """Helpers for CLI Interface."""
+
 from __future__ import annotations
 
 import re

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/ember_mug/consts.py

@@ -1,11 +1,12 @@
 """Bluetooth UUIDs and other constants used for communicating with the mug."""
+
 from __future__ import annotations
 
 import platform
 import re
 from enum import Enum, IntEnum
 from functools import cached_property
-from typing import Literal, NamedTuple
+from typing import NamedTuple
 from uuid import UUID
 
 # Format for all the mug's Bluetooth UUIDs
@@ -68,8 +69,8 @@ class DeviceColour(str, Enum):
 class TemperatureUnit(str, Enum):
     """Temperature Units."""
 
-    CELSIUS: Literal["°C"] = "°C"
-    FAHRENHEIT: Literal["°F"] = "°F"
+    CELSIUS = "°C"
+    FAHRENHEIT = "°F"
 
 
 class MinMaxTemp(NamedTuple):
@@ -148,10 +149,10 @@ TRAVEL_MUG_SERVICE_UUIDS = (
     str(MugCharacteristic.TRAVEL_MUG_SERVICE_OTHER),
 )
 
-DEVICE_SERVICE_UUIDS = (
+DEVICE_SERVICE_UUIDS = [
     str(MugCharacteristic.STANDARD_SERVICE),
     *TRAVEL_MUG_SERVICE_UUIDS,
-)
+]
 
 
 class LiquidState(IntEnum):

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/ember_mug/data.py

@@ -1,4 +1,5 @@
 """Classes for representing data from the mug."""
+
 from __future__ import annotations
 
 from dataclasses import asdict, dataclass, field

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/ember_mug/formatting.py

@@ -1,4 +1,5 @@
 """Helpers for formatting values for display."""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/ember_mug/mug.py

@@ -1,4 +1,5 @@
 """Objects and methods related to connection to the mug."""
+
 from __future__ import annotations
 
 import asyncio
@@ -157,7 +158,7 @@ class EmberMug:
                 if self.debug is True:
                     await discover_services(client)
                 self._expected_disconnect = False
-            except (asyncio.TimeoutError, BleakError) as error:
+            except (TimeoutError, BleakError) as error:
                 logger.debug("%s: Failed to connect to the mug: %s", self.device, error)
                 raise error
             # Attempt to pair for good measure

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/ember_mug/scanner.py

@@ -1,32 +1,41 @@
 """Scanning tools for finding mugs."""
+
 from __future__ import annotations
 
 import asyncio
 import contextlib
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, cast
 
 from bleak import BleakScanner
 
 from .consts import DEVICE_SERVICE_UUIDS, IS_LINUX
 
 if TYPE_CHECKING:
+    from typing import NotRequired, TypedDict
+
     from bleak.backends.device import BLEDevice
     from bleak.backends.scanner import AdvertisementData
 
+    class ScannerKwargs(TypedDict):
+        """Optional kwargs for scanner."""
+
+        adapter: NotRequired[str]
+        service_uuids: NotRequired[list[str]]
+
 
 DEFAULT_TIMEOUT = 30
 
 logger = logging.getLogger(__name__)
 
 
-def build_scanner_kwargs(adapter: str | None = None) -> dict[str, Any]:
+def build_scanner_kwargs(adapter: str | None = None, *, service_uuids: list[str] | None = None) -> ScannerKwargs:
     """Add Adapter to kwargs for scanner if specified and using BlueZ."""
     if adapter and IS_LINUX is not True:
         msg = "The adapter option is only valid for the Linux BlueZ Backend."
         raise ValueError(msg)
-    kwargs = {"service_uuids": DEVICE_SERVICE_UUIDS}
-    return kwargs | {"adapter": adapter} if adapter else kwargs
+    kwargs = {"service_uuids": service_uuids} if service_uuids else {}
+    return cast("ScannerKwargs", kwargs | {"adapter": adapter} if adapter else kwargs)
 
 
 async def discover_devices(
@@ -44,8 +53,9 @@ async def discover_devices(
         for device, advertisement in devices:
             print(device.address, advertisement)
         ```
+
     """
-    async with BleakScanner(**build_scanner_kwargs(adapter)) as scanner:
+    async with BleakScanner(**build_scanner_kwargs(adapter, service_uuids=DEVICE_SERVICE_UUIDS)) as scanner:
         await asyncio.sleep(wait)
         return [
             (d, a)
@@ -57,7 +67,7 @@ async def discover_devices(
 async def find_device(
     mac: str | None = None,
     adapter: str | None = None,
-    timeout: int = DEFAULT_TIMEOUT,
+    timeout: int = DEFAULT_TIMEOUT,  # noqa: ASYNC109
 ) -> tuple[BLEDevice, AdvertisementData] | tuple[None, None]:
     """
     Find a device that has previously been discovered.
@@ -67,6 +77,7 @@ async def find_device(
         ```python
         device = await find_device("my:mac:addr")
         ```
+
     """
     if mac is not None:
         mac = mac.lower()

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/ember_mug/utils.py

@@ -1,4 +1,5 @@
 """Helpful utils for processing mug data."""
+
 from __future__ import annotations
 
 import base64
@@ -96,11 +97,11 @@ def get_model_from_single_int_and_services(  # noqa PLR0911
         return DeviceModel.MUG_1_10_OZ
     if model_id == 65:
         return DeviceModel.MUG_1_14_OZ
-    if model_id in (-63, -61, -62):
+    if model_id in (-51, -63, -61, -62):
         return DeviceModel.MUG_2_14_OZ
     if model_id == -60:
         return DeviceModel.CUP_6_OZ
-    if model_id in (-127, -126, -125, -124, -123, -122, -120, -117, -57, -56, -55, -53, -52, -51, 83, 131):
+    if model_id in (-127, -126, -125, -124, -123, -122, -120, -117, -57, -56, -55, -53, -52, 83, 131):
         return DeviceModel.MUG_2_10_OZ
     return None
 
@@ -133,7 +134,7 @@ def guess_model_from_name(name: str | None) -> DeviceModel | None:
 
 def get_model_info_from_advertiser_data(advertisement: AdvertisementData) -> ModelInfo:
     """Extract model info from manufacturer data in advertiser data."""
-    from ember_mug.data import ModelInfo
+    from ember_mug.data import ModelInfo  # noqa: PLC0415
 
     model_data = advertisement.manufacturer_data.get(EMBER_BLE_SIG, None)
     if model_data is not None:

{python_ember_mug-1.1.0b1 → python_ember_mug-1.2.0}/pyproject.toml

@@ -1,53 +1,47 @@
-[tool]
-
 [project]
 name = "python-ember-mug"
 readme = "README.md"
 description = "Python Library for Ember Mugs."
-authors = [
-    { name = "Jesse Sopel", email = "jesse.sopel@gmail.com" },
-]
-license =  "MIT"
+authors = [{ name = "Jesse Sopel", email = "jesse@sopelj.ca" }]
+license = "MIT"
 requires-python = ">=3.11"
 dynamic = ["version"]
-classifiers=[
+classifiers = [
     'Intended Audience :: Developers',
     'License :: OSI Approved :: MIT License',
     'Natural Language :: English',
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
 ]
 dependencies = [
     "bleak-retry-connector>=3.5.0",
-    "bleak>=0.22.2",
+    "bleak>=0.22.2; python_version < '3.13'",
+    "bleak>=0.22.3; python_version <= '3.13'",
 ]
 
 [project.optional-dependencies]
-test = [
-  "pytest>=7.2.1",
-  "pytest-cov",
-  "pytest-asyncio",
-]
+test = ["pytest>=7.2.1", "pytest-cov", "pytest-asyncio"]
 docs = [
-  "mkdocs>=1.1.21",
-  "mkdocs-include-markdown-plugin>=3.6.1,<8.0.0",
-  "mkdocs-material>=8.4.1,<10.0.0",
-  "mkdocstrings[python]",
-  "mkdocs-material-extensions",
-  "mkdocs-autorefs",
-  "mkdocs-literate-nav",
-  "mkdocs-gen-files",
-  "mkdocstrings-python",
-  "black",
-  "termynal",
+    "mkdocs>=1.6.1",
+    "mkdocs-include-markdown-plugin>=7.0.0,<8.0.0",
+    "mkdocs-material>=9.5.44,<10.0.0",
+    "mkdocs-material-extensions",
+    "mkdocstrings-python>=1.12.0",
+    "mkdocs-autorefs",
+    "mkdocs-literate-nav",
+    "mkdocs-gen-files",
+    "black",
+    "termynal",
 ]
+dev = ["ipython"]
 
 [project.urls]
+"Changelog" = "https://sopelj.github.io/python-ember-mug/changelog/"
 "Documentation" = "https://sopelj.github.io/python-ember-mug/"
 "Source code" = "https://github.com/sopelj/python-ember-mug/"
 "Bug Tracker" = "https://github.com/sopelj/python-ember-mug/issues"
-"Changelog" = "https://github.com/sopelj/python-ember-mug/blob/main/CHANGELOG.md"
 
 [project.scripts]
 ember-mug = "ember_mug.cli:run_cli"
@@ -61,12 +55,15 @@ build-backend = "hatchling.build"
 [tool.hatch.version]
 path = "ember_mug/__init__.py"
 
+[tool.hatch.build]
+exclude = ["/docs", "/tests"]
+
 [tool.hatch.build.targets.sdist]
-packages = ["ember_mug", "tests"]
+packages = ["ember_mug"]
 exclude = [".gitignore"]
 
 [tool.hatch.build.targets.wheel]
-packages = ["ember_mug", "tests"]
+packages = ["ember_mug"]
 exclude = [".gitignore"]
 
 [tool.hatch.envs.default]
@@ -76,14 +73,14 @@ python = "3.12"
 features = ["test"]
 
 [[tool.hatch.envs.test.matrix]]
-python = ["3.11", "3.12"]
+python = ["3.11", "3.12", "3.13"]
 
 [tool.hatch.envs.test.scripts]
 cov = "pytest -vvv --asyncio-mode=auto --cov=ember_mug --cov-branch --cov-report=xml --cov-report=term-missing tests"
 no-cov = "cov --no-cov"
 
 [tool.hatch.envs.docs]
-python = "3.11"
+python = "3.12"
 features = ["docs"]
 
 [tool.hatch.envs.docs.scripts]
@@ -110,21 +107,23 @@ exclude = '''
 
 [tool.coverage.report]
 exclude_lines = [
-  "pragma: no cover",
-  "def __repr__",
-  "def __str__",
-  "def main",
-  "raise AssertionError",
-  "raise NotImplementedError",
-  "if __name__ == .__main__.:",
-  "if TYPE_CHECKING:",
-  "if typing.TYPE_CHECKING:"
+    "pragma: no cover",
+    "def __repr__",
+    "def __str__",
+    "def main",
+    "raise AssertionError",
+    "raise NotImplementedError",
+    "if __name__ == .__main__.:",
+    "if TYPE_CHECKING:",
+    "if typing.TYPE_CHECKING:",
 ]
 
 [tool.ruff]
 fix = true
 line-length = 120
 target-version = "py311"
+
+[tool.ruff.lint]
 select = [
     "A",
     "ASYNC",
@@ -157,9 +156,9 @@ select = [
 ]
 ignore = ["D203", "D212", "PLR2004"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "tests/**/*.py" = [
-    "D103",  # No docstrings in tests needed
-    "S101",  # We needs asserts in tests
+    "D103",   # No docstrings in tests needed
+    "S101",   # We needs asserts in tests
     "SLF001",
 ]

python_ember_mug-1.1.0b1/tests/__init__.py

@@ -1 +0,0 @@
-"""Unit test package for python-ember-mug."""

python_ember_mug-1.1.0b1/tests/cli/__init__.py

@@ -1 +0,0 @@
-"""Tests for the CLI module."""