Merge branch 'main' into ruff

Author: mdz

.flake8

@@ -1,3 +1,3 @@
 [flake8]
-ignore = E501,E252
+ignore = E501,E252,W503
 exclude = venv,.tox

.github/workflows/ci.yaml

@@ -9,22 +9,22 @@ jobs:
   build:
     strategy:
       matrix:
-        python-version: [3.9, 3.11, 3.12]
+        python-version: [3.13, 3.14]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -r requirements_tests.txt
-          pip install flake8
+      - name: Install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - name: Add uv to PATH
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+      - name: Install all dependencies
+        run: uv sync --extra dev
       - name: Lint with flake8
-        run: flake8 --show-source --statistics
+        run: uv run flake8 smarttub tests --show-source --statistics
       - name: Test with pytest
-        run: pytest --cov-fail-under=100 --cov-report=term-missing
+        run: uv run pytest --cov-fail-under=100 --cov-report=term-missing

.github/workflows/release.yaml

@@ -8,19 +8,19 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
         with:
-          python-version: "3.x"
+          fetch-depth: 0  # Need full history for version from git tags
+      - name: Install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - name: Add uv to PATH
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install setuptools wheel twine
+        run: uv sync --extra dev
       - name: Build and publish
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
-          python setup.py sdist bdist_wheel
-          twine upload --repository pypi dist/*
+          uv build
+          uv run twine upload --repository pypi dist/*

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.3.0
+  rev: v5.0.0
   hooks:
   -   id: end-of-file-fixer
   -   id: trailing-whitespace
@@ -19,7 +19,7 @@ repos:
   hooks:
     - id: pytest
       name: pytest
-      entry: pytest
+      entry: "uv run pytest"
       language: system
       pass_filenames: false
       always_run: true

README.md

@@ -43,5 +43,6 @@ python3 -m smarttub -u YOUR_SMARTTUB_EMAIL -p YOUR_SMARTTUB_PASSWORD -vv info -a
 
 ## Contributing
 ```bash
-pip install pre-commit && pre-commit install
+uv sync --extra dev
+uv run pre-commit install
 ```

pyproject.toml

@@ -0,0 +1,40 @@
+[project]
+name = "python-smarttub"
+dynamic = ["version"]
+description = "API to query and control hot tubs using the SmartTub system"
+readme = "README.md"
+license = {text = "MIT"}
+requires-python = ">=3.13"
+dependencies = [
+    "aiohttp>=3.9.1",
+    "inflection~=0.5.1",
+    "pyjwt>=2.10.0",
+    "python-dateutil>=2.8.1"
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest",
+    "pytest-asyncio",
+    "pytest-cov",
+    "aresponses",
+    "pre-commit",
+    "black",
+    "flake8",
+    "twine"
+]
+
+[build-system]
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+python_files = ["test_*.py"]
+asyncio_mode = "auto"
+
+[tool.hatch.build.targets.wheel]
+packages = ["smarttub"]

pytest.ini

@@ -1,2 +1,4 @@
 [pytest]
 asyncio_mode = auto
+markers =
+    integration: mark a test as an integration test.

requirements.txt

@@ -1,5 +1,4 @@
-aiohttp~=3.9.0b0;python_version>='3.12'
-aiohttp~=3.8.0;python_version<'3.12'
+aiohttp>=3.9.1,<3.14.0
 inflection~=0.5.1
-pyjwt~=2.8.0
+pyjwt>=2.8,<2.13
 python-dateutil~=2.8.1

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="python-smarttub",
-    version="0.0.36",
+    version="0.0.39",
     author="Matt Zimmerman",
     author_email="mdz@alcor.net",
     description="API to query and control hot tubs using the SmartTub system",

smarttub/__main__.py

@@ -14,7 +14,7 @@ async def info_command(spas, args):
     for spa in spas:
         print(f"= Spa '{spa.name}' =\n")
         if args.all or args.status or args.location or args.locks:
-            status = await spa.get_status()
+            status = await spa.get_status_full()
 
         if args.all or args.status:
             print("== Status ==")
@@ -32,13 +32,13 @@ async def info_command(spas, args):
 
         if args.all or args.pumps:
             print("== Pumps ==")
-            for pump in await spa.get_pumps():
+            for pump in status.pumps:
                 print(pump)
             print()
 
         if args.all or args.lights:
             print("== Lights ==")
-            for light in await spa.get_lights():
+            for light in status.lights:
                 print(light)
             print()
 
@@ -70,6 +70,12 @@ async def info_command(spas, args):
             pprint(await energy_usage_day)
             print()
 
+        if args.all or args.sensors:
+            print("== Sensors ==")
+            for sensor in status.sensors:
+                print(sensor)
+            print()
+
         if args.all or args.debug:
             debug_status = await spa.get_debug_status()
             print("== Debug status ==")
@@ -152,6 +158,7 @@ async def main(argv):
     info_parser.add_argument("--reminders", action="store_true")
     info_parser.add_argument("--locks", action="store_true")
     info_parser.add_argument("--debug", action="store_true")
+    info_parser.add_argument("--sensors", action="store_true")
     info_parser.add_argument("--energy", action="store_true")
 
     set_parser = subparsers.add_parser("set", help="Change settings on the spa")