Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ What's New?
dispatchable start-up, only down to the ``reserve``. After dispatchable start-up,
storage is dispatched a second time in case a deficit remains, in this part of the
sequence, all storage state of charge can be used.
* We now work with Python 3.11 using newly released :mod:`numba` version 0.57.
* dispatch now works with Python 3.11 using newly released :mod:`numba` version 0.57.
* dispatch now works with :mod:`pandas` 2.0.

Bug Fixes
^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies = [
"numba >= 0.55.1,<0.58",
"numexpr >= 2.8, < 2.8.5",
"numpy >= 1.18.5,<2",
"pandas >= 1.4,< 1.6",
"pandas >= 1.4,< 2.1",
"pandera >= 0.12, < 0.15",
"pyarrow>=7, <13",
"rmi.etoolbox @ git+https://github.com/rmi/etoolbox.git",
Expand Down
5 changes: 4 additions & 1 deletion src/dispatch/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ def __init__(
(0.4, 0.5] 0
(0.5, 0.75] 0
(0.75, 1.0] 0
dtype: int64
Name: count, dtype: int64

Generate a full, combined output of all resources at specified frequency.

Expand Down Expand Up @@ -1493,6 +1493,9 @@ def _plot_prep_detail(self, begin, end):
def arrange(df):
return (
df.loc[begin:end, :]
.rename_axis(
columns=["plant_id_eia", "generator_id", "technology_description"]
)
.stack([0, 1, 2])
.to_frame(name="net_generation_mwh")
.reset_index()
Expand Down