From 2052c82e44e8ed9b48ada69977ad9cc44f08931d Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Wed, 20 Dec 2017 14:59:48 +0200
Subject: [PATCH] Preparing release 2.16.0

---
 CHANGES.rst                 | 12 +++++++++---
 Makefile                    |  9 +++++++++
 release.mk                  | 14 ++++++++------
 setup.py                    |  1 +
 src/irclog2html/_version.py |  4 ++--
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index c5a62c6..54014ca 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,12 +1,18 @@
 Changelog
 =========
 
-2.15.4 (unreleased)
+2.16.0 (2017-12-20)
 -------------------
 
 - Support Python 3.6.
-- Fix for duplicated lines with the same time where the resulting HTML ``id`` anchors would evolve into long form like "t22:24:49-2-3-4-5-6-7-8-9-10" instead of "t22:24:49-10" resulting in significant output file sizes grow in some cases
-- Add --output-dir (-o) parameter to logs2html allowing to place resulting files in a directory different from input catalogue
+
+- Fix for duplicated lines with the same time where the resulting HTML ``id``
+  anchors would evolve into long form like "t22:24:49-2-3-4-5-6-7-8-9-10"
+  instead of "t22:24:49-10" resulting in significant output file size growth
+  in some cases.
+
+- Add --output-dir (-o) parameter to logs2html so you can place the generated
+  HTML files in a directory different from the input directory.
 
 
 2.15.3 (2016-12-08)
diff --git a/Makefile b/Makefile
index b747d4c..03db145 100644
--- a/Makefile
+++ b/Makefile
@@ -46,8 +46,17 @@ clean:
 	rm -f testcases/*.html testcases/*.css
 
 
+.PHONY: releasechecklist
+releasechecklist: check-date  # also release.mk will add other checks
+
 include release.mk
 
+.PHONY: check-date
+check-date:
+	@date_line="__date__ = '`date +%Y-%m-%d`'" && \
+	    grep -q "^$$date_line$$" $(FILE_WITH_VERSION) || { \
+	        echo "$(FILE_WITH_VERSION) doesn't specify $$date_line"; exit 1; }
+
 
 python:
 	virtualenv -p $(PYTHON) python
diff --git a/release.mk b/release.mk
index 6a21f5c..8179a56 100644
--- a/release.mk
+++ b/release.mk
@@ -1,6 +1,7 @@
-# Makefile.rules version 1.0 (2017-12-19)
+# Makefile.rules version 1.1 (2017-12-20)
 #
 # Helpful Makefile rules for releasing Python packages.
+# https://github.com/mgedmin/python-project-skel
 
 # You might want to change these
 FILE_WITH_VERSION ?= setup.py
@@ -10,15 +11,18 @@ CHANGELOG_FORMAT ?= $(changelog_ver) ($(changelog_date))
 
 # These should be fine
 PYTHON ?= python
-PYPI_PUBLISH ?= rm -rf dist && $(PYTHON) setup.py -q sdist bdist_wheel && twine upload dist/* && $(VCS_TAG) `$(PYTHON) setup.py --version`
+PYPI_PUBLISH ?= rm -rf dist && $(PYTHON) setup.py -q sdist bdist_wheel && twine upload dist/*
 
 # These should be fine, as long as you use Git
 VCS_GET_LATEST ?= git pull
 VCS_STATUS ?= git status --porcelain
 VCS_EXPORT ?= git archive --format=tar --prefix=tmp/tree/ HEAD | tar -xf -
-VCS_TAG ?= git tag -s
+VCS_TAG ?= git tag -s $(changelog_ver) -m \"Release $(changelog_ver)\"
 VCS_COMMIT_AND_PUSH ?= git commit -av -m "Post-release version bump" && git push && git push --tags
 
+# These are internal implementation details
+changelog_ver = `$(PYTHON) setup.py --version`
+changelog_date = `LC_ALL=C date +'$(CHANGELOG_DATE_FORMAT)'`
 
 
 .PHONY: dist
@@ -81,9 +85,6 @@ check-version-number:
 check-long-description:
 	@$(PYTHON) setup.py --long-description | rst2html --exit-status=2 > /dev/null
 
-changelog_ver = `$(PYTHON) setup.py --version`
-changelog_date = `LC_ALL=C date +'$(CHANGELOG_DATE_FORMAT)'`
-
 .PHONY: check-changelog
 check-changelog:
 	@ver_and_date="$(CHANGELOG_FORMAT)" && \
@@ -106,6 +107,7 @@ define release_recipe =
 	@echo "Please run"
 	@echo
 	@echo "  $(PYPI_PUBLISH)"
+	@echo "  $(VCS_TAG)"
 	@echo
 	@echo "Please increment the version number in $(FILE_WITH_VERSION)"
 	@echo "and add a new empty entry at the top of the changelog in $(FILE_WITH_CHANGELOG), then"
diff --git a/setup.py b/setup.py
index cce52cd..6a38ea3 100755
--- a/setup.py
+++ b/setup.py
@@ -44,6 +44,7 @@ def read(filename):
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
+    keywords='irc log colorizer html wsgi',
     extras_require=dict(test=[
         "mock",
         "zope.testing",
diff --git a/src/irclog2html/_version.py b/src/irclog2html/_version.py
index dc1e5e2..720282e 100644
--- a/src/irclog2html/_version.py
+++ b/src/irclog2html/_version.py
@@ -1,3 +1,3 @@
-__version__ = '2.15.4.dev0'
-__date__ = '2016-12-08'
+__version__ = '2.16.0'
+__date__ = '2017-12-20'
 __homepage__ = 'https://mg.pov.lt/irclog2html/'