From f67b715a5660b1d8eb3343011697f4a7e864b403 Mon Sep 17 00:00:00 2001 From: "j.aschauer" Date: Mon, 24 Jun 2024 13:19:00 +0200 Subject: [PATCH 1/2] update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 514e4c0..39eb0a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG.md +## 2.0.0 (2024-06-24) + +- rename "Autothermal reactor" to "Methane reconversion" ([#526](https://github.com/agoenergy/ptx-boa/pull/526)) +- add license file to repository ([#527](https://github.com/agoenergy/ptx-boa/pull/527)) + ## 1.0.1 (2024-06-22) - fix bug in cost by RE source graph From 4831463a014aee49764a10a85da0ce72f7e73491 Mon Sep 17 00:00:00 2001 From: "j.aschauer" Date: Mon, 24 Jun 2024 13:19:26 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version:=201.0.1=20=E2=86=92=202.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- .github/workflows/publish.yaml | 2 +- Dockerfile | 2 +- README.md | 2 +- app/tab_info.py | 2 +- ptxboa_streamlit.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 2080de7..2b7bdeb 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.1 +current_version = 2.0.0 commit = True tag = True diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 0763278..0426420 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -23,4 +23,4 @@ jobs: uses: docker/build-push-action@v5 with: push: true - tags: wingechr/ptx-boa:1.0.1 + tags: wingechr/ptx-boa:2.0.0 diff --git a/Dockerfile b/Dockerfile index 18b39fe..f682880 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.10-slim -LABEL version="1.0.1" +LABEL version="2.0.0" RUN apt-get update RUN apt-get install -y git diff --git a/README.md b/README.md index 2dd9656..851401a 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ scp -r ptxboa2:ptx-boa_offline_optimization/optimization_cache/* . # connect to server ssh ptxboa # pull latest image from dockerhub -VERSION=1.0.1 +VERSION=2.0.0 docker pull wingechr/ptx-boa:$VERSION # stop and delete the currently running container "app" docker stop app diff --git a/app/tab_info.py b/app/tab_info.py index b11901a..c2752d1 100644 --- a/app/tab_info.py +++ b/app/tab_info.py @@ -4,7 +4,7 @@ from app.ptxboa_functions import read_markdown_file -__version__ = "1.0.1" +__version__ = "2.0.0" def content_info(): diff --git a/ptxboa_streamlit.py b/ptxboa_streamlit.py index 6cb98a7..38047cd 100644 --- a/ptxboa_streamlit.py +++ b/ptxboa_streamlit.py @@ -6,7 +6,7 @@ >>> streamlit run ptxboa_streamlit.py """ -__version__ = "1.0.1" +__version__ = "2.0.0" import logging