Merge branch 'main' into fix/resource_parsing

cmeesters · web-flow · commit 26de8e1d7773 · 2025-04-04T16:36:22.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Changelog
 
 
+## [9.1.7](https://github.com/snakemake/snakemake/compare/v9.1.6...v9.1.7) (2025-04-04)
+
+
+### Bug Fixes
+
+* only use temporary persistence directory in remote jobs when persistence is not shared via the FS ([#3513](https://github.com/snakemake/snakemake/issues/3513)) ([818a385](https://github.com/snakemake/snakemake/commit/818a3851a075e3439d0f77234992fbba07016319))
+
+
+### Documentation
+
+* fix definition of --default-resources behavior ([8e54115](https://github.com/snakemake/snakemake/commit/8e541150873d42d97f08e502fc46af433f0c4a61))
+
 ## [9.1.6](https://github.com/snakemake/snakemake/compare/v9.1.5...v9.1.6) (2025-04-03)
 
 
diff --git a/src/snakemake/workflow.py b/src/snakemake/workflow.py
@@ -835,6 +835,7 @@ def files(items):
                 self.storage_settings is not None
                 and SharedFSUsage.PERSISTENCE
                 not in self.storage_settings.shared_fs_usage
+                and self.remote_exec
             )
             else None
         )

Original file line number	Diff line number	Diff line change
`@@ -835,6 +835,7 @@ def files(items):`
`835`	`835`	`self.storage_settings is not None`
`836`	`836`	`and SharedFSUsage.PERSISTENCE`
`837`	`837`	`not in self.storage_settings.shared_fs_usage`
	`838`	`+ and self.remote_exec`
`838`	`839`	`)`
`839`	`840`	`else None`
`840`	`841`	`)`