Merge pull request #783 from powerapi-ng/build/python-312

build: Bump Python minimal version to `3.12`

Author: gfieni

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.x"]
+        python-version: ["3.12", "3.x"]
 
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.ruff.toml

@@ -1,4 +1,4 @@
-target-version = "py310"  # should match minimal python version of PowerAPI
+target-version = "py312"  # should match minimal python version of PowerAPI
 
 [lint]
 select = [

pyproject.toml

@@ -8,19 +8,20 @@ description = "PowerAPI is a middleware toolkit for building software-defined po
 readme = "README.md"
 keywords = ["powerapi", "energy", "power-meter", "green-computing"]
 license = {text = "BSD-3-Clause"}
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 version = "2.10.0"
 
 classifiers = [
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Science/Research",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
-    "License :: OSI Approved :: BSD License",
-    "Intended Audience :: Science/Research",
-    "Intended Audience :: Developers",
-    "Development Status :: 5 - Production/Stable",
+    "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Software Development :: Libraries :: Python Modules"
 ]
 
@@ -73,5 +74,5 @@ dev = [
 
 [project.urls]
 homepage = "https://powerapi.org"
-documentation = "https://powerapi.readthedocs.org"
-repository = "https://github.com/powerapi-ng/powerapi"
+source = "https://github.com/powerapi-ng/powerapi"
+tracker = "https://github.com/powerapi-ng/powerapi/issues"

src/powerapi/database/codec.py

@@ -27,7 +27,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from typing import TypeVar, Generic, Protocol
+from typing import TypeVar, Protocol
 
 from powerapi.report import Report
 
@@ -62,20 +62,18 @@ class ReportDecoder(Protocol[_EncodedDataType, _ReportType]):
     def decode(data: _EncodedDataType, opts: CodecOptions | None = None) -> _ReportType: ...
 
 
-_CodecType = TypeVar('_CodecType', ReportEncoder, ReportDecoder)
-
-class _Registry(Generic[_CodecType]):
+class _Registry[CodecType: (ReportEncoder, ReportDecoder)]:
     """
     Generic codecs registry class.
     """
-    _registry: dict[type[Report], _CodecType]
+    _registry: dict[type[Report], CodecType]
 
     def __init_subclass__(cls):
         super().__init_subclass__()
         cls._registry = {}  # Ensure each subclass has its own independent registry.
 
     @classmethod
-    def register(cls, report_type: type[Report], codec: _CodecType) -> None:
+    def register(cls, report_type: type[Report], codec: CodecType) -> None:
         """
         Register a report type with its corresponding codec.
         :param report_type: Report type to register
@@ -84,7 +82,7 @@ def register(cls, report_type: type[Report], codec: _CodecType) -> None:
         cls._registry[report_type] = codec
 
     @classmethod
-    def get(cls, report_type: type[Report]) -> _CodecType:
+    def get(cls, report_type: type[Report]) -> CodecType:
         """
         Get the codec corresponding to the given report type.
         :param report_type: Report type

src/powerapi/database/csv/codecs.py

@@ -27,7 +27,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from datetime import datetime, timezone
+from datetime import datetime, UTC
 
 from powerapi.database.codec import CodecOptions, ReportEncoder, ReportEncoderRegistry, ReportDecoder, ReportDecoderRegistry
 from powerapi.report import PowerReport, FormulaReport, HWPCReport
@@ -81,7 +81,7 @@ def decode(data: _SourcedCsvRowsType, opts: CodecOptions | None = None) -> HWPCR
         groups = {}
         for group_name, rows in data.items():
             first_row = next(iter(rows))
-            timestamp = datetime.fromtimestamp(int(first_row['timestamp']) / 1000, tz=timezone.utc)
+            timestamp = datetime.fromtimestamp(int(first_row['timestamp']) / 1000, tz=UTC)
             sensor = first_row['sensor']
             target = first_row['target']
             group = groups.setdefault(group_name, {})

src/powerapi/database/opentsdb/codecs.py

@@ -27,7 +27,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from datetime import timezone
+from datetime import UTC
 
 from powerapi.database.codec import CodecOptions, ReportEncoder, ReportEncoderRegistry
 from powerapi.report import PowerReport
@@ -40,7 +40,7 @@ class PowerReportEncoder(ReportEncoder[PowerReport, tuple[float, dict]]):
 
     @staticmethod
     def encode(report: PowerReport, opts: CodecOptions | None = None) -> tuple[float, dict]:
-        timestamp = int(report.timestamp.replace(tzinfo=timezone.utc).timestamp())
+        timestamp = int(report.timestamp.replace(tzinfo=UTC).timestamp())
         tags = {'timestamp': timestamp, 'host': report.sensor, 'target': report.target}
         return report.power, tags
 

src/powerapi/database/socket/codecs.py

@@ -27,7 +27,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from datetime import datetime, timezone
+from datetime import datetime, UTC
 
 from powerapi.database.codec import CodecOptions, ReportDecoder, ReportDecoderRegistry
 from powerapi.report import HWPCReport
@@ -40,7 +40,7 @@ class HWPCReportDecoder(ReportDecoder[dict, HWPCReport]):
 
     @staticmethod
     def decode(data: dict, opts: CodecOptions | None = None) -> HWPCReport:
-        timestamp = datetime.fromtimestamp(data['timestamp'] / 1000, tz=timezone.utc)  # Unix timestamp in milliseconds
+        timestamp = datetime.fromtimestamp(data['timestamp'] / 1000, tz=UTC)  # Unix timestamp in milliseconds
         return HWPCReport(timestamp, data['sensor'], data['target'], data['groups'], data.get('metadata', {}))
 
 

tests/unit/database/test_csv.py

@@ -27,7 +27,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from datetime import datetime, timezone
+from datetime import datetime, UTC
 
 from powerapi.database.csv.codecs import HWPCReportDecoder
 from powerapi.report import HWPCReport
@@ -42,7 +42,7 @@ def test_decode_valid_csv_lines_with_one_events_group(self):
         """
         Test to decode valid CSV lines with one events group.
         """
-        ts = int(datetime.now(timezone.utc).timestamp() * 1000)  # milliseconds
+        ts = int(datetime.now(tz=UTC).timestamp() * 1000)  # milliseconds
         lines = {'testg': [
             {'timestamp': ts, 'sensor': 'pytest', 'target': 'example', 'socket': '0', 'cpu': '0', 'event1': 1, 'event2': 1},
             {'timestamp': ts, 'sensor': 'pytest', 'target': 'example', 'socket': '0', 'cpu': '1', 'event1': 2, 'event2': 2},
@@ -53,7 +53,7 @@ def test_decode_valid_csv_lines_with_one_events_group(self):
         report = HWPCReportDecoder().decode(lines)
 
         assert isinstance(report, HWPCReport)
-        assert report.timestamp == datetime.fromtimestamp(ts / 1000, timezone.utc)
+        assert report.timestamp == datetime.fromtimestamp(ts / 1000, tz=UTC)
         assert report.sensor == 'pytest'
         assert report.target == 'example'
         assert report.metadata == {}
@@ -70,7 +70,7 @@ def test_decode_valid_csv_lines_with_multiple_events_groups(self):
         """
         Test to decode valid CSV lines with multiple events groups.
         """
-        ts = int(datetime.now(timezone.utc).timestamp() * 1000)  # milliseconds
+        ts = int(datetime.now(tz=UTC).timestamp() * 1000)  # milliseconds
         lines = {
             'testg1': [
                 {'timestamp': ts, 'sensor': 'pytest', 'target': 'example', 'socket': '0', 'cpu': '0', 'event1': 1, 'event2': 1},
@@ -85,7 +85,7 @@ def test_decode_valid_csv_lines_with_multiple_events_groups(self):
         report = HWPCReportDecoder().decode(lines)
 
         assert isinstance(report, HWPCReport)
-        assert report.timestamp == datetime.fromtimestamp(ts / 1000, timezone.utc)
+        assert report.timestamp == datetime.fromtimestamp(ts / 1000, tz=UTC)
         assert report.sensor == 'pytest'
         assert report.target == 'example'
         assert report.metadata == {}

tests/utils/db/db.py

@@ -29,7 +29,7 @@
 
 from collections.abc import Iterable
 from contextlib import contextmanager
-from datetime import datetime, timezone
+from datetime import datetime, UTC
 from multiprocessing import Manager
 from uuid import uuid4
 
@@ -44,7 +44,7 @@ def make_report(sensor: str = 'pytest', target: str | None = None) -> Report:
     :param target: Target name, random UUID4 if None
     :return: Initialized report
     """
-    timestamp = datetime.now(timezone.utc)
+    timestamp = datetime.now(tz=UTC)
     target_name = target if target is not None else str(uuid4())
     return Report(timestamp, sensor, target_name)