From 7e91bfc579c1153a3fdc6ab003301d80496169c1 Mon Sep 17 00:00:00 2001
From: Phil Ewels <phil.ewels@scilifelab.se>
Date: Thu, 3 Dec 2020 16:05:57 +0100
Subject: [PATCH 1/2] Bump version for v.1.12.1 release

---
 CHANGELOG.md | 19 ++++++++-----------
 setup.py     |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f583d4f5be..b61e50839f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +1,21 @@
 # nf-core/tools: Changelog
 
-## v1.13dev
+## [v1.12.1 - Silver Dolphin](https://github.com/nf-core/tools/releases/tag/1.12.1) - [2020-12-03]
 
-* Swapped PyInquirer with questionary for command line questions in `launch.py` [[#726](https://github.com/nf-core/tools/issues/726)]
-  * This should fix conda installation issues that some people had been hitting
-  * The change also allows other improvements to the UI
+### Template
+
+* Finished switch from `$baseDir` to `$projectDir` in `iGenomes.conf` and `main.nf`
+  * Main fix is for `smail_fields` which was a bug introduced in the previous release. Sorry about that!
 
 ### Tools helper code
 
 * Pipeline schema: make parameters of type `range` to `number`. [[#738](https://github.com/nf-core/tools/issues/738)]
 * Respect `$NXF_HOME` when looking for pipelines with `nf-core list` [[#798](https://github.com/nf-core/tools/issues/798)]
-
-### Template
-
-### Linting
-
+* Swapped PyInquirer with questionary for command line questions in `launch.py` [[#726](https://github.com/nf-core/tools/issues/726)]
+  * This should fix conda installation issues that some people had been hitting
+  * The change also allows other improvements to the UI
 * Fix linting crash when a file deleted but not yet staged in git [[#796](https://github.com/nf-core/tools/issues/796)]
 
-### Other
-
 ## [v1.12 - Mercury Weasel](https://github.com/nf-core/tools/releases/tag/1.12) - [2020-11-19]
 
 ### Tools helper code
diff --git a/setup.py b/setup.py
index aaf543a065..7cd0ebbe25 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 import sys
 
-version = "1.13dev"
+version = "1.12.1"
 
 with open("README.md") as f:
     readme = f.read()

From a57a825e1411d65e72b9b11ae31a9d256c553707 Mon Sep 17 00:00:00 2001
From: Phil Ewels <phil.ewels@scilifelab.se>
Date: Thu, 3 Dec 2020 16:19:02 +0100
Subject: [PATCH 2/2] Changelog for nf-core/tools#788

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b61e50839f..db034a4e99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 * Finished switch from `$baseDir` to `$projectDir` in `iGenomes.conf` and `main.nf`
   * Main fix is for `smail_fields` which was a bug introduced in the previous release. Sorry about that!
+* Ported a number of small content tweaks from nf-core/eager to the template [[#786](https://github.com/nf-core/tools/issues/786)]
+  * Better contributing documentation, more placeholders in documentation files, more relaxed markdownlint exceptions for certain HTML tags, more content for the PR and issue templates.
 
 ### Tools helper code