diff --git a/config.default.yaml b/config.default.yaml index 5f2e1c6c..b06c06b7 100755 --- a/config.default.yaml +++ b/config.default.yaml @@ -25,7 +25,7 @@ countries: ['AL', 'AT', 'BA', 'BE', 'BG', 'CH', 'CZ', 'DE', 'DK', 'EE', 'ES', 'F snapshots: start: "2013-01-01" end: "2014-01-01" - closed: 'left' # end is not inclusive + inclusive: 'left' # include start, not end enable: prepare_links_p_nom: false diff --git a/config.tutorial.yaml b/config.tutorial.yaml index 4c093a3c..dc5347aa 100755 --- a/config.tutorial.yaml +++ b/config.tutorial.yaml @@ -24,7 +24,7 @@ countries: ['BE'] snapshots: start: "2013-03-01" end: "2013-04-01" - closed: 'left' # end is not inclusive + inclusive: 'left' # include start, not end enable: prepare_links_p_nom: false diff --git a/doc/configtables/snapshots.csv b/doc/configtables/snapshots.csv index 00297498..d60c78dc 100644 --- a/doc/configtables/snapshots.csv +++ b/doc/configtables/snapshots.csv @@ -1,4 +1,4 @@ ,Unit,Values,Description start,--,"str or datetime-like; e.g. YYYY-MM-DD","Left bound of date range" end,--,"str or datetime-like; e.g. YYYY-MM-DD","Right bound of date range" -closed,--,"One of {None, ‘left’, ‘right’}","Make the time interval closed to the ``left``, ``right``, or open on both sides ``None``." +inclusive,--,"One of {'neither', 'both', ‘left’, ‘right’}","Make the time interval closed to the ``left``, ``right``, or both sides ``both`` or neither side ``None``." diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 70927880..adcbfb58 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -10,12 +10,21 @@ Release Notes Upcoming Release ================ -* Carriers of generators can now be excluded from aggregation in clustering network and simplify network. - * Fix EQ constraint for the case no hydro inflow is available * Bugfix in the reserve constraint will increase demand related reserve requirements +**New Features** + +* Carriers of generators can now be excluded from aggregation in clustering network and simplify network. + +**Breaking Changes** + +* The config entry ``snapshots["closed"]`` was renamed to ``snapshots["inclusive"]`` to address the upstream deprecation with ``pandas=1.4``. + The previous setting ``None`` is no longer supported and replaced by ``both``, see the `pandas documentation `_. + Minimum ``pandas`` version now required is `>= 1.4`. + + PyPSA-Eur 0.6.1 (20th September 2022) ===================================== diff --git a/envs/environment.yaml b/envs/environment.yaml index 548a10d2..4bdaf48c 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -24,9 +24,9 @@ dependencies: - yaml - pytables - lxml -- powerplantmatching>=0.5.5 +- powerplantmatching>=0.5.4 - numpy<1.24 -- pandas +- pandas>=1.4 - geopandas>=0.11.0 - xarray - netcdf4 diff --git a/test/config.test1.yaml b/test/config.test1.yaml index 7c9b0896..253446ef 100755 --- a/test/config.test1.yaml +++ b/test/config.test1.yaml @@ -22,7 +22,7 @@ countries: ['BE'] snapshots: start: "2013-03-01" end: "2013-03-08" - closed: 'left' # end is not inclusive + inclusive: 'left' # include start, not end enable: prepare_links_p_nom: false