From 74fcaa65741c4ea5f4613748db71da6230e5a908 Mon Sep 17 00:00:00 2001
From: Tyler Reddy <tyler.je.reddy@gmail.com>
Date: Wed, 30 Dec 2020 08:13:47 -0700
Subject: [PATCH] MAINT: prepare for 1.6.0 final

* update the `1.6.0` release notes after the backporting of gh-13255
(the patch proper, but not the testing changes--see comments there)
and to remove the "Note" about `1.6.0` not being released yet

* bump the version to `1.6.0` "final" (removing the rc2)
unreleased
---
 doc/release/1.6.0-notes.rst | 5 +++--
 setup.py                    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/release/1.6.0-notes.rst b/doc/release/1.6.0-notes.rst
index c820b087e071..8f9cd87bc17b 100644
--- a/doc/release/1.6.0-notes.rst
+++ b/doc/release/1.6.0-notes.rst
@@ -2,8 +2,6 @@
 SciPy 1.6.0 Release Notes
 ==========================
 
-.. note:: Scipy 1.6.0 is not released yet!
-
 .. contents::
 
 SciPy 1.6.0 is the culmination of 6 months of hard work. It contains
@@ -591,6 +589,7 @@ Issues closed for 1.6.0
 * `#13191 <https://github.com/scipy/scipy/issues/13191>`__: \`scipy.linalg.lapack.dgesjv\` overwrites original arrays if...
 * `#13207 <https://github.com/scipy/scipy/issues/13207>`__: TST: Erratic test failure in test_cossin_separate
 * `#13221 <https://github.com/scipy/scipy/issues/13221>`__: BUG: pavement.py glitch
+* `#13239 <https://github.com/scipy/scipy/issues/13239>`__: Segmentation fault with \`eigh(..., driver="evx")\` for 10x10...
 * `#13248 <https://github.com/scipy/scipy/issues/13248>`__: ndimage: improper cval handling for complex-valued inputs
 
 Pull requests for 1.6.0
@@ -938,5 +937,7 @@ Pull requests for 1.6.0
 * `#13226 <https://github.com/scipy/scipy/pull/13226>`__: BUG: pavement.py file handle fixes
 * `#13249 <https://github.com/scipy/scipy/pull/13249>`__: Handle cval correctly for ndimage functions with complex-valued...
 * `#13253 <https://github.com/scipy/scipy/pull/13253>`__: BUG,MAINT: Ensure all Pool objects are closed
+* `#13255 <https://github.com/scipy/scipy/pull/13255>`__: BUG:linalg: Fix heevx wrappers and add new tests
 * `#13260 <https://github.com/scipy/scipy/pull/13260>`__: CI: fix macOS testing
 * `#13269 <https://github.com/scipy/scipy/pull/13269>`__: CI: github actions: In the linux dbg tests, update apt before...
+* `#13279 <https://github.com/scipy/scipy/pull/13279>`__: MAINT: 1.6.0 rc2 backports
diff --git a/setup.py b/setup.py
index a456d96735f2..a922c79ebcb7 100755
--- a/setup.py
+++ b/setup.py
@@ -56,8 +56,8 @@
 MAJOR = 1
 MINOR = 6
 MICRO = 0
-ISRELEASED = True
-VERSION = '%d.%d.%drc2' % (MAJOR, MINOR, MICRO)
+ISRELEASED = False
+VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
 
 
 # Return the git revision as a string