From ca111297d736793eaa2e3fba9af4e644f95639c2 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Fri, 18 Feb 2022 10:09:58 +0100
Subject: [PATCH 1/2] Merge pull request #311 from PyPSA/test-pd-1.4

test pandas 1.4 compatibility for updated environment.yaml
---
 envs/environment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 3eec027db611bcf1fb9d7a71c4f522ae7d112db9 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Tue, 22 Feb 2022 19:34:47 +0100
Subject: [PATCH 2/2] no more 'mv' command in Snakefile for Windows (#316)

---
 Snakefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Snakefile b/Snakefile
index c5d6a3cd..086b048c 100644
--- a/Snakefile
+++ b/Snakefile
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 from os.path import normpath, exists
-from shutil import copyfile
+from shutil import copyfile, move
 
 from snakemake.remote.HTTP import RemoteProvider as HTTPRemoteProvider
 HTTP = HTTPRemoteProvider()
@@ -70,7 +70,7 @@ if config['enable'].get('retrieve_databundle', True):
 rule retrieve_load_data:
     input: HTTP.remote("data.open-power-system-data.org/time_series/2019-06-05/time_series_60min_singleindex.csv", keep_local=True, static=True)
     output: "data/load_raw.csv"
-    shell: "mv {input} {output}"
+    run: move(input[0], output[0])
 
 
 rule build_load_data:
@@ -162,7 +162,7 @@ if config['enable'].get('retrieve_cutout', True):
     rule retrieve_cutout:
         input: HTTP.remote("zenodo.org/record/4709858/files/{cutout}.nc", keep_local=True, static=True)
         output: "cutouts/{cutout}.nc"
-        shell: "mv {input} {output}"
+        run: move(input[0], output[0])
 
 
 if config['enable'].get('build_natura_raster', False):
@@ -179,7 +179,7 @@ if config['enable'].get('retrieve_natura_raster', True):
     rule retrieve_natura_raster:
         input: HTTP.remote("zenodo.org/record/4706686/files/natura.tiff", keep_local=True, static=True)
         output: "resources/natura.tiff"
-        shell: "mv {input} {output}"
+        run: move(input[0], output[0])
 
 
 rule build_renewable_profiles: