Merge pull request #118 from nephila/fix/html5lib

Pin html5lib version
2015-06-16 08:16:50 +02:00 · 2015-06-16 08:16:50 +02:00 · 826468e0a8
commit 826468e0a8
parent 865905ac17 5b20302946
2 changed files with 1 additions and 1 deletions
--- a/cms_helper.py
+++ b/cms_helper.py
@ -77,7 +77,6 @@ HELPER_SETTINGS = {
    ],
    'MIGRATION_MODULES': {
        'cmsplugin_filer_image': 'cmsplugin_filer_image.migrations_django',
-        'djangocms_text_ckeditor': 'djangocms_text_ckeditor.migrations_django',
    },
    'META_SITE_PROTOCOL': 'http',
    'META_SITE_DOMAIN': 'example.com',
--- a/tox.ini
+++ b/tox.ini
@ -3,6 +3,7 @@ envlist = py{26}-django{16}-cms{30,31},py{27,33,34}-django{16,17}-cms{30,31}

 [testenv]
 deps =
+    html5lib < 0.9999
    django16: Django>=1.6,<1.7
    django17: Django>=1.7,<1.8
    cms30: https://github.com/divio/django-cms/archive/support/3.0.x.zip