diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 39d1076a..72b4fd31 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -15,6 +15,12 @@ are used for versioning (schema follows below): 0.3.4 to 0.4). - All backwards incompatible changes are mentioned in this document. +0.5.16 +------ +2015-10-05 + +- Fixes in migrations on Django 1.7. + 0.5.15 ------ 2015-09-17 diff --git a/setup.py b/setup.py index 4e1c5632..fb639882 100644 --- a/setup.py +++ b/setup.py @@ -30,6 +30,8 @@ template_dirs = [ "src/fobi/contrib/plugins/form_handlers/db_store/templates/db_store", # DB Store "src/fobi/contrib/plugins/form_handlers/mail/templates/mail", # Mail "src/fobi/contrib/plugins/form_handlers/http_repost/templates/http_repost", # Http repost + + "src/fobi/contrib/plugins/form_importers/mailchimp_importer/templates/mailchimp_importer", # MailChimp importer ] static_dirs = [ "src/fobi/static", # Core static @@ -67,7 +69,7 @@ for static_dir in static_dirs: for locale_dir in locale_dirs: locale_files += [os.path.join(locale_dir, f) for f in os.listdir(locale_dir)] -version = '0.5.15' +version = '0.5.16' install_requires = [ 'Pillow>=2.0.0', @@ -80,11 +82,10 @@ install_requires = [ 'easy-thumbnails>=1.4,<2.0', 'vishap>=0.1.3,<2.0', 'Unidecode>=0.04.1', - 'django-nine>=0.1.1', + 'django-nine>=0.1.4', ] tests_require = [ - #'simple_timer>=0.2', 'selenium', ] diff --git a/src/fobi/__init__.py b/src/fobi/__init__.py index b7490230..416584a4 100644 --- a/src/fobi/__init__.py +++ b/src/fobi/__init__.py @@ -1,6 +1,6 @@ __title__ = 'django-fobi' -__version__ = '0.5.15' -__build__ = 0x000044 +__version__ = '0.5.16' +__build__ = 0x000045 __author__ = 'Artur Barseghyan ' __copyright__ = '2014-2015 Artur Barseghyan' __license__ = 'GPL 2.0/LGPL 2.1' diff --git a/src/fobi/migrations/0001_initial.py b/src/fobi/migrations/0001_initial.py index fcee4b9a..366437e4 100644 --- a/src/fobi/migrations/0001_initial.py +++ b/src/fobi/migrations/0001_initial.py @@ -4,15 +4,18 @@ from __future__ import unicode_literals from django.db import models, migrations import autoslug.fields from django.conf import settings +from nine.versions import DJANGO_GTE_1_8 class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('auth', '0006_require_contenttypes_0002'), ] + if DJANGO_GTE_1_8: + dependencies += [('auth', '0006_require_contenttypes_0002'),] + operations = [ migrations.CreateModel( name='FormElement',