Merge 76b2fa9 into 3cbedf8

vittoriozamboni · Jan 11, 2019 · 92aa1b6 · 92aa1b6
2 parents 3cbedf8 + 76b2fa9
commit 92aa1b6
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 25 deletions.
diff --git a/.coverage b/.coverage
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -1,5 +1,7 @@
 Changelog
 =========
+- 19-01-11 (0.6.2):
+    - Added migrations for expiration_date and verbose names
 - 18-01-18 (0.6.1):
     - Added support for Django 2
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -14,6 +14,7 @@
 
 import sys
 import os
+from datetime import datetime
 
 base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../'))
 sys.path.insert(1, base_path)
@@ -57,16 +58,16 @@
 
 # General information about the project.
 project = u'Django Groups Manager'
-copyright = u'2014-2016, Vittorio Zamboni'
+copyright = u'2014-%s, Vittorio Zamboni' % datetime.today().year
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.3'
+version = '0.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.0'
+release = '0.6.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/groups_manager/__init__.py b/groups_manager/__init__.py
@@ -1 +1 @@
-VERSION = '0.6.1'
+VERSION = '0.6.2'
diff --git a/...ger/migrations/0005_auto_20181219_0925.py → ...005_0_6_2_verbose_name_expiration_date.py b/...ger/migrations/0005_auto_20181219_0925.py → ...005_0_6_2_verbose_name_expiration_date.py
@@ -14,6 +14,11 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.AlterField(
+            model_name='groupmember',
+            name='expiration_date',
+            field=models.DateTimeField(blank=True, default=None, null=True),
+        ),
         migrations.AlterField(
             model_name='group',
             name='codename',

diff --git a/groups_manager/migrations/0005_auto_20181001_1009.py b/groups_manager/migrations/0005_auto_20181001_1009.py
diff --git a/testproject/requirements-django-1.7.txt b/testproject/requirements-django-1.7.txt
@@ -0,0 +1,8 @@
+awesome-slugify
+django<1.8
+django-braces<1.9
+django-guardian<1.4
+django-mptt<0.8
+jsonfield<2
+
+django-extensions<1.7