Merge pull request #1051 from oemof/fix/require_pandas_2

Require pandas 2

docs/usage.rst

@@ -75,7 +75,7 @@ Both code blocks will create an hourly datetime index for 2011:
 .. code-block:: python
 
     import pandas as pd
-    my_index = pd.date_range('1/1/2011', periods=8761, freq='H')
+    my_index = pd.date_range('1/1/2011', periods=8761, freq='h')
 
 This index can be used to define the EnergySystem:
 
@@ -816,7 +816,7 @@ This small example of PV, grid and SinkDSM shows how to use the component
     data = pd.DataFrame.from_dict(data_dict)
 
     # Do timestamp stuff
-    datetimeindex = pd.date_range(start='1/1/2013', periods=len(data.index), freq='H')
+    datetimeindex = pd.date_range(start='1/1/2013', periods=len(data.index), freq='h')
     data['timestamp'] = datetimeindex
     data.set_index('timestamp', inplace=True)
 
@@ -1030,10 +1030,10 @@ First, you start by defining your energy system as you might have done before, b
     import pandas as pd
     import oemof.solph as solph
 
-    my_index = pd.date_range('1/1/2013', periods=17520, freq='H')
+    my_index = pd.date_range('1/1/2013', periods=17520, freq='h')
     periods = [
-        pd.date_range('1/1/2013', periods=8760, freq='H'),
-        pd.date_range('1/1/2014', periods=8760, freq='H'),
+        pd.date_range('1/1/2013', periods=8760, freq='h'),
+        pd.date_range('1/1/2014', periods=8760, freq='h'),
     ]
     my_energysystem = solph.EnergySystem(timeindex=my_index, periods=periods)
 
@@ -1084,7 +1084,7 @@ So if you want to use this, the above would simplify to:
     def determine_periods(datetimeindex):
         ...
 
-    my_index = pd.date_range('1/1/2013', periods=17520, freq='H')
+    my_index = pd.date_range('1/1/2013', periods=17520, freq='h')
     periods = determine_periods(my_index)  # Make use of method
     my_energysystem = solph.EnergySystem(timeindex=my_index, periods=periods)
 

examples/activity_costs/activity_costs.py

@@ -52,7 +52,7 @@ def main():
     # Calculate parameters and initialize the energy system and
     ##########################################################################
     periods = 24
-    time = pd.date_range("1/1/2018", periods=periods, freq="H")
+    time = pd.date_range("1/1/2018", periods=periods, freq="h")
 
     demand_heat = np.full(periods, 5)
     demand_heat[:4] = 0

examples/electrical/transshipment.py

@@ -129,7 +129,7 @@ def draw_graph(
 
 
 def main():
-    datetimeindex = pd.date_range("1/1/2017", periods=3, freq="H")
+    datetimeindex = pd.date_range("1/1/2017", periods=3, freq="h")
 
     es = EnergySystem(timeindex=datetimeindex, infer_last_interval=False)
 

examples/emission_constraint/emission_constraint.py

@@ -39,7 +39,7 @@
 def main():
     # create energy system
     energysystem = solph.EnergySystem(
-        timeindex=pd.date_range("1/1/2012", periods=3, freq="H")
+        timeindex=pd.date_range("1/1/2012", periods=3, freq="h")
     )
 
     # create gas bus

examples/flexible_modelling/add_constraints.py

@@ -56,7 +56,7 @@ def run_add_constraints_example(solver="cbc", nologg=False):
     # ##### creating an oemof solph optimization model, nothing special here ##
     # create an energy system object for the oemof solph nodes
     es = EnergySystem(
-        timeindex=pd.date_range("1/1/2017", periods=5, freq="H"),
+        timeindex=pd.date_range("1/1/2017", periods=5, freq="h"),
         infer_last_interval=False,
     )
     # add some nodes

examples/flexible_modelling/saturating_storage.py

@@ -40,7 +40,7 @@
 
 def saturating_storage_example():
     # create an energy system
-    idx = pd.date_range("1/1/2023", periods=100, freq="H")
+    idx = pd.date_range("1/1/2023", periods=100, freq="h")
     es = solph.EnergySystem(timeindex=idx, infer_last_interval=False)
 
     # power bus

examples/flow_count_limit/flow_count_limit.py

@@ -50,7 +50,7 @@
 
 def main():
     energy_system = solph.EnergySystem(
-        timeindex=pd.date_range("1/1/2012", periods=4, freq="H")
+        timeindex=pd.date_range("1/1/2012", periods=4, freq="h")
     )
 
     bel = solph.Bus(label="bel")

examples/gradient_example/gradient_example.py

@@ -50,7 +50,7 @@ def main():
     # used.
     gradient = 0.01
 
-    date_time_index = pd.date_range("1/1/2012", periods=48, freq="H")
+    date_time_index = pd.date_range("1/1/2012", periods=48, freq="h")
     print(date_time_index)
     energysystem = EnergySystem(
         timeindex=date_time_index, infer_last_interval=True

examples/invest_nonconvex_flow_examples/diesel_genset_nonconvex_investment.py

@@ -89,7 +89,7 @@ def main():
 
     # Change the index of data to be able to select data based on the time
     # range.
-    data.index = pd.date_range(start="2022-01-01", periods=len(data), freq="H")
+    data.index = pd.date_range(start="2022-01-01", periods=len(data), freq="h")
 
     # Choose the range of the solar potential and demand
     # based on the selected simulation period.

examples/offset_converter_example/offset_diesel_genset_nonconvex_investment.py

@@ -89,7 +89,7 @@ def offset_converter_example():
     data = pd.read_csv(filepath_or_buffer=filename)
 
     # Change the index of data to be able to select data based on the time range.
-    data.index = pd.date_range(start="2022-01-01", periods=len(data), freq="H")
+    data.index = pd.date_range(start="2022-01-01", periods=len(data), freq="h")
 
     # Choose the range of the solar potential and demand
     # based on the selected simulation period.
@@ -100,7 +100,7 @@ def offset_converter_example():
 
     # Create the energy system.
     date_time_index = pd.date_range(
-        start=start_date, periods=n_days * 24, freq="H"
+        start=start_date, periods=n_days * 24, freq="h"
     )
     energy_system = solph.EnergySystem(timeindex=date_time_index)
 

examples/storage_balanced_unbalanced/storage.py

@@ -66,7 +66,7 @@ def storage_example():
     )
 
     # create an energy system
-    idx = pd.date_range("1/1/2017", periods=len(timeseries), freq="H")
+    idx = pd.date_range("1/1/2017", periods=len(timeseries), freq="h")
     es = solph.EnergySystem(timeindex=idx)
 
     for data_set in DATA:

examples/storage_costs/storage_costs.py

@@ -42,7 +42,7 @@
 
 def storage_costs_example():
     # create an energy system
-    idx = pd.date_range("1/1/2023", periods=13, freq="H")
+    idx = pd.date_range("1/1/2023", periods=13, freq="h")
     es = solph.EnergySystem(timeindex=idx, infer_last_interval=False)
 
     # power bus

pyproject.toml

@@ -58,7 +58,7 @@ dependencies = [
     "blinker",
     "dill",
     "numpy",
-    "pandas >= 1.5.3",
+    "pandas >= 2.0.0",
     "pyomo >= 6.6.0, < 7.0",
     "networkx",
     "oemof.tools >= 0.4.3",

src/oemof/solph/_energy_system.py

@@ -302,4 +302,13 @@ def create_time_index(
         number = round(hoy / interval)
     if start is None:
         start = f"1/1/{year}"
-    return pd.date_range(start, periods=number + 1, freq=f"{interval}h")
+    try:
+        time_index = pd.date_range(
+            start, periods=number + 1, freq=f"{interval}h"
+        )
+    except ValueError:
+        # Pandas <2.2 compatibility
+        time_index = pd.date_range(
+            start, periods=number + 1, freq=f"{interval}H"
+        )
+    return time_index

src/oemof/solph/components/_sink.py

@@ -64,9 +64,7 @@ def __init__(self, label=None, inputs=None, custom_attributes=None):
             )
 
         super().__init__(
-            label=label,
-            inputs=inputs,
-            custom_properties=custom_attributes
+            label=label, inputs=inputs, custom_properties=custom_attributes
         )
 
     def constraint_group(self):

src/oemof/solph/components/_source.py

@@ -74,9 +74,7 @@ def __init__(self, label=None, outputs=None, custom_attributes=None):
             )
 
         super().__init__(
-            label=label,
-            outputs=outputs,
-            custom_properties=custom_attributes
+            label=label, outputs=outputs, custom_properties=custom_attributes
         )
 
     def constraint_group(self):

tests/constraint_tests.py

@@ -29,7 +29,7 @@ def setup_class(cls):
             r"^objective.*(?=s\.t\.)", re.DOTALL | re.MULTILINE
         )
 
-        cls.date_time_index = pd.date_range("1/1/2012", periods=3, freq="H")
+        cls.date_time_index = pd.date_range("1/1/2012", periods=3, freq="h")
 
         cls.tmppath = solph.helpers.extend_basic_path("tmp")
         logging.info(cls.tmppath)
@@ -1903,7 +1903,7 @@ def test_nonequidistant_storage(self):
         """Constraint test of an energy system
         with non-equidistant time index
         """
-        idxh = pd.date_range("1/1/2017", periods=3, freq="H")
+        idxh = pd.date_range("1/1/2017", periods=3, freq="h")
         idx2h = pd.date_range("1/1/2017 03:00:00", periods=2, freq="2H")
         idx30m = pd.date_range("1/1/2017 07:00:00", periods=4, freq="30min")
         timeindex = idxh.append([idx2h, idx30m])

tests/multi_period_constraint_tests.py

@@ -45,9 +45,9 @@ def setup_class(cls):
             r"^objective.*(?=s\.t\.)", re.DOTALL | re.MULTILINE
         )
 
-        timeindex1 = pd.date_range("1/1/2012", periods=2, freq="H")
-        timeindex2 = pd.date_range("1/1/2013", periods=2, freq="H")
-        timeindex3 = pd.date_range("1/1/2014", periods=2, freq="H")
+        timeindex1 = pd.date_range("1/1/2012", periods=2, freq="h")
+        timeindex2 = pd.date_range("1/1/2013", periods=2, freq="h")
+        timeindex3 = pd.date_range("1/1/2014", periods=2, freq="h")
         cls.date_time_index = timeindex1.append(timeindex2).append(timeindex3)
         cls.periods = [timeindex1, timeindex2, timeindex3]
 
@@ -2316,7 +2316,7 @@ def test_multi_period_varying_period_length(self):
 
         # Create a list of timeindex for each period
         periods = [
-            pd.date_range(f"1/1/{i}", periods=3, freq="H") for i in years
+            pd.date_range(f"1/1/{i}", periods=3, freq="h") for i in years
         ]
 
         # Create an overall timeindex

tests/regression_tests.py

@@ -24,7 +24,7 @@ def test_version_metadata():
 
 
 def test_wrong_logging_level():
-    datetimeindex = pd.date_range("1/1/2012", periods=12, freq="H")
+    datetimeindex = pd.date_range("1/1/2012", periods=12, freq="h")
     es = solph.EnergySystem(timeindex=datetimeindex, infer_last_interval=True)
     tools.logger.define_logging()
     my_logger = logging.getLogger()

tests/test_constraints_module.py

@@ -4,7 +4,7 @@
 
 
 def test_special():
-    date_time_index = pd.date_range("1/1/2012", periods=5, freq="H")
+    date_time_index = pd.date_range("1/1/2012", periods=5, freq="h")
     energysystem = solph.EnergySystem(
         timeindex=date_time_index,
         infer_last_interval=True,
@@ -28,7 +28,7 @@ def test_special():
 
 
 def test_something_else():
-    date_time_index = pd.date_range("1/1/2012", periods=5, freq="H")
+    date_time_index = pd.date_range("1/1/2012", periods=5, freq="h")
     energysystem = solph.EnergySystem(
         timeindex=date_time_index, infer_last_interval=True
     )

tests/test_energy_system.py

@@ -22,20 +22,20 @@
 )
 def test_add_periods():
     """test method _add_periods of energy system"""
-    timeindex = pd.date_range(start="2012-01-01", periods=10000, freq="H")
+    timeindex = pd.date_range(start="2012-01-01", periods=10000, freq="h")
     periods = [
-        pd.date_range(start="2012-01-01", periods=8784, freq="H"),
-        pd.date_range(start="2013-01-01", periods=1217, freq="H"),
+        pd.date_range(start="2012-01-01", periods=8784, freq="h"),
+        pd.date_range(start="2013-01-01", periods=1217, freq="h"),
     ]
     es = EnergySystem(
         timeindex=timeindex, periods=periods, infer_last_interval=True
     )
     assert len(es.periods) == 2
     assert es.periods[0].equals(
-        pd.date_range(start="2012-01-01", periods=8784, freq="H")
+        pd.date_range(start="2012-01-01", periods=8784, freq="h")
     )
     assert es.periods[1].equals(
-        pd.date_range(start="2013-01-01", periods=1217, freq="H")
+        pd.date_range(start="2013-01-01", periods=1217, freq="h")
     )
 
 
@@ -48,9 +48,9 @@ def test_add_periods():
 )
 def test_extract_periods_years():
     """test method _extract_periods_years of energy system"""
-    t_idx_1 = pd.date_range("1/1/2020", periods=3, freq="H").to_series()
-    t_idx_2 = pd.date_range("1/1/2041", periods=3, freq="H").to_series()
-    t_idx_3 = pd.date_range("1/1/2050", periods=3, freq="H").to_series()
+    t_idx_1 = pd.date_range("1/1/2020", periods=3, freq="h").to_series()
+    t_idx_2 = pd.date_range("1/1/2041", periods=3, freq="h").to_series()
+    t_idx_3 = pd.date_range("1/1/2050", periods=3, freq="h").to_series()
     timeindex = pd.concat([t_idx_1, t_idx_2, t_idx_3]).index
     periods = [t_idx_1, t_idx_2, t_idx_3]
     es = EnergySystem(

tests/test_models.py

@@ -112,7 +112,7 @@ def test_multi_period_default_discount_rate():
 
 def test_cellular_structure_detection():
     """Test flag creation if list is passed as energysystem to model"""
-    timeindex = pd.date_range(start="2020-01-01", periods=1, freq="H")
+    timeindex = pd.date_range(start="2020-01-01", periods=1, freq="h")
     es = solph.EnergySystem(timeindex=timeindex, infer_last_interval=True)
     ec_1 = solph.EnergySystem(timeindex=timeindex, infer_last_interval=True)
     ec_2 = solph.EnergySystem(timeindex=timeindex, infer_last_interval=True)
@@ -125,7 +125,7 @@ def test_sub_cell_node_consideration():
     Test if the nodes of sub-cells are considered for cellular
     energysystems.
     """
-    timeindex = pd.date_range(start="2020-01-01", periods=1, freq="H")
+    timeindex = pd.date_range(start="2020-01-01", periods=1, freq="h")
     es = solph.EnergySystem(timeindex=timeindex, infer_last_interval=True)
     ec_1 = solph.EnergySystem(timeindex=timeindex, infer_last_interval=True)
     bus_es = solph.buses.Bus(label="bus_es")
@@ -141,7 +141,7 @@ def test_sub_cell_flow_consideration():
     Test if the flows of sub-cells are considered for cellular
     energysystems.
     """
-    timeindex = pd.date_range(start="2020-01-01", periods=1, freq="H")
+    timeindex = pd.date_range(start="2020-01-01", periods=1, freq="h")
     es = solph.EnergySystem(timeindex=timeindex, infer_last_interval=True)
     ec_1 = solph.EnergySystem(timeindex=timeindex, infer_last_interval=True)
     bus_es = solph.buses.Bus(label="bus_es")

tests/test_non_equidistant_time_index.py

@@ -24,7 +24,7 @@
 class TestParameterResult:
     @classmethod
     def setup_class(cls):
-        dtindex1 = pd.date_range("1/1/2012", periods=24, freq="H")
+        dtindex1 = pd.date_range("1/1/2012", periods=24, freq="h")
         dtindex2 = pd.date_range("1/2/2012", periods=49, freq="30min")
         dtindex = dtindex1.union(dtindex2)
         es = EnergySystem(timeindex=dtindex, infer_last_interval=False)

tests/test_outputlib/__init__.py

@@ -122,7 +122,7 @@
     conversion_factors={bel: 1 / 3, b_heat_source: (cop - 1) / cop},
 )
 
-datetimeindex = pd.date_range("1/1/2012", periods=24, freq="H")
+datetimeindex = pd.date_range("1/1/2012", periods=24, freq="h")
 energysystem = EnergySystem(timeindex=datetimeindex, infer_last_interval=True)
 energysystem.add(
     bcoal,

tests/test_processing.py

@@ -34,7 +34,7 @@ def setup_class(cls):
             timeindex=pandas.date_range(
                 "2016-01-01",
                 periods=cls.period,
-                freq="H",
+                freq="h",
             ),
             infer_last_interval=True,
         )

tests/test_scripts/test_solph/test_connect_invest/test_connect_invest.py

@@ -28,7 +28,7 @@
 
 
 def test_connect_invest():
-    date_time_index = pd.date_range("1/1/2012", periods=24 * 7, freq="H")
+    date_time_index = pd.date_range("1/1/2012", periods=24 * 7, freq="h")
 
     es = EnergySystem(timeindex=date_time_index, infer_last_interval=True)
 

tests/test_scripts/test_solph/test_flexible_modelling/test_add_constraints.py

@@ -32,7 +32,7 @@ def test_add_constraints_example(solver="cbc", nologg=False):
     # ##### creating an oemof solph optimization model, nothing special here ##
     # create an energy system object for the oemof solph nodes
     es = EnergySystem(
-        timeindex=pd.date_range("1/1/2012", periods=4, freq="H"),
+        timeindex=pd.date_range("1/1/2012", periods=4, freq="h"),
         infer_last_interval=True,
     )
 

tests/test_scripts/test_solph/test_generic_caes/test_generic_caes.py

@@ -37,7 +37,7 @@ def test_gen_caes():
     periods = len(data) - 1
 
     # create an energy system
-    idx = pd.date_range("1/1/2017", periods=periods, freq="H")
+    idx = pd.date_range("1/1/2017", periods=periods, freq="h")
     es = EnergySystem(timeindex=idx, infer_last_interval=True)
 
     # resources

tests/test_scripts/test_solph/test_generic_chp/test_generic_chp.py

@@ -31,7 +31,7 @@ def test_gen_chp():
     periods = len(data) - 1
 
     # create an energy system
-    idx = pd.date_range("1/1/2017", periods=periods, freq="H")
+    idx = pd.date_range("1/1/2017", periods=periods, freq="h")
     es = solph.EnergySystem(timeindex=idx, infer_last_interval=True)
 
     # resources

tests/test_scripts/test_solph/test_invest_fix_flow/test_simple_invest_fixed.py

@@ -60,7 +60,7 @@ def test_dispatch_fix_example(solver="cbc", periods=10):
         inputs={bel: Flow(nominal_value=85, fix=data["demand_el"])},
     )
 
-    datetimeindex = pd.date_range("1/1/2012", periods=periods, freq="H")
+    datetimeindex = pd.date_range("1/1/2012", periods=periods, freq="h")
 
     energysystem = EnergySystem(
         timeindex=datetimeindex, infer_last_interval=True