From e4f4d4a34bb8504923e15df2a981b20841843d03 Mon Sep 17 00:00:00 2001
From: "David A. Wheeler" <dwheeler@dwheeler.com>
Date: Mon, 21 Jan 2019 18:54:01 -0500
Subject: [PATCH] Set version number for next release (2.0.9)

Change the version number *now*, before release, so that we won't
accidentally release software with a duplicate version number later.
Also, tweak the release_process.md documentation to clarify a few things.

Signed-off-by: David A. Wheeler <dwheeler@dwheeler.com>
---
 flawfinder         |  2 +-
 flawfinder.spec    |  2 +-
 makefile           |  2 +-
 release_process.md | 30 +++++++++++++++++++++++++-----
 setup.py           |  2 +-
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/flawfinder b/flawfinder
index c7ae8ff..6ff3173 100755
--- a/flawfinder
+++ b/flawfinder
@@ -55,7 +55,7 @@ import csv  # To support generating CSV format
 import hashlib
 # import formatter
 
-version = "2.0.8"
+version = "2.0.9"
 
 # Program Options - these are the default values.
 # TODO: Switch to boolean types where appropriate.
diff --git a/flawfinder.spec b/flawfinder.spec
index 391411c..e221721 100644
--- a/flawfinder.spec
+++ b/flawfinder.spec
@@ -1,6 +1,6 @@
 Name: flawfinder
 Summary: Examines C/C++ source code for security flaws
-Version: 2.0.8
+Version: 2.0.9
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
diff --git a/makefile b/makefile
index 8d87cab..adb2f97 100644
--- a/makefile
+++ b/makefile
@@ -6,7 +6,7 @@
 # how to change version numbers.
 
 NAME=flawfinder
-VERSION=2.0.8
+VERSION=2.0.9
 RPM_VERSION=1
 VERSIONEDNAME=$(NAME)-$(VERSION)
 ARCH=noarch
diff --git a/release_process.md b/release_process.md
index 38faacc..32721fd 100644
--- a/release_process.md
+++ b/release_process.md
@@ -4,7 +4,7 @@ Here's information on how to release an update to flawfinder.
 
 ## Changing version number
 
-You should really change the version number before changing anything else.
+Ensure that the version number is the intended final value.
 Make sure every release has a unique version number.
 
 To change version number, edit the following files:
@@ -12,7 +12,7 @@ makefile
 flawfinder
 flawfinder.spec
 setup.py
-index.html
+index.html # in dwheeler.com/flawfinder
 
 Then run:
 
@@ -32,7 +32,8 @@ Once you're sure this is the *real* version, tag it:
 
 ~~~~
 git tag VERSION
-git push --tags
+git push --tags origin # SourceForge
+git push --tags github # GitHub
 ~~~~
 
 ## Create tarball
@@ -52,16 +53,35 @@ the usual places:
 * SourceForge "files" directory, and set it to be the default download.
 * dwheeler.com/flawfinder
 
+Do this *before* creating the PyPi distribution package for pip.
+
 ## Post to pip
 
-Create a PyPi distribution package:
+First, install the programs to create a PyPi distribution package
+if they are not already installed.  On Cygwin first run:
+
+~~~~
+python -m ensurepip
+pip install --upgrade pip
+pip install wheel
+pip install twine
+~~~~
+
+Then create a PyPi distribution package (for Python2 and Python3):
 
 ~~~~
 make pypi
 ~~~~
 
-And upload it:
+Now upload the PyPi distribution package:
 
 ~~~~
 make upload-pypi
 ~~~~
+
+## After it's uploaded
+
+Change the version number in the repo NOW, so that there will not
+be two different released versions with the same version number.
+See the list at the beginning of this document for the list of
+files to change.
diff --git a/setup.py b/setup.py
index cc89878..b0c2970 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ from setuptools import setup # Don't need find_packages
 
 setup (# Distribution meta-data
        name = "flawfinder",
-       version = "2.0.8",
+       version = "2.0.9",
        # We install a script, not a separate package.
        # packages = ["flawfinder"], # Must be same as name
        # Do not need: packages=find_packages(),