From 76ee8c617a241fe2d9ee1de3509004a0f9ac041a Mon Sep 17 00:00:00 2001
From: euronion <42553970+euronion@users.noreply.github.com>
Date: Fri, 4 Mar 2022 21:15:35 +0100
Subject: [PATCH 1/5] Update release_notes.rst

---
 doc/release_notes.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/release_notes.rst b/doc/release_notes.rst
index e70bc8ed..980e210e 100644
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@@ -7,6 +7,13 @@
 Release Notes
 ##########################################
 
+Up-Upcoming Release
+===================
+
+**Breaking Changes**
+
+* The config entry ``snapshots["closed"]`` was renamed to ``snapshots["inclusive"]`` to address the upstream deprecation with ``pandas=1.4``.
+  Minimum ``pandas`` version now required is `>= 1.4`.
 
 Upcoming Release
 ================

From 9f71af89ad7cb915b5b1b46f6ce1e3c72ccb10e4 Mon Sep 17 00:00:00 2001
From: euronion <42553970+euronion@users.noreply.github.com>
Date: Fri, 4 Mar 2022 21:15:42 +0100
Subject: [PATCH 2/5] Update environment.yaml

---
 envs/environment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/envs/environment.yaml b/envs/environment.yaml
index 0c881720..e168510e 100644
--- a/envs/environment.yaml
+++ b/envs/environment.yaml
@@ -26,7 +26,7 @@ dependencies:
   - lxml
   - powerplantmatching>=0.4.8
   - numpy
-  - pandas
+  - pandas>=1.4
   - geopandas
   - xarray
   - netcdf4

From 2e84bd484dd543a385c7a8ec43868a0e4c9745e7 Mon Sep 17 00:00:00 2001
From: euronion <42553970+euronion@users.noreply.github.com>
Date: Fri, 4 Mar 2022 21:16:19 +0100
Subject: [PATCH 3/5] Replace "closed" with "inclusive" in config.

---
 config.default.yaml    | 2 +-
 config.tutorial.yaml   | 2 +-
 test/config.test1.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.default.yaml b/config.default.yaml
index d2bf6159..4447a88f 100755
--- a/config.default.yaml
+++ b/config.default.yaml
@@ -26,7 +26,7 @@ clustering:
 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 ea624727..ab3e3d92 100755
--- a/config.tutorial.yaml
+++ b/config.tutorial.yaml
@@ -26,7 +26,7 @@ clustering:
 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/test/config.test1.yaml b/test/config.test1.yaml
index 2986037b..545f04bc 100755
--- a/test/config.test1.yaml
+++ b/test/config.test1.yaml
@@ -25,7 +25,7 @@ clustering:
 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

From 519c7a470067f940c3701c733a60eb82dd018e73 Mon Sep 17 00:00:00 2001
From: euronion <42553970+euronion@users.noreply.github.com>
Date: Fri, 4 Mar 2022 21:21:44 +0100
Subject: [PATCH 4/5] Update snapshots.csv

---
 doc/configtables/snapshots.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/configtables/snapshots.csv b/doc/configtables/snapshots.csv
index 4d917f4d..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 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``."

From c729d0dd744edb3d6893e580fd946c5b160d1494 Mon Sep 17 00:00:00 2001
From: euronion <42553970+euronion@users.noreply.github.com>
Date: Fri, 4 Mar 2022 21:21:49 +0100
Subject: [PATCH 5/5] Update release_notes.rst

---
 doc/release_notes.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/release_notes.rst b/doc/release_notes.rst
index 980e210e..03afce65 100644
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@@ -13,6 +13,7 @@ Up-Upcoming Release
 **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 <https://pandas.pydata.org/docs/reference/api/pandas.date_range.html>`_.
   Minimum ``pandas`` version now required is `>= 1.4`.
 
 Upcoming Release