summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2022-02-21 22:02:06 -0500
committerKyle Meyer <kyle@kyleam.com>2022-02-21 22:46:40 -0500
commit53d822ba91fee2a043f6f534df7e9189dfd75b91 (patch)
tree51547ddbbd935f490ea944d215ad0eba32d5ff0b
parent49f2ea5f3cce3d33e2133df2b7e1ede752e65994 (diff)
downloadsnakemake-mode-53d822ba91fee2a043f6f534df7e9189dfd75b91.tar.gz
transient: Replace --jobs with --cores
--cores was added as a synonym for --jobs in v3.10.0 (2012), and, as of v6.5.0, --cores and --jobs are distinct things for cloud/cluster jobs. Wait to add --jobs until it's requested. Message-Id: <20220222030207.204401-3-kyle@kyleam.com>
-rw-r--r--NEWS4
-rw-r--r--snakemake.el12
2 files changed, 10 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 73e2e20..64db66f 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ NEWS -- history of user-visible changes -*- mode: org; -*-
transient, ~snakemake~. snakemake.el now depends on Transient
rather than Magit Popup.
+- The ~--jobs~ argument in the ~snakemake~ transient has been replaced
+ by ~--cores~ to follow upstream changes. ~--cores~ is bound to
+ ~-c~, and ~--use-conda~ has been moved from ~-c~ to ~-C~.
+
- The 'name' keyword (new in Snakemake v5.31.0) is now recognized.
* v1.8.0
diff --git a/snakemake.el b/snakemake.el
index 61f6cbb..91fef4f 100644
--- a/snakemake.el
+++ b/snakemake.el
@@ -733,17 +733,17 @@ $ snakemake [ARGS] -- <targets>"
:argument "--allowed-rules="
:reader 'snakemake-read-rules)
-(transient-define-argument snakemake:--jobs ()
- :description "Number of jobs"
+(transient-define-argument snakemake:--cores ()
+ :description "Number of cores"
:class 'transient-option
- :key "-j"
- :argument "--jobs=")
+ :key "-c"
+ :argument "--cores=")
;;;###autoload (autoload 'snakemake "snakemake" nil t)
(transient-define-prefix snakemake
"Transient for running Snakemake."
["Arguments"
- ("-c" "Use conda" "--use-conda")
+ ("-C" "Use conda" "--use-conda")
("-f" "Force" "--force")
("-i" "Ignore temp()" "--notemp")
("-n" "Dry run" "--dryrun")
@@ -751,7 +751,7 @@ $ snakemake [ARGS] -- <targets>"
("-r" "Print reason" "--reason")
("-t" "Touch files" "--touch")
(snakemake:--allowed-rules)
- (snakemake:--jobs)]
+ (snakemake:--cores)]
["Actions"
[("c" "Edit and run command" snakemake-build)]
[("p" "Build target at point" snakemake-build-targets-at-point)