From 64d59fed3da3c75558576e35807dfce6ef5cce36 Mon Sep 17 00:00:00 2001
From: Lorenz Diener <lorenzd@gmail.com>
Date: Fri, 15 Dec 2017 20:13:51 +0100
Subject: Prepare release

---
 CHANGELOG.rst | 6 +++---
 docs/conf.py  | 2 +-
 setup.py      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3e1e882..60a473e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,11 +2,11 @@ A note on versioning: This librarys major version will grow with the APIs
 version number. Breaking changes will be indicated by a change in the minor
 (or major) version number, and will generally be avoided.
 
-v1.2.0 (Preliminary)
---------------------
+v1.2.0
+------
 * BREAKING CHANGE: Renamed streaming functions to be more in line with the rest
 * POTENTIALLY BREAKING CHANGE: Added attribute-style access for returned dicts
-* 2.1.0 compatibility
+* Mastodon v2.1.0 compatibility
     * Added custom_emojis()
     * Added list(), lists(), list_accounts()
     * Added list_create(), list_update(), list_delete()
diff --git a/docs/conf.py b/docs/conf.py
index 7ee9605..aa645c8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -68,7 +68,7 @@ author = u'Lorenz Diener'
 # The short X.Y version.
 version = u'1.2'
 # The full version, including alpha/beta/rc tags.
-release = u'1.2.0 (in development)'
+release = u'1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 0cc1be1..3dccfc6 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ extras = {
 }
 
 setup(name='Mastodon.py',
-      version='1.1.2',
+      version='1.2.0',
       description='Python wrapper for the Mastodon API',
       packages=['mastodon'],
       setup_requires=['pytest-runner'],
-- 
cgit v1.2.3