From 883bd4204629bd5e6c7dac1aaa165a3600d63494 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Tue, 3 Oct 2017 21:16:16 -0700
Subject: [PATCH] v1.2.0

---
 CHANGELOG.md | 22 ++++++++++++++++++++++
 setup.py     |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e6fe248..0d3388bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+1.2.0
+=====
+
+### Features
+- Add `pygrep` language
+    - `pygrep` aims to be a more cross-platform alternative to `pcre` hooks.
+    - #630 PR by @asottile.
+
+### Fixes
+- Use `pipes.quote` for executable path in hook template
+    - Fixes bash syntax error when git dir contains spaces
+    - #626 PR by @asottile.
+- Clean up hook template
+    - Simplify code
+    - Fix `--config` not being respected in some situations
+    - #627 PR by @asottile.
+- Use `file://` protocol for cloning under test
+    - Fix `file://` clone paths being treated as urls for golang
+- Add `ctypes` as an import for virtualenv healthchecks
+    - Fixes python3.6.2 <=> python3.6.3 virtualenv invalidation
+    - e70825ab by @asottile.
+
 1.1.2
 =====
 
diff --git a/setup.py b/setup.py
index 76a8bd79..fbb2397c 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(
         'hooks.'
     ),
     url='https://github.com/pre-commit/pre-commit',
-    version='1.1.2',
+    version='1.2.0',
 
     author='Anthony Sottile',
     author_email='asottile@umich.edu',