From 78c7db2f4bea09b8580be84757cf77863ed59acc Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Mon, 16 Mar 2020 12:00:21 +0100
Subject: [PATCH] release EasyBuild v4.1.2

---
 docs/Changelog.rst     |  1 +
 docs/Release_notes.rst | 30 ++++++++++++++++++++++++++++++
 docs/conf.py           |  4 ++--
 setup.py               | 18 +++++++++++++++---
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/docs/Changelog.rst b/docs/Changelog.rst
index 50e67e0c..967c3f0a 100644
--- a/docs/Changelog.rst
+++ b/docs/Changelog.rst
@@ -5,6 +5,7 @@ Changelog for EasyBuild documentation
 
 (for EasyBuild release notes, see :ref:`release_notes`)
 
+* **release 20200316.01** (`Mar 16th 2020`): update release notes for EasyBuild v4.1.2 (see :ref:`release_notes_eb412`)
 * **release 20200116.01** (`Jan 16th 2020`): update release notes for EasyBuild v4.1.1 (see :ref:`release_notes_eb411`)
 * **release 20191204.01** (`Dec 4th 2019`): update release notes for EasyBuild v4.1.0 (see :ref:`release_notes_eb410`)
 * **release 20191015.01** (`Oct 15th 2019`): update release notes for EasyBuild v4.0.1 (see :ref:`release_notes_eb401`)
diff --git a/docs/Release_notes.rst b/docs/Release_notes.rst
index 425d5776..bd584692 100644
--- a/docs/Release_notes.rst
+++ b/docs/Release_notes.rst
@@ -9,6 +9,36 @@ alongside 8,964 easyconfig files.
 
 .. note:: See also the :ref:`concise overview of major changes in EasyBuild v4.0 <eb4_changes_overview>`.
 
+.. _release_notes_eb412:
+
+EasyBuild v4.1.2 (March 16th 2020)
+----------------------------------
+
+bugfix release
+
+.. note::
+
+  This release includes a bug fix for the leaking of your GitHub token in the EasyBuild (debug) log file.
+
+  **We strongly encourage that you revoke the GitHub tokens you are using currently, via** https://github.com/settings/tokens,
+  **and to replace them using a new token (using** ``eb --install-github-token --force`` **).**
+
+  More information in https://github.com/easybuilders/easybuild-framework/pull/3248 .
+
+**framework**
+
+* fix gitdb dependency on Python 2.6 in test configuration (`#3212 <https://github.com/easybuilders/easybuild-framework/pull/3212>`_)
+* fix broken test for --review-pr by using different PR to test with (`#3226 <https://github.com/easybuilders/easybuild-framework/pull/3226>`_)
+* censor authorization part of headers before logging ReST API request (`#3248 <https://github.com/easybuilders/easybuild-framework/pull/3248>`_)
+
+**easyblocks**
+
+*(no changes)*
+
+**easyconfigs**
+
+*(no changes)*
+
 .. _release_notes_eb411:
 
 EasyBuild v4.1.1 (January 16th 2020)
diff --git a/docs/conf.py b/docs/conf.py
index ff66c81c..1ed64c26 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,9 +41,9 @@
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '4.1.1'  # this is meant to reference the version of EasyBuild
+version = '4.1.2'  # this is meant to reference the version of EasyBuild
 # The full version, including alpha/beta/rc tags.
-release = '20200116.0'  # this is meant to reference the version of the documentation itself
+release = '20200316.0'  # this is meant to reference the version of the documentation itself
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/setup.py b/setup.py
index 8fa7e12e..92eb5c04 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
 
 # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1"
 # 1.1-rc1 would indicate a post-release, i.e., and update of 1.1, so beware
-VERSION = '4.1.1'
+VERSION = '4.1.2'
 
 
 # Utility function to read README file
@@ -79,7 +79,19 @@ def read(fname):
     ],
     platforms="Linux",
     # for distutils
-    requires=['easybuild_%s(==%s)' % (x, VERSION) for x in ['framework', 'easyblocks', 'easyconfigs']],
+    requires=[
+        'easybuild_framework(==%s)' % VERSION,
+        # there is no 4.1.2 release for easyblocks/easyconfigs,
+        # only for framework (which includes an important security-related bug fix)
+        'easybuild_easyblocks(==4.1.1)',
+        'easybuild_easyconfigs(==4.1.1)',
+    ],
     # for setuptools/pip
-    install_requires=['easybuild-%s == %s' % (x, VERSION) for x in ['framework', 'easyblocks', 'easyconfigs']],
+    install_requires=[
+        'easybuild-framework == %s' % VERSION,
+        # there is no 4.1.2 release for easyblocks/easyconfigs,
+        # only for framework (which includes an important security-related bug fix)
+        'easybuild-easyblocks == 4.1.1',
+        'easybuild-easyconfigs == 4.1.1'
+    ],
 )