Skip to content

Commit

Permalink
Merge branch 'release/v0.0.3' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
MaGering committed Mar 11, 2024
2 parents 4a461aa + 325ae55 commit a3c0b6d
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
author = "Reiner Lemoine Institut"

# The full version, including alpha/beta/rc tags
release = "0.0.3dev0"
release = "0.0.3"


# -- General configuration ---------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions docs/whats_new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ What's new

.. include:: whats_new/v0-0-1.rst
.. include:: whats_new/v0-0-2.rst
.. include:: whats_new/v0-0-3.rst
10 changes: 10 additions & 0 deletions docs/whats_new/v0-0-3.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
v0.0.3
======

* The oemof-tabular version has been increased to v0.0.5 which leads to the oemof.solph version
0.5.2.dev1 (Changes made on dev)
* Postprocessing functions have been moved from oemof-tabular to oemoflex (PR 99)
* With higher pandas version (2.2.1) the concat function in postprocessing.py had to be revised
(PR 100)
* The build of docs has been fixed (PR 102 + commit b3999c40c800454849c0bda537dbe7a8607faa73
and 4a461aa0f0e7e51284d79dec4a1a94d33d66e98c)
6 changes: 5 additions & 1 deletion oemoflex/model/postprocessing.py
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,11 @@ def run_postprocessing(es):
# Todo: To be further investigated

# Index work-around - issues with concat and Multiindex
all_scalars_reindexed = [s.rename("var_value").reset_index() for s in all_scalars]
all_scalars_reindexed = [
s.rename("var_value").reset_index()
for s in all_scalars
if not isinstance(s, type(None))
]
all_scalars_df_reindexed = pd.concat(
all_scalars_reindexed, ignore_index=True, axis=0
)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def read(fname):

setup(
name="oemoflex",
version="0.0.3dev0",
version="0.0.3",
description="A flexible model structure for creating and analysing multi-regional"
"sector-integrated energysystem models featuring many flexibility options",
long_description=read("README.md"),
Expand Down

0 comments on commit a3c0b6d

Please sign in to comment.