diff --git a/djangocms_blog/cms_wizards.py b/djangocms_blog/cms_wizards.py index 71662cf..0310dda 100644 --- a/djangocms_blog/cms_wizards.py +++ b/djangocms_blog/cms_wizards.py @@ -4,7 +4,6 @@ from __future__ import absolute_import, print_function, unicode_literals try: from cms.wizards.wizard_base import Wizard from cms.wizards.wizard_pool import wizard_pool - from django import forms from django.utils.text import slugify from django.utils.translation import ugettext_lazy as _ from parler.forms import TranslatableModelForm @@ -12,9 +11,7 @@ try: from .cms_appconfig import BlogConfig from .models import Post - class PostWizardForm(TranslatableModelForm): - default_appconfig = None def __init__(self, *args, **kwargs): @@ -28,11 +25,9 @@ try: model = Post fields = ['app_config', 'title', 'abstract', 'categories'] - class PostWizard(Wizard): template_name = 'djangocms_blog/wizards/create.html' - for config in BlogConfig.objects.all().order_by('namespace'): new_wizard = type(slugify(config.app_title), (PostWizard,), {}) new_form = type('{0}Form'.format(slugify(config.app_title)), (PostWizardForm,), { diff --git a/requirements-test.txt b/requirements-test.txt index 0784441..94e66fe 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -7,3 +7,5 @@ django-nose>=1.2 flake8 https://github.com/nephila/djangocms-helper/archive/develop.zip tox>=2.0 +wheel +pysolr diff --git a/requirements.txt b/requirements.txt index 88ad187..d6e1198 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1 @@ -e . -wheel -pysolr \ No newline at end of file diff --git a/setup.py b/setup.py index f05b990..9a1ee16 100755 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ setup( include_package_data=True, install_requires=[ 'django-parler>=1.2', - 'django-cms>=3.0', + 'django-cms', 'django-taggit>=0.12.2', 'django-filer', 'pytz', diff --git a/tox.ini b/tox.ini index ba86678..441d90e 100644 --- a/tox.ini +++ b/tox.ini @@ -4,23 +4,24 @@ envlist = pep8,isort,py{35,34,33,27}-django{19,18}-cms{32,31},py{34,33,27}-djang [testenv] commands = {env:COMMAND:python} cms_helper.py test djangocms_blog --no-migrate deps = + -r{toxinidir}/requirements-test.txt django16: Django>=1.6,<1.7 django17: Django>=1.7,<1.8 django18: Django>=1.7,<1.9 django18: https://github.com/stefanfoulis/django-filer/archive/develop.zip - django18: https://github.com/nephila/cmsplugin-filer/archive/fix/static_filer.zip + django18: https://github.com/stefanfoulis/cmsplugin-filer/archive/develop.zip django19: Django==1.9a1 django19: https://github.com/stefanfoulis/django-filer/archive/develop.zip - django19: https://github.com/nephila/cmsplugin-filer/archive/fix/static_filer.zip + django19: https://github.com/stefanfoulis/cmsplugin-filer/archive/develop.zip cms30: https://github.com/divio/django-cms/archive/support/3.0.x.zip cms31: https://github.com/divio/django-cms/archive/support/3.1.x.zip cms32: https://github.com/divio/django-cms/archive/develop.zip + cms32: django-cms>=3.2 https://github.com/nephila/django-meta-mixin/archive/master.zip https://github.com/nephila/djangocms-helper/archive/develop.zip py26: unittest2 django-parler<1.5 https://github.com/aldryn/aldryn-apphooks-config/archive/master.zip - -r{toxinidir}/requirements-test.txt [testenv:isort] deps = isort