From 2551a2becf8520d9c3624247d7c40dfb7f1f0c48 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Tue, 1 Feb 2022 19:42:52 -0500
Subject: [PATCH] build: prep for 6.3.1

---
 CHANGES.rst         | 6 ++++--
 coverage/version.py | 2 +-
 doc/conf.py         | 6 +++---
 doc/index.rst       | 2 +-
 howto.txt           | 1 +
 igor.py             | 9 ++++++++-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index abe26bec3..a7b0acbd2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -17,8 +17,10 @@ development at the same time, such as 4.5.x and 5.0.
     ..  Version 9.8.1 — 2027-07-27
     ..  --------------------------
 
-Unreleased
-----------
+.. _changes_631:
+
+Version 6.3.1 — 2022-02-01
+--------------------------
 
 - Fix: deadlocks could occur when terminating processes.  Some of these
   deadlocks (described in `issue 1310`_) are now fixed.
diff --git a/coverage/version.py b/coverage/version.py
index a73e0bda1..4fd896eed 100644
--- a/coverage/version.py
+++ b/coverage/version.py
@@ -5,7 +5,7 @@
 # This file is exec'ed in setup.py, don't import anything!
 
 # Same semantics as sys.version_info.
-version_info = (6, 3, 1, "alpha", 0)
+version_info = (6, 3, 1, "final", 0)
 
 
 def _make_version(major, minor, micro, releaselevel, serial):
diff --git a/doc/conf.py b/doc/conf.py
index 06c49dd1b..2ca989119 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -64,11 +64,11 @@
 # built documents.
 #
 # The short X.Y version.
-version = "6.3"                                 # CHANGEME
+version = "6.3.1"                               # CHANGEME
 # The full version, including alpha/beta/rc tags.
-release = "6.3"                                 # CHANGEME
+release = "6.3.1"                               # CHANGEME
 # The date of release, in "monthname day, year" format.
-release_date = "January 25, 2022"               # CHANGEME
+release_date = "February 1, 2022"               # CHANGEME
 
 rst_epilog = """
 .. |release_date| replace:: {release_date}
diff --git a/doc/index.rst b/doc/index.rst
index f875f4f84..c7e44debe 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -25,7 +25,7 @@ supported on:
 .. ifconfig:: prerelease
 
     **This is a pre-release build.  The usual warnings about possible bugs
-    apply.** The latest stable version is coverage.py 6.3, `described here`_.
+    apply.** The latest stable version is coverage.py 6.3.1, `described here`_.
 
 
 .. _described here: http://coverage.readthedocs.io/
diff --git a/howto.txt b/howto.txt
index 31c39cf53..611e806c5 100644
--- a/howto.txt
+++ b/howto.txt
@@ -8,6 +8,7 @@
         version_info = (4, 0, 2, "final", 0)
 - Supported Python version numbers. Search for "PYVERSIONS".
 - Copyright date in NOTICE.txt
+- run `python igor.py cheats` to get useful snippets for next steps.
 - Update CHANGES.rst, including release date.
     - don't forget the jump target
 - Update README.rst
diff --git a/igor.py b/igor.py
index 64903c203..a086b2363 100644
--- a/igor.py
+++ b/igor.py
@@ -381,20 +381,27 @@ def do_cheats():
     print(f"Coverage version is {ver}")
 
     print(f"pip install git+https://github.com/nedbat/coveragepy@{branch}")
+
+    print("\nfor CHANGES.rst before release:")
     print(f".. _changes_{anchor}:")
     print()
     head = f"Version {ver} — {datetime.datetime.now():%Y-%m-%d}"
     print(head)
     print("-" * len(head))
 
+    print("\ngit commands:")
     print(f'git tag -a -m "Version {ver}" {ver}')
     print(f'git branch -f stable {ver}')
     print(f"https://coverage.readthedocs.io/en/{ver}/changes.html#changes-{anchor}")
 
+    print(
+        "This is now released as part of " +
+        f"[coverage {ver}](https://pypi.org/project/coverage/{ver})."
+    )
     print("\nnext:")
     next_vi = (vi[0], vi[1], vi[2]+1, "alpha", 0)
     print(f"version_info = {next_vi}".replace("'", '"'))
-    print("for CHANGES.rst:")
+    print("\nfor CHANGES.rst after release:")
     print(textwrap.dedent("""\
         Unreleased
         ----------