Patch release 1.2.1

jazzband · Oct 28, 2015 · 5c1e214 · 5c1e214
1 parent 6af934b
commit 5c1e214
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,4 +1,4 @@
 [bumpversion]
-current_version = 1.2.0
+current_version = 1.2.1
 files = setup.py docs/conf.py
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -53,7 +53,7 @@
 #
 
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.2.1'
 
 # The short X.Y version.
 version = '.'.join(release.split('.')[0:2])

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
@@ -1,6 +1,18 @@
 Release Notes
 =============
 
+1.2.1
+-----
+* Fix: Resolved an issue with django_otp 0.3.2 and higher
+
+1.2.0
+-----
+* Fix: Issue with migrations on Py3 (#87)
+* Fix: Fixed failing migration on Django 1.7.0 (#83)
+* Fix: Issue with pip unable to install package
+* Dropped support for Django 1.5 and 1.6
+* Added support for Django 1.8
+
 1.1.1
 -----
 * Fix: Resolved a warning from Django 1.7 migrations (#80).

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='django-two-factor-auth',
-    version='1.2.0',
+    version='1.2.1',
     description='Complete Two-Factor Authentication for Django',
     long_description=open('README.rst').read(),
     author='Bouke Haarsma',