Merge branch 'release/v0.5' into fix/v0.5-fixes-in-dev

oemof · Oct 15, 2024 · eaf35cf · eaf35cf
2 parents 551fa97 + d3410d7
commit eaf35cf
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -10,6 +10,7 @@ These are new features and improvements of note in each release
 
 
 .. include::  whatsnew/v0-6-0.rst
+.. include::  whatsnew/v0-5-6.rst
 .. include::  whatsnew/v0-5-5.rst
 .. include::  whatsnew/v0-5-4.rst
 .. include::  whatsnew/v0-5-3.rst

diff --git a/docs/whatsnew/v0-5-6.rst b/docs/whatsnew/v0-5-6.rst
@@ -0,0 +1,17 @@
+v0.5.6
+------
+
+Bug fixes
+#########
+
+* Update required Pyomo version to allow working with numpy >= 2.0.0.
+
+Known issues
+############
+
+* Indexing of Storage with capacity investment is off by one.
+
+Contributors
+############
+
+* Patrik Schönfeldt
diff --git a/docs/whatsnew/v0-6-0.rst b/docs/whatsnew/v0-6-0.rst
@@ -29,8 +29,6 @@ Other changes
 Known issues
 ############
 
-* Incompatible to numpy >= 2.0.0. This is because of Pyomo, but we have to
-  enforce a lower version in our package.
 
 Contributors
 ############

diff --git a/pyproject.toml b/pyproject.toml
@@ -57,9 +57,9 @@ requires-python = ">=3.8"
 dependencies = [
     "blinker",
     "dill",
-    "numpy < 2.0.0",
-    "pandas >= 2.0.0",
-    "pyomo >= 6.6.0, < 7.0",
+    "numpy >= 2.0.0",
+    "pandas >= 2.2.0",
+    "pyomo >= 6.8.0",
     "networkx",
     "oemof.tools >= 0.4.3",
     "oemof.network >= 0.5.0",

diff --git a/src/oemof/solph/_plumbing.py b/src/oemof/solph/_plumbing.py
@@ -30,15 +30,15 @@ def sequence(iterable_or_scalar):
     --------
     >>> y = sequence([1,2,3,4,5,6,7,8,9,10,11])
     >>> y[0]
-    1
+    np.int64(1)
 
     >>> y[10]
-    11
+    np.int64(11)
 
     >>> import pandas as pd
     >>> s1 = sequence(pd.Series([1,5,9]))
     >>> s1[2]
-    9
+    np.int64(9)
 
     >>> x = sequence(10)
     >>> x[0]

diff --git a/src/oemof/solph/flows/_flow.py b/src/oemof/solph/flows/_flow.py
@@ -111,7 +111,7 @@ class Flow(Edge):
     >>> f.variable_costs[2]
     5
     >>> f.fix[2]
-    4
+    np.int64(4)
 
     Creating a flow object with time-depended lower and upper bounds: