Replace pipenv with uv (#509)

* replace pipenv with uv
* clean up
* drop python 3.10 support

.github/workflows/publish-to-pypi.yml

@@ -13,22 +13,17 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/[email protected]
         with:
-          python-version: 3.10.8
+          python-version: 3.11.4
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install setuptools wheel build
       - name: Build a binary wheel and a source tarball
         run: >-
           python -m build .
-      #      - name: Publish 📦 to Test PyPI
-      #        uses: pypa/gh-action-pypi-publish@master
-      #        with:
-      #          password: ${{ secrets.PYPI_TEST_TOKEN }}
-      #          repository-url: https://test.pypi.org/legacy/
       - name: Publish 📦 to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:

.github/workflows/publish-to-test-pypi.yml

@@ -14,10 +14,10 @@ jobs:
         with:
           ref: development
           fetch-depth: 0
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/[email protected]
         with:
-          python-version: 3.10.8
+          python-version: 3.11.4
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.github/workflows/pythonpackage.yml

@@ -60,7 +60,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.10.8, 3.11.4]
+        python-version: [3.11.4, 3.12.5]
 
     steps:
       - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ exclude: ^(fixtures/)
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.1
+    rev: v0.6.4
     hooks:
       - id: ruff
         args:
@@ -18,7 +18,7 @@ repos:
         language_version: python3
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.11.1
+    rev: v1.11.2
     hooks:
       - id: mypy
         name: mypy

CHANGELOG.md

@@ -13,11 +13,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
--
+- Replaced pipenv with uv and updated readme
 
 ### Deprecated
 
--
+- Python 3.10 support
 
 ### Removed
 
@@ -29,7 +29,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
-
 ## [8.1.0]
 
 ### Added

README.md

@@ -35,15 +35,16 @@ Be aware that the module may stop working if Netatmo decides to change their API
 
 ## Development
 
-Clone the repo and install dependencies:
+Prerequisits:
 
-    git clone
-    cd pyatmo
-    pipenv install --dev
+    uv
+    python >=3.11
 
-To add the pre-commit hook to your environment run:
+Clone the repo, install dependencies and install pre-commit hooks:
 
-    pip install pre-commit
+    git clone
+    cd pyatmo
+    uv sync
     pre-commit install
 
 ## Testing

pyproject.toml

@@ -2,12 +2,80 @@
 requires = ["wheel", "setuptools", "attrs>=17.1"]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "pyatmo"
+description = "Simple API to access Netatmo weather station data from any Python 3 script. Designed for Home Assistant (but not only)"
+dynamic = ["version"]
+readme = "README.md"
+authors = [{ name = "Hugo Dupras", email = "[email protected]" }]
+maintainers = [{ name = "Tobias Sauerwein", email = "[email protected]" }]
+requires-python = ">=3.11,<3.13"
+dependencies = [
+    "aiohttp>=3.7.4,<4.0.0",
+    "oauthlib~=3.1",
+    "requests~=2.24",
+    "requests-oauthlib>=1.3,<3.0",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Topic :: Home Automation",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+]
+
+[project.urls]
+Homepage = "https://github.com/jabesq-org/pyatmo"
+Repository = "https://github.com/jabesq-org/pyatmo.git"
+Issues = "https://github.com/jabesq-org/pyatmo/issues"
+Changelog = "https://github.com/jabesq-org/pyatmo/blob/development/CHANGELOG.md"
+
+[tool.uv]
+dev-dependencies = [
+    "black==24.8.0",
+    "pre-commit==3.8.0",
+    "ruff==0.6.4",
+    "codespell==2.3.0",
+    "pytest==8.3.3",
+    "pytest-asyncio==0.24.0",
+    "pytest-cov==5.0.0",
+    "docutils==0.21.2",
+    "time-machine==2.15.0",
+    "mypy==1.11.2",
+    "pytest-mock==3.14.0",
+    "requests-mock==1.12.1",
+    "tox==4.18.1",
+    "twine==5.1.1",
+]
+
+[tool.setuptools_scm]
+local_scheme = "no-local-version"
+tag_regex = "^(?P<prefix>v)?(?P<version>[^\\+]+)(?P<suffix>.*)?$"
+write_to = "src/pyatmo/__version__.py"
+write_to_template = '''"""
+Pyatmo: Simple API to access Netatmo devices and data
+
+DO NO EDIT THIS FILE - VERSION IS MANAGED BY SETUPTOOLS_SCM
+"""
+__version__ = "{version}"
+'''
+
 [tool.pytest.ini_options]
-minversion = "7.0"
+minversion = "8.0"
 asyncio_mode = "auto"
 
+[tool.mypy]
+ignore_missing_imports = true
+
 [tool.ruff]
-target-version = "py310"
+target-version = "py311"
+fix = true
+line-length = 88
 
 [tool.ruff.lint]
 select = [
@@ -113,15 +181,3 @@ split-on-trailing-comma = false
 
 [tool.ruff.lint.mccabe]
 max-complexity = 25
-
-[tool.setuptools_scm]
-local_scheme = "no-local-version"
-tag_regex = "^(?P<prefix>v)?(?P<version>[^\\+]+)(?P<suffix>.*)?$"
-write_to = "src/pyatmo/__version__.py"
-write_to_template = '''"""
-Pyatmo: Simple API to access Netatmo devices and data
-
-DO NO EDIT THIS FILE - VERSION IS MANAGED BY SETUPTOOLS_SCM
-"""
-__version__ = "{version}"
-'''

src/pyatmo/home.py

@@ -348,22 +348,23 @@ async def async_set_schedule_temperatures(
         ]
 
         for zone in selected_schedule.zones:
+            rooms = []
             new_zone = {
                 "id": zone.entity_id,
                 "name": zone.name,
                 "type": zone.type,
-                "rooms": [],
             }
 
             for room in zone.rooms:
                 temp = room.therm_setpoint_temperature
                 if zone.entity_id == zone_id and room.entity_id in temps:
                     temp = temps[room.entity_id]
 
-                new_zone["rooms"].append(
+                rooms.append(
                     {"id": room.entity_id, "therm_setpoint_temperature": temp},
                 )
 
+            new_zone["rooms"] = rooms
             zones.append(new_zone)
 
         schedule = {

src/pyatmo/modules/base_class.py

@@ -56,8 +56,8 @@ class EntityBase:
     home: Home
     bridge: str | None
     history_features: set[str]
-    history_features_values: dict[str, [int, int]] | {}
-    name: str | None
+    history_features_values: dict
+    name: str
 
 
 class NetatmoBase(EntityBase, ABC):
@@ -110,12 +110,9 @@ def add_history_data(self, feature: str, value, time: int) -> None:
         else:
             i = bisect.bisect_left(hist_f, time, key=itemgetter(0))
 
-            if i < len(hist_f):
-                if hist_f[i][0] == time:
-                    hist_f[i] = (time, value, self.entity_id)
-                    i = None
-
-            if i is not None:
+            if i < len(hist_f) and hist_f[i][0] == time:
+                hist_f[i] = (time, value, self.entity_id)
+            else:
                 hist_f.insert(i, (time, value, self.entity_id))
 
         # keep timing history to a maximum representative time