Merge branch 'dev' into fix/autoreport

CHANGELOG.md

@@ -33,7 +33,7 @@ Here is a template for new release sections
 - Define `OEMOF_SOLPH_OBJECT_ASSET`, `WEIGHTING_FACTOR_ENERGY_CARRIER`, `RENEWABLE_SHARE_ASSET_FLOW`, `OEMOF_SOLPH_OBJECT_BUS` as constants in `D2` module (#834)
 - Import and use constants from `D2` module in `test_D2_model_constraints.py` (#834)
 - Add check for the capability of asset capacities in an energy system to fulfill the maximum demand in `C1.check_energy_system_can_fulfill_max_demand()` (#824)
-- Add tests for `C1.check_energy_system_can_fulfill_max_demand()`, including pseudo-benchmark test in `test_C1` (#824)
+- Add tests for `C1.check_energy_system_can_fulfill_max_demand()`, including pseudo-benchmark test in `test_C1` (#824, #896)
 - Zenodo badge on README (#850)
 - `VERSION_NUM` to simulation settings, added with `C0.add_version_number_used()` (#855)
 - Generation of pdf version of the readthedocs (#853)
@@ -55,7 +55,7 @@ Here is a template for new release sections
 - Status messages of requirements in `E-Land_Requirements.rst` (#817)
 - Minor updates in `Model_Assumptions.rst` and `MVS_Outputs.rst`, mainly adding labels (#817)
 - Pytests for `D0` to let them pass on Windows (#839)
-- Update pyomo and pandas dependencies (#840)
+- Update pyomo and pandas dependencies (#840, #896)
 - Pass peak demand pricing bus in `C1.check_for_sufficient_assets_on_busses()` (#837)
 - Changed utils.data_parser.convert_mvs_params_to_epa(): Removed `AUTO_SINK` suffix (#837)
 - Refactored `EXCESS` to `EXCESS_SINK` as this is more intuitive (#837)

requirements/default.txt

@@ -1,6 +1,6 @@
 oemof.solph>=0.4.1
 pandas>=0.24.0,!=1.1.0,!=1.1.1,!=1.1.2
-pyomo!=5.7.3 # version 5.7.3 make mvs very slow
+pyomo!=5.7.3,!=6.0 # version 5.7.3 and 6.0 make mvs very slow
 graphviz>=0.14.1
 plotly
 psutil

tests/test_C1_verification.py

@@ -51,6 +51,7 @@
 from multi_vector_simulator.utils.exceptions import (
     UnknownEnergyVectorError,
     DuplicateLabels,
+    MVSOemofError,
 )
 
 
@@ -862,8 +863,7 @@ def test_check_energy_system_can_fulfill_max_demand_fails_mvs_runthrough(caplog)
     TEST_OUTPUT_PATH = os.path.join(TEST_REPO_PATH, "benchmark_test_outputs")
     if os.path.exists(TEST_OUTPUT_PATH):
         shutil.rmtree(TEST_OUTPUT_PATH, ignore_errors=True)
-
-    try:
+    with pytest.raises(MVSOemofError):
         use_case = "validity_check_insufficient_capacities"
         main(
             overwrite=True,
@@ -872,12 +872,10 @@ def test_check_energy_system_can_fulfill_max_demand_fails_mvs_runthrough(caplog)
             input_type=CSV_EXT,
             path_output_folder=os.path.join(TEST_OUTPUT_PATH, use_case),
         )
-    except:
-        pass
 
     logfile = open(os.path.join(TEST_OUTPUT_PATH, use_case, LOGFILE), "r")
     log = logfile.read()
-
+    logfile.close()
     assert "might have insufficient capacities" in log