Merge pull request #66 from Open-ISP/update-fixed-opex-new-entrants

Update fixed opex new entrants table config and bump version
Open-ISP · Jan 21, 2025 · 1557a6f · 1557a6f
2 parents d485698 + 4554294
commit 1557a6f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/example_output/6.0/fixed_opex_new_entrants.csv b/example_output/6.0/fixed_opex_new_entrants.csv
@@ -16,5 +16,5 @@ Wind - offshore (floating),625.6347699603417,675.6855515571691,731.9926808535997
 Pumped Hydro (8hrs storage),19.092475847369,20.619873915158518,22.338196741421726,19.092475847369,21.38357294905328,23.86559480921125,19.092475847369,21.38357294905328,23.674670050737557,19.092475847369,20.81079867363221,22.338196741421726,19.092475847369,19.66525012279007,20.04709963973745
 Pumped Hydro (24hrs storage),19.092475847368963,20.619873915158482,22.338196741421687,19.092475847368963,21.38357294905324,23.865594809211203,19.092475847368963,21.38357294905324,23.674670050737515,19.092475847368963,20.81079867363217,22.338196741421687,19.092475847368963,19.66525012279003,20.04709963973741
 Pumped Hydro (48hrs storage),19.092475847368963,20.619873915158482,22.338196741421687,19.092475847368963,21.38357294905324,23.865594809211203,19.092475847368963,21.38357294905324,23.674670050737515,19.092475847368963,20.81079867363217,22.338196741421687,19.092475847368963,19.66525012279003,20.04709963973741
-BOTN - Cethana,BOTN - Cethana,BOTN - Cethana,BOTN - Cethana,BOTN - Cethana,BOTN - Cethana,BOTN - Cethana,BOTN - Cethana,BOTN - Cethana,BOTN - Cethana,BOTN - Cethana,20.81079867363217,20.81079867363217,20.81079867363217,20.81079867363217,20.81079867363217
+BOTN - Cethana,,,,,,,,,,,20.81079867363217,,,,
 Hydrogen reciprocating engines,35.286899999999996,38.109852,41.285672999999996,35.286899999999996,39.521328,44.108624999999996,35.286899999999996,39.521328,43.75575599999999,35.286899999999996,38.462720999999995,41.285672999999996,35.286899999999996,36.345507,37.051244999999994
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "isp-workbook-parser"
-version = "2.4.0"
+version = "2.4.1"
 description = "A Python package for reading data from the Inputs, Assumptions and Scenarios Report (IASR) Microsoft Excel workbook published by the Australian Energy Market Operator for use in their Integrated System Plan modelling."
 authors = [
     { name = "nick-gorman", email = "[email protected]" },

diff --git a/src/isp_table_configs/6.0/fixed_opex.yaml b/src/isp_table_configs/6.0/fixed_opex.yaml
@@ -9,3 +9,4 @@ fixed_opex_new_entrants:
   header_rows: [6, 7]
   end_row: 26
   column_range: "F:U"
+  forward_fill_values: False
diff --git a/src/isp_workbook_parser/parser.py b/src/isp_workbook_parser/parser.py
@@ -499,8 +499,12 @@ def get_table_from_config(
 
         Examples:
 
+        >>> import pandas as pd
         >>> from isp_workbook_parser import TableConfig
 
+        >>> pd.set_option("display.max_columns", 4)
+        >>> pd.set_option("display.width", None)
+
         >>> config = TableConfig(
         ... name='existing_generators_summary',
         ... sheet_name='Summary Mapping',