Remove annotations from __future__ when not needed

daniel-zullo-frequenz · daniel-zullo-frequenz · commit 0b02c56a1d2a · 2023-09-06T15:59:50.000+02:00
Most of the annotations from __future__ are no longer needed,
except for the cases where there are circular dependencies,
forward references, or when the type hint is used inside the
class itself.

Signed-off-by: Daniel Zullo &lt;daniel.zullo@frequenz.com&gt;
diff --git a/benchmarks/timeseries/periodic_feature_extractor.py b/benchmarks/timeseries/periodic_feature_extractor.py
@@ -9,7 +9,6 @@
 implementation.
 """
 
-from __future__ import annotations
 
 import asyncio
 import collections.abc
diff --git a/benchmarks/timeseries/ringbuffer_memusage.py b/benchmarks/timeseries/ringbuffer_memusage.py
@@ -3,7 +3,6 @@
 
 """Memory allocation benchmark for the ringbuffer."""
 
-from __future__ import annotations
 
 import argparse
 import tracemalloc
diff --git a/benchmarks/timeseries/ringbuffer_serialization.py b/benchmarks/timeseries/ringbuffer_serialization.py
@@ -3,7 +3,6 @@
 
 """Benchmarks the serialization of the `OrderedRingBuffer` class."""
 
-from __future__ import annotations
 
 import fnmatch
 import os
diff --git a/examples/battery_pool.py b/examples/battery_pool.py
@@ -3,7 +3,6 @@
 
 """Script with an example how to use BatteryPool."""
 
-from __future__ import annotations
 
 import asyncio
 import logging
diff --git a/src/frequenz/sdk/_internal/_asyncio.py b/src/frequenz/sdk/_internal/_asyncio.py
@@ -3,7 +3,6 @@
 
 """General purpose async tools."""
 
-from __future__ import annotations
 
 import asyncio
 from abc import ABC
diff --git a/src/frequenz/sdk/actor/_resampling.py b/src/frequenz/sdk/actor/_resampling.py
@@ -3,7 +3,6 @@
 
 """An actor to resample microgrid component metrics."""
 
-from __future__ import annotations
 
 import asyncio
 import dataclasses
diff --git a/src/frequenz/sdk/actor/power_distributing/_battery_pool_status.py b/src/frequenz/sdk/actor/power_distributing/_battery_pool_status.py
@@ -2,7 +2,6 @@
 # Copyright © 2022 Frequenz Energy-as-a-Service GmbH
 """Class that stores pool of batteries and manage them."""
 
-from __future__ import annotations
 
 import asyncio
 import logging
diff --git a/src/frequenz/sdk/actor/power_distributing/_battery_status.py b/src/frequenz/sdk/actor/power_distributing/_battery_status.py
@@ -2,7 +2,6 @@
 # Copyright © 2022 Frequenz Energy-as-a-Service GmbH
 """Class to return battery status."""
 
-from __future__ import annotations
 
 import asyncio
 import logging
diff --git a/src/frequenz/sdk/actor/power_distributing/power_distributing.py b/src/frequenz/sdk/actor/power_distributing/power_distributing.py
@@ -11,7 +11,6 @@
 Purpose of this actor is to keep SoC level of each component at the equal level.
 """
 
-from __future__ import annotations
 
 import asyncio
 import logging
diff --git a/src/frequenz/sdk/actor/power_distributing/request.py b/src/frequenz/sdk/actor/power_distributing/request.py
@@ -2,7 +2,6 @@
 # Copyright © 2022 Frequenz Energy-as-a-Service GmbH
 """Definition of the user request."""
 
-from __future__ import annotations
 
 import dataclasses
 from collections import abc
diff --git a/src/frequenz/sdk/actor/power_distributing/result.py b/src/frequenz/sdk/actor/power_distributing/result.py
@@ -3,7 +3,6 @@
 
 """Results from PowerDistributingActor."""
 
-from __future__ import annotations
 
 import dataclasses
 
diff --git a/src/frequenz/sdk/microgrid/component/_component.py b/src/frequenz/sdk/microgrid/component/_component.py
@@ -3,8 +3,6 @@
 
 """Defines the components that can be used in a microgrid."""
 
-from __future__ import annotations
-
 from dataclasses import dataclass
 from enum import Enum
 
diff --git a/src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_chp_power_formula.py b/src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_chp_power_formula.py
@@ -3,7 +3,6 @@
 
 """Formula generator from component graph for CHP Power."""
 
-from __future__ import annotations
 
 import logging
 from collections import abc
diff --git a/src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_ev_charger_current_formula.py b/src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_ev_charger_current_formula.py
@@ -3,7 +3,6 @@
 
 """Formula generator from component graph for 3-phase Grid Current."""
 
-from __future__ import annotations
 
 import logging
 from collections import abc
diff --git a/src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_formula_generator.py b/src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_formula_generator.py
@@ -3,7 +3,6 @@
 
 """Base class for formula generators that use the component graphs."""
 
-from __future__ import annotations
 
 import sys
 from abc import ABC, abstractmethod
diff --git a/src/frequenz/sdk/timeseries/_formula_engine/_resampled_formula_builder.py b/src/frequenz/sdk/timeseries/_formula_engine/_resampled_formula_builder.py
@@ -4,8 +4,6 @@
 """A builder for creating formula engines that operate on resampled component metrics."""
 
 
-from __future__ import annotations
-
 from collections.abc import Callable
 from typing import Generic
 
diff --git a/src/frequenz/sdk/timeseries/_moving_window.py b/src/frequenz/sdk/timeseries/_moving_window.py
@@ -3,7 +3,6 @@
 
 """A data window that moves with the latest datapoints of a data stream."""
 
-from __future__ import annotations
 
 import asyncio
 import logging
diff --git a/src/frequenz/sdk/timeseries/_periodic_feature_extractor.py b/src/frequenz/sdk/timeseries/_periodic_feature_extractor.py
@@ -12,7 +12,6 @@
 modulo a fixed period.
 """
 
-from __future__ import annotations
 
 import logging
 from dataclasses import dataclass
diff --git a/src/frequenz/sdk/timeseries/_ringbuffer/buffer.py b/src/frequenz/sdk/timeseries/_ringbuffer/buffer.py
@@ -3,7 +3,6 @@
 
 """Ringbuffer implementation with focus on time & memory efficiency."""
 
-from __future__ import annotations
 
 from collections.abc import Iterable
 from copy import deepcopy
diff --git a/src/frequenz/sdk/timeseries/_ringbuffer/serialization.py b/src/frequenz/sdk/timeseries/_ringbuffer/serialization.py
@@ -4,7 +4,7 @@
 """Ringbuffer dumping & loading functions."""
 
 # For use of the class type hint inside the class itself.
-from __future__ import annotations
+
 
 import pickle
 from os.path import exists
diff --git a/src/frequenz/sdk/timeseries/battery_pool/_component_metrics.py b/src/frequenz/sdk/timeseries/battery_pool/_component_metrics.py
@@ -3,7 +3,6 @@
 
 """Class that stores values of the component metrics."""
 
-from __future__ import annotations
 
 from collections.abc import Mapping
 from datetime import datetime
diff --git a/src/frequenz/sdk/timeseries/battery_pool/_methods.py b/src/frequenz/sdk/timeseries/battery_pool/_methods.py
@@ -2,7 +2,7 @@
 # Copyright © 2023 Frequenz Energy-as-a-Service GmbH
 
 """Methods for processing battery-inverter data."""
-from __future__ import annotations
+
 
 import asyncio
 import logging
diff --git a/src/frequenz/sdk/timeseries/battery_pool/_metric_calculator.py b/src/frequenz/sdk/timeseries/battery_pool/_metric_calculator.py
@@ -2,7 +2,7 @@
 # Copyright © 2023 Frequenz Energy-as-a-Service GmbH
 
 """Module that defines how to aggregate metrics from battery-inverter components."""
-from __future__ import annotations
+
 
 import logging
 from abc import ABC, abstractmethod
diff --git a/src/frequenz/sdk/timeseries/battery_pool/battery_pool.py b/src/frequenz/sdk/timeseries/battery_pool/battery_pool.py
@@ -3,7 +3,6 @@
 
 """User interface for requesting aggregated battery-inverter data."""
 
-from __future__ import annotations
 
 import asyncio
 import uuid
diff --git a/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool.py b/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool.py
@@ -3,7 +3,6 @@
 
 """Interactions with pools of EV Chargers."""
 
-from __future__ import annotations
 
 import asyncio
 import logging
diff --git a/src/frequenz/sdk/timeseries/logical_meter/_logical_meter.py b/src/frequenz/sdk/timeseries/logical_meter/_logical_meter.py
@@ -3,7 +3,6 @@
 
 """A logical meter for calculating high level metrics for a microgrid."""
 
-from __future__ import annotations
 
 import uuid
 
diff --git a/tests/actor/power_distributing/test_power_distributing.py b/tests/actor/power_distributing/test_power_distributing.py
@@ -3,7 +3,6 @@
 
 """Tests power distributor."""
 
-from __future__ import annotations
 
 import asyncio
 import math
diff --git a/tests/timeseries/_battery_pool/test_battery_pool.py b/tests/timeseries/_battery_pool/test_battery_pool.py
@@ -5,7 +5,6 @@
 
 # pylint: disable=too-many-lines
 
-from __future__ import annotations
 
 import asyncio
 import dataclasses
diff --git a/tests/timeseries/_formula_engine/utils.py b/tests/timeseries/_formula_engine/utils.py
@@ -3,7 +3,6 @@
 
 """Utils for testing formula engines."""
 
-from __future__ import annotations
 
 from collections.abc import Callable
 from math import isclose
diff --git a/tests/timeseries/mock_microgrid.py b/tests/timeseries/mock_microgrid.py
@@ -3,7 +3,6 @@
 
 """A configurable mock microgrid for testing logical meter formulas."""
 
-from __future__ import annotations
 
 import asyncio
 import typing
diff --git a/tests/timeseries/mock_resampler.py b/tests/timeseries/mock_resampler.py
@@ -3,7 +3,6 @@
 
 """Mock data_pipeline."""
 
-from __future__ import annotations
 
 import asyncio
 from datetime import datetime
diff --git a/tests/timeseries/test_ev_charger_pool.py b/tests/timeseries/test_ev_charger_pool.py
@@ -3,7 +3,6 @@
 
 """Tests for the `EVChargerPool`."""
 
-from __future__ import annotations
 
 import asyncio
 
diff --git a/tests/timeseries/test_logical_meter.py b/tests/timeseries/test_logical_meter.py
@@ -3,7 +3,6 @@
 
 """Tests for the logical meter."""
 
-from __future__ import annotations
 
 import asyncio
 from datetime import datetime, timezone
diff --git a/tests/timeseries/test_resampling.py b/tests/timeseries/test_resampling.py
@@ -3,7 +3,6 @@
 
 """Tests for the `TimeSeriesResampler` class."""
 
-from __future__ import annotations
 
 import asyncio
 import logging
diff --git a/tests/timeseries/test_ringbuffer.py b/tests/timeseries/test_ringbuffer.py
@@ -3,7 +3,6 @@
 
 """Tests for the `OrderedRingbuffer` class."""
 
-from __future__ import annotations
 
 import random
 from datetime import datetime, timedelta, timezone
diff --git a/tests/timeseries/test_ringbuffer_serialization.py b/tests/timeseries/test_ringbuffer_serialization.py
@@ -3,7 +3,6 @@
 
 """Tests for the `SerializableRingBuffer` class."""
 
-from __future__ import annotations
 
 import random
 from datetime import datetime, timedelta, timezone
diff --git a/tests/utils/_a_sequence.py b/tests/utils/_a_sequence.py
@@ -3,7 +3,6 @@
 
 """Helper class to compare two sequences without caring about the underlying type."""
 
-from __future__ import annotations
 
 from collections.abc import Sequence
 from typing import Any
diff --git a/tests/utils/component_data_streamer.py b/tests/utils/component_data_streamer.py
@@ -2,7 +2,7 @@
 # Copyright © 2023 Frequenz Energy-as-a-Service GmbH
 
 """Tool for mocking streams of component data."""
-from __future__ import annotations
+
 
 import asyncio
 from dataclasses import replace
diff --git a/tests/utils/component_graph_utils.py b/tests/utils/component_graph_utils.py
@@ -2,7 +2,7 @@
 # Copyright © 2023 Frequenz Energy-as-a-Service GmbH
 
 """Utils for tests that uses component graph."""
-from __future__ import annotations
+
 
 from dataclasses import dataclass
 
