Removed all deprecated items

Author: FBumann

CHANGELOG.md

@@ -51,7 +51,7 @@ If upgrading from v2.x, see the [v3.0.0 release notes](https://github.com/flixOp
 
 ## [Unreleased] - ????-??-??
 
-**Summary**: Renamed OnOff terminology to Status terminology for better alignment with PyPSA and unit commitment standards.
+**Summary**: Renamed OnOff terminology to Status terminology for better alignment with PyPSA and unit commitment standards. **All deprecated items from v4.x have been removed.**
 
 ### ✨ Added
 
@@ -127,6 +127,44 @@ A partial backwards compatibility wrapper would be misleading, so we opted for a
 
 ### 🔥 Removed
 
+**Modules removed:**
+- `calculation.py` module - Use `optimization.py` instead
+
+**Classes removed:**
+- `Calculation`, `FullCalculation` → Use `Optimization`
+- `AggregatedCalculation` → Use `ClusteredOptimization`
+- `SegmentedCalculation` → Use `SegmentedOptimization`
+- `Aggregation` → Use `Clustering`
+- `AggregationParameters` → Use `ClusteringParameters`
+- `AggregationModel` → Use `ClusteringModel`
+- `CalculationResults` → Use `Results`
+- `SegmentedCalculationResults` → Use `SegmentedResults`
+
+**Functions removed:**
+- `change_logging_level()` → Use `CONFIG.Logging.enable_console()`
+
+**Methods removed:**
+- `Optimization._perform_aggregation()` → Use `_perform_clustering()`
+- `Optimization.calculate_aggregation_weights()` → Use `calculate_clustering_weights()`
+
+**Parameters removed:**
+- `Optimization.active_timesteps` → Use `flow_system.sel(time=...)` or `flow_system.isel(time=...)`
+- `TimeSeriesData.from_dataarray()`: `aggregation_group` → Use `clustering_group`
+- `TimeSeriesData.from_dataarray()`: `aggregation_weight` → Use `clustering_weight`
+- `FlowSystem.weights` → Use `scenario_weights`
+- `Results.__init__()`: `flow_system` → Use `flow_system_data`
+- `Results` plotting methods: `indexer` → Use `select`
+- `Results.plot_heatmap()`: `heatmap_timeframes`, `heatmap_timesteps_per_frame` → Use `reshape_time`
+- `Results.plot_heatmap()`: `color_map` → Use `colors`
+
+**Properties removed:**
+- `FlowSystem.all_elements` → Use dict-like interface (`flow_system['label']`, `.keys()`, `.values()`, `.items()`)
+- `FlowSystem.weights` → Use `scenario_weights`
+
+**Features removed:**
+- Passing `Bus` objects directly to `Flow` → Pass bus label string instead and add Bus to FlowSystem
+- Using `Effect` objects in `EffectValues` → Use effect label strings instead
+
 **Deprecated parameters removed** (all were deprecated in v4.0.0 or earlier):
 
 **TimeSeriesData:**

flixopt/__init__.py

@@ -14,10 +14,7 @@
 
 # Import commonly used classes and functions
 from . import linear_converters, plotting, results, solvers
-
-# Import old Calculation classes for backwards compatibility (deprecated)
-from .calculation import AggregatedCalculation, FullCalculation, SegmentedCalculation
-from .clustering import AggregationParameters, ClusteringParameters  # AggregationParameters is deprecated
+from .clustering import ClusteringParameters
 from .components import (
     LinearConverter,
     Sink,
@@ -26,20 +23,17 @@
     Storage,
     Transmission,
 )
-from .config import CONFIG, change_logging_level
+from .config import CONFIG
 from .core import TimeSeriesData
 from .effects import PENALTY_EFFECT_LABEL, Effect
 from .elements import Bus, Flow
 from .flow_system import FlowSystem
 from .interface import InvestParameters, Piece, Piecewise, PiecewiseConversion, PiecewiseEffects, StatusParameters
-
-# Import new Optimization classes
 from .optimization import ClusteredOptimization, Optimization, SegmentedOptimization
 
 __all__ = [
     'TimeSeriesData',
     'CONFIG',
-    'change_logging_level',
     'Flow',
     'Bus',
     'Effect',
@@ -51,22 +45,16 @@
     'LinearConverter',
     'Transmission',
     'FlowSystem',
-    # New Optimization classes (preferred)
     'Optimization',
     'ClusteredOptimization',
     'SegmentedOptimization',
-    # Old Calculation classes (deprecated, for backwards compatibility)
-    'FullCalculation',
-    'AggregatedCalculation',
-    'SegmentedCalculation',
     'InvestParameters',
     'StatusParameters',
     'Piece',
     'Piecewise',
     'PiecewiseConversion',
     'PiecewiseEffects',
     'ClusteringParameters',
-    'AggregationParameters',  # Deprecated, use ClusteringParameters
     'plotting',
     'results',
     'linear_converters',

flixopt/calculation.py

@@ -9,13 +9,10 @@
 import logging
 import pathlib
 import timeit
-import warnings as _warnings
 from typing import TYPE_CHECKING
 
 import numpy as np
 
-from .config import DEPRECATION_REMOVAL_VERSION
-
 try:
     import tsam.timeseriesaggregation as tsam
 
@@ -401,39 +398,3 @@ def _equate_indices(self, variable: linopy.Variable, indices: tuple[np.ndarray,
                 var_k0.sum(dim='time') + var_k1.sum(dim='time') <= limit,
                 short_name=f'limit_corrections|{variable.name}',
             )
-
-
-# ===== Deprecated aliases for backward compatibility =====
-
-
-def _create_deprecation_warning(old_name: str, new_name: str):
-    """Helper to create a deprecation warning"""
-    _warnings.warn(
-        f"'{old_name}' is deprecated and will be removed in v{DEPRECATION_REMOVAL_VERSION}. Use '{new_name}' instead.",
-        DeprecationWarning,
-        stacklevel=3,
-    )
-
-
-class Aggregation(Clustering):
-    """Deprecated: Use Clustering instead."""
-
-    def __init__(self, *args, **kwargs):
-        _create_deprecation_warning('Aggregation', 'Clustering')
-        super().__init__(*args, **kwargs)
-
-
-class AggregationParameters(ClusteringParameters):
-    """Deprecated: Use ClusteringParameters instead."""
-
-    def __init__(self, *args, **kwargs):
-        _create_deprecation_warning('AggregationParameters', 'ClusteringParameters')
-        super().__init__(*args, **kwargs)
-
-
-class AggregationModel(ClusteringModel):
-    """Deprecated: Use ClusteringModel instead."""
-
-    def __init__(self, *args, **kwargs):
-        _create_deprecation_warning('AggregationModel', 'ClusteringModel')
-        super().__init__(*args, **kwargs)

flixopt/clustering.py

@@ -20,7 +20,7 @@
     COLORLOG_AVAILABLE = False
     escape_codes = None
 
-__all__ = ['CONFIG', 'change_logging_level', 'MultilineFormatter', 'SUCCESS_LEVEL']
+__all__ = ['CONFIG', 'MultilineFormatter', 'SUCCESS_LEVEL']
 
 if COLORLOG_AVAILABLE:
     __all__.append('ColoredMultilineFormatter')
@@ -30,7 +30,7 @@
 logging.addLevelName(SUCCESS_LEVEL, 'SUCCESS')
 
 # Deprecation removal version - update this when planning the next major version
-DEPRECATION_REMOVAL_VERSION = '5.0.0'
+DEPRECATION_REMOVAL_VERSION = '6.0.0'
 
 
 class MultilineFormatter(logging.Formatter):
@@ -808,23 +808,3 @@ def _apply_config_dict(cls, config_dict: dict) -> None:
             elif hasattr(cls, key) and key != 'logging':
                 # Skip 'logging' as it requires special handling via CONFIG.Logging methods
                 setattr(cls, key, value)
-
-
-def change_logging_level(level_name: str | int) -> None:
-    """Change the logging level for the flixopt logger.
-
-    Args:
-        level_name: The logging level to set (DEBUG, INFO, WARNING, ERROR, CRITICAL or logging constant).
-
-    Examples:
-        >>> change_logging_level('DEBUG')  # deprecated
-        >>> # Use this instead:
-        >>> CONFIG.Logging.enable_console('DEBUG')
-    """
-    warnings.warn(
-        f'change_logging_level is deprecated and will be removed in version {DEPRECATION_REMOVAL_VERSION} '
-        'Use CONFIG.Logging.enable_console(level) instead.',
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    CONFIG.Logging.enable_console(level_name)