remove python 3.8 and 3.9

Author: vchrisb

.github/workflows/make_wheel.yml

@@ -13,15 +13,15 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Prepare python
-              uses: actions/setup-python@v5
+              uses: actions/setup-python@v6
               with:
                 python-version: '3.10'
 
             - name: Install python dependencies
               run: pip install build
 
             - name: Checkout repository
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: Build wheel
               run: python -m build 

.github/workflows/validate.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

README.md

@@ -5,7 +5,7 @@
 [![Codestyle](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Documentation Status](https://readthedocs.org/projects/python-e3dc/badge/?version=latest)](https://python-e3dc.readthedocs.io/en/latest/?badge=latest)
 
-**NOTE: With Release 0.8.0 at least Python 3.8 is required**
+**NOTE: With Release 0.10.0 at least Python 3.10 is required**
 
 Python API for querying an [E3/DC](https://e3dc.de/) systems
 

e3dc/_RSCPEncryptDecrypt.py

@@ -1,5 +1,3 @@
-from __future__ import annotations  # required for python < 3.9
-
 import math
 
 from py3rijndael import RijndaelCbc, ZeroPadding  # type: ignore

e3dc/_e3dc.py

@@ -3,15 +3,13 @@
 #
 # Copyright 2017 Francesco Santini <francesco.santini@gmail.com>
 # Licensed under a MIT license. See LICENSE for details
-from __future__ import annotations  # required for python < 3.9
-
 import datetime
 import hashlib
 import struct
 import time
 import uuid
 from calendar import monthrange
-from typing import Any, Dict, List, Literal, Tuple
+from typing import Any, Literal
 
 from ._e3dc_rscp_local import (
     E3DC_RSCP_local,
@@ -102,9 +100,9 @@ def __init__(self, connectType: int, **kwargs: Any) -> None:
         self.maxBatChargePower = None
         self.maxBatDischargePower = None
         self.startDischargeDefault = None
-        self.powermeters: List[Dict[str, Any]] = []
-        self.pvis: List[Dict[str, Any]] = []
-        self.batteries: List[Dict[str, Any]] = []
+        self.powermeters: list[dict[str, Any]] = []
+        self.pvis: list[dict[str, Any]] = []
+        self.batteries: list[dict[str, Any]] = []
         self.pmIndexExt = None
 
         if "configuration" in kwargs:
@@ -203,10 +201,10 @@ def _set_serial(self, serial: str):
 
     def sendRequest(
         self,
-        request: Tuple[str | int | RscpTag, str | int | RscpType, Any],
+        request: tuple[str | int | RscpTag, str | int | RscpType, Any],
         retries: int = 3,
         keepAlive: bool = False,
-    ) -> Tuple[str | int | RscpTag, str | int | RscpType, Any]:
+    ) -> tuple[str | int | RscpTag, str | int | RscpType, Any]:
         """This function uses the RSCP interface to make a request.
 
         Does make retries in case of exceptions like Socket.Error
@@ -362,7 +360,7 @@ def poll_switches(self, keepAlive: bool = False):
         descList = switchDesc[2]  # get the payload of the container
         statusList = switchStatus[2]
 
-        switchList: List[Dict[str, Any]] = []
+        switchList: list[dict[str, Any]] = []
 
         for switch in range(len(descList)):
             switchID = rscpFindTagIndex(descList[switch], RscpTag.HA_DATAPOINT_INDEX)
@@ -466,7 +464,7 @@ def get_idle_periods(self, keepAlive: bool = False):
         if idlePeriodsRaw[0] != RscpTag.EMS_GET_IDLE_PERIODS:
             return None
 
-        idlePeriods: Dict[str, List[Dict[str, Any]]] = {
+        idlePeriods: dict[str, list[dict[str, Any]]] = {
             "idleCharge": [] * 7,
             "idleDischarge": [] * 7,
         }
@@ -497,7 +495,7 @@ def get_idle_periods(self, keepAlive: bool = False):
         return idlePeriods
 
     def set_idle_periods(
-        self, idlePeriods: Dict[str, List[Dict[str, Any]]], keepAlive: bool = False
+        self, idlePeriods: dict[str, list[dict[str, Any]]], keepAlive: bool = False
     ):
         """Set idle periods via rscp protocol.
 
@@ -546,7 +544,7 @@ def set_idle_periods(
             True if success
             False if error
         """
-        periodList: List[Tuple[RscpTag, RscpType, Any]] = []
+        periodList: list[tuple[RscpTag, RscpType, Any]] = []
 
         if "idleCharge" not in idlePeriods and "idleDischarge" not in idlePeriods:
             raise ValueError("neither key idleCharge nor idleDischarge in object")
@@ -1185,7 +1183,7 @@ def sendWallboxRequest(
         request: RscpTag = RscpTag.WB_REQ_SET_EXTERN,
         wbIndex: int = 0,
         keepAlive: bool = False,
-    ) -> Tuple[str | int | RscpTag, str | int | RscpType, Any]:
+    ) -> tuple[str | int | RscpTag, str | int | RscpType, Any]:
         """Sends a low-level request with WB_EXTERN_DATA to the wallbox via rscp protocol locally.
 
         Args:
@@ -1294,7 +1292,7 @@ def get_batteries(self, keepAlive: bool = False):
                 ]
         """
         maxBatteries = 8
-        outObj: List[Dict[str, int]] = []
+        outObj: list[dict[str, int]] = []
         for batIndex in range(maxBatteries):
             try:
                 req = self.sendRequest(
@@ -1326,7 +1324,7 @@ def get_batteries(self, keepAlive: bool = False):
     def get_battery_data(
         self,
         batIndex: int | None = None,
-        dcbs: List[int] | None = None,
+        dcbs: list[int] | None = None,
         keepAlive: bool = False,
     ):
         """Polls the battery data via rscp protocol.
@@ -1470,7 +1468,7 @@ def get_battery_data(
         dcbCount = rscpFindTagIndex(req, RscpTag.BAT_DCB_COUNT)
         deviceStateContainer = rscpFindTag(req, RscpTag.BAT_DEVICE_STATE)
 
-        outObj: Dict[str, Any] = {
+        outObj: dict[str, Any] = {
             "asoc": rscpFindTagIndex(req, RscpTag.BAT_ASOC),
             "chargeCycles": rscpFindTagIndex(req, RscpTag.BAT_CHARGE_CYCLES),
             "current": rscpFindTagIndex(req, RscpTag.BAT_CURRENT),
@@ -1555,9 +1553,9 @@ def get_battery_data(
 
             # Initialize default values for DCB
             sensorCount = 0
-            temperatures: List[float] = []
+            temperatures: list[float] = []
             seriesCellCount = 0
-            voltages: List[float] = []
+            voltages: list[float] = []
 
             # Set temperatures, if available for the device
             temperatures_raw = rscpFindTag(req, RscpTag.BAT_DCB_ALL_CELL_TEMPERATURES)
@@ -1586,7 +1584,7 @@ def get_battery_data(
                 for cell_voltage in voltages_data:
                     voltages.append(cell_voltage[2])
 
-            dcbobj: Dict[str, Any] = {
+            dcbobj: dict[str, Any] = {
                 "current": rscpFindTagIndex(info, RscpTag.BAT_DCB_CURRENT),
                 "currentAvg30s": rscpFindTagIndex(
                     info, RscpTag.BAT_DCB_CURRENT_AVG_30S
@@ -1655,7 +1653,7 @@ def get_battery_data(
         return outObj
 
     def get_batteries_data(
-        self, batteries: List[Dict[str, Any]] | None = None, keepAlive: bool = False
+        self, batteries: list[dict[str, Any]] | None = None, keepAlive: bool = False
     ):
         """Polls the batteries data via rscp protocol.
 
@@ -1669,7 +1667,7 @@ def get_batteries_data(
         if batteries is None:
             batteries = self.batteries
 
-        outObj: List[Dict[str, Any]] = []
+        outObj: list[dict[str, Any]] = []
 
         for battery in batteries:
             if "dcbs" in battery:
@@ -1703,7 +1701,7 @@ def get_pvis(self, keepAlive: bool = False):
                 ]
         """
         maxPvis = 8
-        outObj: List[Dict[str, Any]] = []
+        outObj: list[dict[str, Any]] = []
         for pviIndex in range(maxPvis):
             req = self.sendRequest(
                 (
@@ -1743,8 +1741,8 @@ def get_pvis(self, keepAlive: bool = False):
     def get_pvi_data(
         self,
         pviIndex: int | None = None,
-        strings: List[int] | None = None,
-        phases: List[int] | None = None,
+        strings: list[int] | None = None,
+        phases: list[int] | None = None,
         keepAlive: bool = False,
     ):
         """Polls the inverter data via rscp protocol.
@@ -1861,7 +1859,7 @@ def get_pvi_data(
         frequency = rscpFindTag(req, RscpTag.PVI_FREQUENCY_UNDER_OVER)
         deviceState = rscpFindTag(req, RscpTag.PVI_DEVICE_STATE)
 
-        outObj: Dict[str, Any] = {
+        outObj: dict[str, Any] = {
             "acMaxApparentPower": rscpFindTagIndex(
                 rscpFindTag(req, RscpTag.PVI_AC_MAX_APPARENTPOWER), RscpTag.PVI_VALUE
             ),
@@ -2040,7 +2038,7 @@ def get_pvi_data(
         return outObj
 
     def get_pvis_data(
-        self, pvis: List[Dict[str, Any]] | None = None, keepAlive: bool = False
+        self, pvis: list[dict[str, Any]] | None = None, keepAlive: bool = False
     ):
         """Polls the inverters data via rscp protocol.
 
@@ -2054,7 +2052,7 @@ def get_pvis_data(
         if pvis is None:
             pvis = self.pvis
 
-        outObj: List[Dict[str, Any]] = []
+        outObj: list[dict[str, Any]] = []
 
         for pvi in pvis:
             if "strings" in pvi:
@@ -2095,7 +2093,7 @@ def get_powermeters(self, keepAlive: bool = False):
                 ]
         """
         maxPowermeters = 8
-        outObj: List[Dict[str, Any]] = []
+        outObj: list[dict[str, Any]] = []
         for pmIndex in range(
             maxPowermeters
         ):  # max 8 powermeters according to E3DC spec
@@ -2212,7 +2210,7 @@ def get_powermeter_data(self, pmIndex: int | None = None, keepAlive: bool = Fals
         return outObj
 
     def get_powermeters_data(
-        self, powermeters: List[Dict[str, Any]] | None = None, keepAlive: bool = False
+        self, powermeters: list[dict[str, Any]] | None = None, keepAlive: bool = False
     ):
         """Polls the powermeters data via rscp protocol.
 
@@ -2226,7 +2224,7 @@ def get_powermeters_data(
         if powermeters is None:
             powermeters = self.powermeters
 
-        outObj: List[Dict[str, Any]] = []
+        outObj: list[dict[str, Any]] = []
 
         for powermeter in powermeters:
             outObj.append(

e3dc/_e3dc_rscp_local.py

@@ -4,10 +4,8 @@
 # Copyright 2017 Francesco Santini <francesco.santini@gmail.com>
 # Licensed under a MIT license. See LICENSE for details
 
-from __future__ import annotations  # required for python < 3.9
-
 import socket
-from typing import Any, Tuple
+from typing import Any
 
 from ._RSCPEncryptDecrypt import RSCPEncryptDecrypt
 from ._rscpLib import rscpDecode, rscpEncode, rscpFrame
@@ -67,7 +65,7 @@ def __init__(
         self.processedData = None
 
     def _send(
-        self, plainMsg: Tuple[str | int | RscpTag, str | int | RscpType, Any]
+        self, plainMsg: tuple[str | int | RscpTag, str | int | RscpType, Any]
     ) -> None:
         sendData = rscpFrame(rscpEncode(plainMsg))
         encData = self.encdec.encrypt(sendData)
@@ -81,7 +79,7 @@ def _receive(self):
         return decData
 
     def sendCommand(
-        self, plainMsg: Tuple[str | int | RscpTag, str | int | RscpType, Any]
+        self, plainMsg: tuple[str | int | RscpTag, str | int | RscpType, Any]
     ) -> None:
         """Sending RSCP command.
 
@@ -91,8 +89,8 @@ def sendCommand(
         self.sendRequest(plainMsg)  # same as sendRequest but doesn't return a value
 
     def sendRequest(
-        self, plainMsg: Tuple[str | int | RscpTag, str | int | RscpType, Any]
-    ) -> Tuple[str | int | RscpTag, str | int | RscpType, Any]:
+        self, plainMsg: tuple[str | int | RscpTag, str | int | RscpType, Any]
+    ) -> tuple[str | int | RscpTag, str | int | RscpType, Any]:
         """Sending RSCP request.
 
         Args: