From 016eda9f3c014b0777272f0f7119084f575e7c17 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Thu, 6 Jun 2019 08:30:11 -0700
Subject: [PATCH] v1.17.0

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 setup.cfg    |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79629b79..fc1a2d30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+1.17.0 - 2019-06-06
+===================
+
+### Features
+- Produce better output on `^C`
+    - #1030 PR by @asottile.
+- Warn on unknown keys at the top level and repo level
+    - #1028 PR by @yoavcaspi.
+    - #1048 PR by @asottile.
+
+### Fixes
+- Fix handling of `^C` in wrapper script in python 3.x
+    - #1027 PR by @asottile.
+- Fix `rmtree` for non-writable directories
+    - #1042 issue by @detailyang.
+    - #1043 PR by @asottile.
+- Pass `--color` option to `git diff` in `--show-diff-on-failure`
+    - #1007 issue by @chadrik.
+    - #1051 PR by @mandarvaze.
+
+### Misc.
+- Fix test when `pre-commit` is installed globally
+    - #1032 issue by @yoavcaspi.
+    - #1045 PR by @asottile.
+
+
 1.16.1 - 2019-05-08
 ===================
 
diff --git a/setup.cfg b/setup.cfg
index eca74cc8..3793677e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = pre_commit
-version = 1.16.1
+version = 1.17.0
 description = A framework for managing and maintaining multi-language pre-commit hooks.
 long_description = file: README.md
 long_description_content_type = text/markdown