From 01337621d0ce2e05e992f2e7300e4720697afb67 Mon Sep 17 00:00:00 2001
From: Karl Gordon <kgordon@stsci.edu>
Date: Wed, 20 Jun 2018 15:41:19 -0400
Subject: [PATCH] Preparing release 1.2

---
 CHANGES.rst | 12 +++++++++++-
 setup.cfg   |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1f8251d26..289eff784 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,8 +1,18 @@
-1.2 (unreleased)
+1.3 (unreleased)
 ================
 
 - no changes yet
 
+1.2 (2018-06-20)
+================
+
+- systemic velocity of galaxy can be specified
+- symlog used for flux pPDFs of with negative values
+- ASTs can be based on source density or surface brightness
+- model grid can be split up to allow parallel execution
+   - resulting pPDFs can be reassembled
+- various bugfixes
+
 1.1 (2018-04-28)
 ================
 
diff --git a/setup.cfg b/setup.cfg
index 6b3544a57..2db31b356 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -49,7 +49,7 @@ edit_on_github = False
 github_project = BEAST-Fitting/beast
 install_requires = astropy scipy tables
 # version should be PEP440 compatible (http://www.python.org/dev/peps/pep-0440)
-version = 1.2.dev
+version = 1.2
 
 [entry_points]
 astropy-package-template-example = beast.example_mod:main