Merge pull request #790 from davide-f/fix_snakemake_windows

bugfix: Fix admin needs for windows
pypsa-meets-earth · Jul 16, 2023 · 33c69da · 33c69da
2 parents ea30382 + 7b44631
commit 33c69da
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@
 *.pbf
 *.zip
 *.png
+*.done
 
 # Untracked files
 config.yaml

diff --git a/Snakefile b/Snakefile
@@ -701,7 +701,7 @@ if config["monte_carlo"]["options"].get("add_to_snakefile", False) == False:
         resources:
             mem=memory,
         shadow:
-            "shallow"
+            "copy-minimal" if os.name == "nt" else "shallow"
         script:
             "scripts/solve_network.py"
 

diff --git a/envs/environment.yaml b/envs/environment.yaml
@@ -12,7 +12,7 @@ dependencies:
 - pip
 - mamba   # esp for windows build
 
-- pypsa>=0.23, <0.25
+- pypsa>=0.24, <0.25
 # - atlite>=0.2.4  # until https://github.com/PyPSA/atlite/issues/244 is not merged
 - dask
 - powerplantmatching>=0.5.7

diff --git a/tests.done b/tests.done
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ @@
     *.pbf
     *.zip
     *.png
+    *.done
     # Untracked files
     config.yaml
@@ Expand Down @@