From 14efe2b12a55c433b4e9d142b062e7980be13992 Mon Sep 17 00:00:00 2001 From: Tim Booth Date: Thu, 10 Oct 2024 16:45:45 +0100 Subject: [PATCH] Some tidying up and typo fixes --- episodes/03-chaining_rules.md | 4 ++-- episodes/04-logs_and_errors.md | 6 +++--- episodes/06-expansion.md | 11 ++++++----- episodes/11-conda_integration.md | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/episodes/03-chaining_rules.md b/episodes/03-chaining_rules.md index c753910..f2d283b 100644 --- a/episodes/03-chaining_rules.md +++ b/episodes/03-chaining_rules.md @@ -1,7 +1,7 @@ --- title: Chaining rules -teaching: 40 -exercises: 30 +teaching: 30 +exercises: 20 --- ::::::::::::::::::::::::::::::::::::::: objectives diff --git a/episodes/04-logs_and_errors.md b/episodes/04-logs_and_errors.md index c020a4c..a4991c2 100644 --- a/episodes/04-logs_and_errors.md +++ b/episodes/04-logs_and_errors.md @@ -1,7 +1,7 @@ --- -title: Adding logs, and understanding errors -teaching: 40 -exercises: 30 +title: Complex outputs, logs and errors +teaching: 30 +exercises: 20 --- ::::::::::::::::::::::::::::::::::::::: objectives diff --git a/episodes/06-expansion.md b/episodes/06-expansion.md index 4966a4b..03863ea 100644 --- a/episodes/06-expansion.md +++ b/episodes/06-expansion.md @@ -13,10 +13,9 @@ exercises: 30 :::::::::::::::::::::::::::::::::::::::: questions -- How do I process multiple files at once? - How do I define a default set of outputs for my Snakefile? -- How do I make Snakemake detect what to process? -- How do I combine multiple files together? +- How do I make rules which combine whole lists of files? +- How do I process all available input files at once? :::::::::::::::::::::::::::::::::::::::::::::::::: @@ -416,10 +415,12 @@ this episode.* :::::::::::::::::::::::::::::::::::::::: keypoints - Rename your input files if necessary to maintain consistent naming -- List the things you want to proces as global variables, or discover input files with `glob_wildcards()` +- List the things you want to proces as global variables, or discover input files with + `glob_wildcards()` - Use the `expand()` function to generate lists of filenames you want to combine - These functions can be tested in the Python interpreter -- Any `{input}` to a rule can be a variable-length list, but variable lists of outputs are trickier and rarely needed +- Any `{input}` to a rule can be a variable-length list +- (But variable lists of outputs are trickier and rarely needed) :::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/episodes/11-conda_integration.md b/episodes/11-conda_integration.md index a5ce57d..36191dd 100644 --- a/episodes/11-conda_integration.md +++ b/episodes/11-conda_integration.md @@ -97,7 +97,7 @@ regarding the channel configuration in this course. ::::::::::::::::::::::::::::::::::::::: challenge -## Queryting and installing Conda packages +## Querying and installing Conda packages 1. Find out what version of *fastx\_toolkit* is installed in the current conda environment.