Merge pull request #378 from macropin/joshblum/2.7-release

prep for 2. 7 release
macropin · Jan 5, 2020 · 24224be · 24224be
2 parents bd06620 + d87c0ec
commit 24224be
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,10 +2,17 @@
 django-registration-redux changelog
 ===================================
 
-Version 2.7, TBD
+Version 2.8, TBD
 ----------------
+
+Version 2.7, 4 January, 2020
+----------------
+* Feature: Django 3.0 support - `#373
+<https://github.com/macropin/django-registration/pull/373>_`
 * Feature: Use SHA256 instead of SHA1 for `activation_key` - `#362
 <https://github.com/macropin/django-registration/pull/362>_`
+* Bugfix: Changed path reference from 'login' to 'auth_login'. -
+`#335 <https://github.com/macropin/django-registration/pull/335>_`
 
 Version 2.6, 10 April, 2019
 ----------------

diff --git a/docs/conf.py b/docs/conf.py
@@ -46,9 +46,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.6'
+version = '2.7'
 # The full version, including alpha/beta/rc tags.
-release = '2.6'
+release = '2.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/upgrade.rst b/docs/upgrade.rst
@@ -14,12 +14,17 @@ Django version requirement
 
 As of |version|, |project| requires Django 1.11 or newer;
 older Django releases may work, but are officially unsupported. Additionally,
-|project| officially supports Python 2.7, 3.4, and 3.5, 3.6.
+|project| officially supports Python 2.7, 3.5, 3.6, 3.7 and 3.8.
 
 
 Backwards-incompatible changes
 ------------------------------
 
+Version 2.7
+```````````
+
+- None
+
 Version 2.6
 ```````````
 

diff --git a/registration/__init__.py b/registration/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (2, 6, 0, 'final', 0)
+VERSION = (2, 7, 0, 'final', 0)
 
 
 def get_version():

diff --git a/setup.py b/setup.py
@@ -48,10 +48,10 @@ def run_tests(self):
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Utilities'
     ],

diff --git a/tox.ini b/tox.ini
@@ -6,7 +6,7 @@
 [tox]
 envlist =
     py{27,34,35,36,37}-django111,
-    py3{4,5,6,7}-django20,
+    py3{5,6,7}-django20,
     py3{5,6,7}-django21,
     py3{5,6,7}-django22,
     py3{6,7,8}-django30,
@@ -25,7 +25,6 @@ deps =
 [travis]
 python =
   2.7: py27
-  3.4: py34
   3.5: py35
   3.6: py36
   3.7: py37