Merge pull request #528 from agoenergy/release-v2.0

Release-v2.0
agoenergy · Jun 24, 2024 · 11f4f7d · 11f4f7d
2 parents 7b6d112 + 4831463
commit 11f4f7d
Show file tree

Hide file tree

Showing 18 changed files with 449 additions and 17 deletions.
diff --git 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
@@ -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/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

diff --git 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/LICENSE.txt b/LICENSE.txt
diff --git 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
@@ -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/static/dim_process.csv b/ptxboa/static/dim_process.csv
@@ -1,6 +1,6 @@
 process_code,process_name,main_flow_code_out,main_flow_code_in,is_transformation,is_re_generation,is_transport,is_secondary,process_class,is_ely,is_deriv,result_process_type,secondary_flows
 AEL-EL,AEL electrolysis,H2-G,EL,True,False,False,False,ELY,True,False,Electrolysis,H2O-L
-ATR,Autothermal-Reactor (Blue Hydrogen),H2-G,CH4-G,True,False,True,False,TRNSP-PP,False,False,Transportation (Pipeline),EL
+ATR,Methane reconversion,H2-G,CH4-G,True,False,True,False,TRNSP-PP,False,False,Transportation (Pipeline),EL
 CH3OHREC,Methanol reconversion,H2-G,CH3OH-L,True,False,True,False,TRNSP-SP,False,False,Transportation (Ship),
 CH3OH-S,Methanol ship (own fuel consumption),CH3OH-L,CH3OH-L,False,False,True,False,TRNSP-S,False,False,Transportation (Ship),
 CH3OH-SB,Methanol ship (bunker fuel consumption),CH3OH-L,CH3OH-L,False,False,True,False,TRNSP-S,False,False,Transportation (Ship),BFUEL-L
@@ -44,7 +44,7 @@ NH3SYN,Ammonia Synthesis (Haber-Bosch),NH3-L,H2-G,True,False,False,False,DERIV,F
 PEM-EL,PEM electrolysis,H2-G,EL,True,False,False,False,ELY,True,False,Electrolysis,H2O-L
 PV-FIX,PV tilted,EL,,False,True,False,False,RE-GEN,False,False,Electricity generation,
 PV-TRK,PV tracking,EL,,False,True,False,False,RE-GEN,False,False,Electricity generation,
-REGASATR,Autothermal-Reactor (Blue Hydrogen) incl. Regasification,H2-G,CH4-L,True,False,True,False,TRNSP-SP,False,False,Transportation (Ship),EL
+REGASATR,Methane reconversion incl. regasification,H2-G,CH4-L,True,False,True,False,TRNSP-SP,False,False,Transportation (Ship),EL
 RES-HYBR,Wind-PV-Hybrid,EL,,False,True,False,False,RE-GEN,False,False,Electricity generation,
 SOEC-EL,SOEC (high-temp) electrolysis,H2-G,EL,True,False,False,False,ELY,True,False,Electrolysis,H2O-L
 SYN-S,FT e-fuels ship (own fuel consumption),CHX-L,CHX-L,False,False,True,False,TRNSP-S,False,False,Transportation (Ship),

diff --git 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
 

diff --git a/tests/test_user_data/non_existent_index_user_data.csv b/tests/test_user_data/non_existent_index_user_data.csv
@@ -16,7 +16,7 @@ India,Ammonia Synthesis (Haber-Bosch),efficiency,0.4,
 ,PV tilted,lifetime / amortization period,50.0,
 ,Ammonia ship (own fuel consumption),levelized costs,100.0,
 ,Ammonia ship (own fuel consumption),"losses (own fuel, transport)",0.5,
-,Autothermal-Reactor (Blue Hydrogen),lifetime / amortization period,40.0,
+,Methane reconversion,lifetime / amortization period,40.0,
 United Arab Emirates,,WACC,0.0001,
 Australia,,WACC,0.9,
 Colombia,,WACC,1.0,

diff --git a/tests/test_user_data/non_numeric_empty_user_data.csv b/tests/test_user_data/non_numeric_empty_user_data.csv
@@ -16,7 +16,7 @@ Kenya,Wind-PV-Hybrid,full load hours,,
 ,PV tilted,lifetime / amortization period,50.0,
 ,Ammonia ship (own fuel consumption),levelized costs,100.0,
 ,Ammonia ship (own fuel consumption),"losses (own fuel, transport)",0.5,
-,Autothermal-Reactor (Blue Hydrogen),lifetime / amortization period,40.0,
+,Methane reconversion,lifetime / amortization period,40.0,
 United Arab Emirates,,WACC,0.0001,
 Australia,,WACC,0.9,
 Colombia,,WACC,1.0,

diff --git a/tests/test_user_data/non_numeric_nan_user_data.csv b/tests/test_user_data/non_numeric_nan_user_data.csv
@@ -16,7 +16,7 @@ Kenya,Wind-PV-Hybrid,full load hours,5000.0,
 ,PV tilted,lifetime / amortization period,50.0,
 ,Ammonia ship (own fuel consumption),levelized costs,100.0,
 ,Ammonia ship (own fuel consumption),"losses (own fuel, transport)",0.5,
-,Autothermal-Reactor (Blue Hydrogen),lifetime / amortization period,40.0,
+,Methane reconversion,lifetime / amortization period,40.0,
 United Arab Emirates,,WACC,0.0001,
 Australia,,WACC,0.9,
 Colombia,,WACC,1.0,

diff --git a/tests/test_user_data/non_numeric_string_user_data.csv b/tests/test_user_data/non_numeric_string_user_data.csv
@@ -16,7 +16,7 @@ Kenya,Wind-PV-Hybrid,full load hours,5000.0,
 ,PV tilted,lifetime / amortization period,50.0,
 ,Ammonia ship (own fuel consumption),levelized costs,100.0,
 ,Ammonia ship (own fuel consumption),"losses (own fuel, transport)",string_entry,
-,Autothermal-Reactor (Blue Hydrogen),lifetime / amortization period,40.0,
+,Methane reconversion,lifetime / amortization period,40.0,
 United Arab Emirates,,WACC,0.0001,
 Australia,,WACC,0.9,
 Colombia,,WACC,1.0,

diff --git a/tests/test_user_data/param_above_range_user_data.csv b/tests/test_user_data/param_above_range_user_data.csv
@@ -16,7 +16,7 @@ Kenya,Wind-PV-Hybrid,full load hours,5000.0,
 ,PV tilted,lifetime / amortization period,50.0,
 ,Ammonia ship (own fuel consumption),levelized costs,100.0,
 ,Ammonia ship (own fuel consumption),"losses (own fuel, transport)",0.5,
-,Autothermal-Reactor (Blue Hydrogen),lifetime / amortization period,40.0,
+,Methane reconversion,lifetime / amortization period,40.0,
 United Arab Emirates,,WACC,0.0001,
 Australia,,WACC,0.9,
 Colombia,,WACC,1.0,

diff --git a/tests/test_user_data/param_below_range_user_data.csv b/tests/test_user_data/param_below_range_user_data.csv
@@ -16,7 +16,7 @@ Kenya,Wind-PV-Hybrid,full load hours,5000.0,
 ,PV tilted,lifetime / amortization period,50.0,
 ,Ammonia ship (own fuel consumption),levelized costs,100.0,
 ,Ammonia ship (own fuel consumption),"losses (own fuel, transport)",0.5,
-,Autothermal-Reactor (Blue Hydrogen),lifetime / amortization period,40.0,
+,Methane reconversion,lifetime / amortization period,40.0,
 United Arab Emirates,,WACC,0.0001,
 Australia,,WACC,0.9,
 Colombia,,WACC,1.0,

diff --git a/tests/test_user_data/too_many_columns_user_data.csv b/tests/test_user_data/too_many_columns_user_data.csv
@@ -16,7 +16,7 @@ Kenya,Wind-PV-Hybrid,full load hours,5000.0,,None
 ,PV tilted,lifetime / amortization period,50.0,,None
 ,Ammonia ship (own fuel consumption),levelized costs,100.0,,None
 ,Ammonia ship (own fuel consumption),"losses (own fuel, transport)",0.5,,None
-,Autothermal-Reactor (Blue Hydrogen),lifetime / amortization period,40.0,,None
+,Methane reconversion,lifetime / amortization period,40.0,,None
 United Arab Emirates,,WACC,0.0001,,None
 Australia,,WACC,0.9,,None
 Colombia,,WACC,1.0,,None

diff --git a/tests/test_user_data/valid_user_data.csv b/tests/test_user_data/valid_user_data.csv
@@ -16,7 +16,7 @@ Kenya,Wind-PV-Hybrid,full load hours,5000.0,
 ,PV tilted,lifetime / amortization period,50.0,
 ,Ammonia ship (own fuel consumption),levelized costs,100.0,
 ,Ammonia ship (own fuel consumption),"losses (own fuel, transport)",0.5,
-,Autothermal-Reactor (Blue Hydrogen),lifetime / amortization period,40.0,
+,Methane reconversion,lifetime / amortization period,40.0,
 United Arab Emirates,,WACC,0.0001,
 Australia,,WACC,0.9,
 Colombia,,WACC,1.0,

diff --git a/tests/test_user_data/wrong_column_name_user_data.csv b/tests/test_user_data/wrong_column_name_user_data.csv
@@ -16,7 +16,7 @@ Kenya,Wind-PV-Hybrid,full load hours,5000.0,
 ,PV tilted,lifetime / amortization period,50.0,
 ,Ammonia ship (own fuel consumption),levelized costs,100.0,
 ,Ammonia ship (own fuel consumption),"losses (own fuel, transport)",0.5,
-,Autothermal-Reactor (Blue Hydrogen),lifetime / amortization period,40.0,
+,Methane reconversion,lifetime / amortization period,40.0,
 United Arab Emirates,,WACC,0.0001,
 Australia,,WACC,0.9,
 Colombia,,WACC,1.0,