Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into 548-green-iron-hig…
Browse files Browse the repository at this point in the history
…h-re-curtailment-gaps-in-profiles
  • Loading branch information
markushal committed Sep 12, 2024
2 parents 897e64d + 5f0bde2 commit 37f12e2
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.0.3
current_version = 2.0.4
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
uses: docker/build-push-action@v5
with:
push: true
tags: wingechr/ptx-boa:2.0.3
tags: wingechr/ptx-boa:2.0.4
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

- fix bug regarding snapshot weightings ([#548](https://github.com/agoenergy/ptx-boa/pull/549))

## 2.0.4 (2024-09-11)

- Disable Green Iron cost calculations for maintenance
- add possiblity to define parameter space in offline optimization script

## 2.0.3 (2024-07-15)

- upgrade pypsa requirements to 0.28
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM python:3.10-slim
LABEL version="2.0.3"
LABEL version="2.0.4"

RUN apt-get update
RUN apt-get install -y git
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ scp -r ptxboa2:ptx-boa_offline_optimization/optimization_cache/* .
# connect to server
ssh ptxboa
# pull latest image from dockerhub
VERSION=2.0.3
VERSION=2.0.4
docker pull wingechr/ptx-boa:$VERSION
# stop and delete the currently running container "app"
docker stop app
Expand Down
1 change: 0 additions & 1 deletion app/sidebar.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ def main_settings(api):
"Product:",
[
"Ammonia",
"Green Iron",
"Hydrogen",
"LOHC",
"Methane",
Expand Down
2 changes: 1 addition & 1 deletion app/tab_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from app.ptxboa_functions import read_markdown_file

__version__ = "2.0.3"
__version__ = "2.0.4"


def content_info():
Expand Down
8 changes: 7 additions & 1 deletion ptxboa_streamlit.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
>>> streamlit run ptxboa_streamlit.py
"""

__version__ = "2.0.3"
__version__ = "2.0.4"

import logging

Expand Down Expand Up @@ -91,6 +91,12 @@

st.title("PtX Business Opportunity Analyser")

with st.container():
st.warning(
"**Info:** The calculation of costs for producing Green Iron"
" is currently under revision and will be released in the coming days."
)

with st.container():
if st.session_state["edit_input_data"]:
st.info("Data editing mode **ON**")
Expand Down

0 comments on commit 37f12e2

Please sign in to comment.