From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4ea1::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms12 with LMTPS id 5Y04GjhSFGJVNgAAsNZ9tg (envelope-from ); Tue, 22 Feb 2022 03:02:16 +0000 Received: from out1.migadu.com ([2001:41d0:2:863f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id EPq7FjhSFGLXZQEAG6o9tA (envelope-from ); Tue, 22 Feb 2022 04:02:16 +0100 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1645498936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ktLWW+Bcde6E2HAOGHsoA98rBtmh2OqPRhh4OLkfMZE=; b=ag4lBlF9LNAurlddOXZm34iuM0Q4RbXBVHFiwuby8tF5aqpMnhRAjwDS07Kw790M/SItY5 wrlm3vWWhvEQWPy9N0QsHy2hhHXGLTS5QAUJ1z7sgEFcEyUG54YyByYZ+ceSgCy3ETb0Sm hA7uudngx6CZweezwl3u/yGjI3Ll2gvt3t+xQ7tOcdhSU3YW8kqtfZgXZ40+d3GNuG3Z6t D2sGDfCKoidz+2T6qmwl4v+vDl2QtiezgRNZhbn5mpXHL8ojRpOZ7Kv2zqPI+RKYxwWMCA KzBTHlkCZmEIXTOOUzz94NIRaL8JIARmVgE9kPSoPZRf+LyVWDNtd07DTgJWjQ== From: Kyle Meyer To: snakemake-mode@inbox.kyleam.com Subject: [PATCH 2/3] transient: Replace --jobs with --cores Date: Mon, 21 Feb 2022 22:02:06 -0500 Message-Id: <20220222030207.204401-3-kyle@kyleam.com> In-Reply-To: <20220222030207.204401-1-kyle@kyleam.com> References: <20220222030207.204401-1-kyle@kyleam.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyleam.com X-TUID: c1ZPBvso+ymt --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. --- NEWS | 4 ++++ snakemake.el | 12 ++++++------ 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 @@ (transient-define-argument snakemake:--allowed-rules () :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 @@ (transient-define-prefix snakemake ("-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) -- 2.34.0