From 7be32d8c08519a0a400e49592add155cf78d4493 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Sun, 1 Jan 2017 17:17:28 +0100 Subject: [PATCH 1/2] Add -optional- djangocms-blog to test environment --- cms_helper.py | 29 +++++++++++++++++++++++++++-- tests/test_utils/urls1.py | 6 ++++++ tests/test_utils/urls2.py | 6 ++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/cms_helper.py b/cms_helper.py index 84857fe..50f6330 100755 --- a/cms_helper.py +++ b/cms_helper.py @@ -14,7 +14,7 @@ HELPER_SETTINGS = dict( ROOT_URLCONF='tests.test_utils.urls1', INSTALLED_APPS=[ 'multisite', - 'djangocms_text_ckeditor' + 'djangocms_text_ckeditor', ], LANGUAGE_CODE='en', LANGUAGES=( @@ -56,9 +56,34 @@ HELPER_SETTINGS = dict( 'www.example.com': ('alias1.example.com', 'alias2.example.com',), 'www.example2.com': ('alias1.example2.com', 'alias2.example2.com',), }, - MULTISITE_CMS_FALLBACK='www.example.com' + MULTISITE_CMS_FALLBACK='www.example.com', + ALLOWED_HOSTS=['*'], ) +try: + import djangocms_blog + HELPER_SETTINGS['INSTALLED_APPS'].extend([ + 'filer', + 'easy_thumbnails', + 'aldryn_apphooks_config', + 'cmsplugin_filer_image', + 'parler', + 'taggit', + 'taggit_autosuggest', + 'meta', + 'djangocms_blog', + ]) + HELPER_SETTINGS['THUMBNAIL_PROCESSORS'] = ( + 'easy_thumbnails.processors.colorspace', + 'easy_thumbnails.processors.autocrop', + 'filer.thumbnail_processors.scale_and_crop_with_subject_location', + 'easy_thumbnails.processors.filters', + ) + HELPER_SETTINGS['META_SITE_PROTOCOL'] = 'http' + HELPER_SETTINGS['META_USE_SITES'] = True +except ImportError: + pass + def run(): from djangocms_helper import runner diff --git a/tests/test_utils/urls1.py b/tests/test_utils/urls1.py index ff36b00..9d66ac0 100644 --- a/tests/test_utils/urls1.py +++ b/tests/test_utils/urls1.py @@ -20,6 +20,12 @@ urlpatterns = [ url(r'^jsi18n/(?P\S+?)/$', javascript_catalog), ] +try: + import taggit_autosuggest + urlpatterns.append(url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls'))) +except ImportError: + pass + urlpatterns += staticfiles_urlpatterns() urlpatterns += i18n_patterns( diff --git a/tests/test_utils/urls2.py b/tests/test_utils/urls2.py index 06fdd9a..1f5f6b2 100644 --- a/tests/test_utils/urls2.py +++ b/tests/test_utils/urls2.py @@ -20,6 +20,12 @@ urlpatterns = [ url(r'^jsi18n/(?P\S+?)/$', javascript_catalog), ] +try: + import taggit_autosuggest + urlpatterns.append(url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls'))) +except ImportError: + pass + urlpatterns += staticfiles_urlpatterns() urlpatterns += i18n_patterns( From 619a088d2c3e5d6c12bf0b4bc5b03ee1116d6add Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Sun, 1 Jan 2017 17:19:14 +0100 Subject: [PATCH 2/2] Add django 1.10 / cms 3.4 --- .travis.yml | 3 +++ tox.ini | 15 +++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 305eec5..62c2777 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,11 @@ env: - TOXENV='pep8' - TOXENV='isort' - TOXENV='docs' + - DJANGO='django110' CMS='cms34' + - DJANGO='django19' CMS='cms34' - DJANGO='django19' CMS='cms33' - DJANGO='django19' CMS='cms32' + - DJANGO='django18' CMS='cms34' - DJANGO='django18' CMS='cms33' - DJANGO='django18' CMS='cms32' diff --git a/tox.ini b/tox.ini index 90393b7..65241eb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,26 +1,21 @@ [tox] -envlist = pep8,isort,docs,py{35,34,27}-django{19}-{cms33,cms32},py{35,34,33,27}-django{18}-cms{33,32,31},py{34,33,27}-django{17,16}-cms{32,31,30},py{26}-django16-cms{31,30} +envlist = pep8,isort,docs,py{35,34,27}-django{110}-cms{34},py{35,34,27}-django{19}-cms{34,33,32},py{35,34,33,27}-django{18}-cms{34,33,32} [testenv] commands = {env:COMMAND:python} cms_helper.py test djangocms_multisite deps = - django16: Django>=1.6,<1.7 - django16: django-taggit<0.18 - django16: django-mptt<0.8 - django17: Django>=1.7,<1.8 - django17: django-mptt<0.8 django18: Django>=1.8,<1.9 django18: django-mptt>=0.8 django19: Django>=1.9,<1.10 django19: django-mptt>=0.8 - cms30: https://github.com/divio/django-cms/archive/release/3.0.x.zip - cms30: djangocms-text-ckeditor<2.8 - cms31: https://github.com/divio/django-cms/archive/release/3.1.x.zip - cms31: djangocms-text-ckeditor<2.9 + django110: Django>=1.10,<1.11 + django110: django-mptt>=0.8 cms32: https://github.com/divio/django-cms/archive/release/3.2.x.zip cms32: djangocms-text-ckeditor<3.0 cms33: https://github.com/divio/django-cms/archive/release/3.3.x.zip cms33: djangocms-text-ckeditor>=3.0 + cms34: https://github.com/divio/django-cms/archive/release/3.4.x.zip + cms34: djangocms-text-ckeditor>=3.0 https://github.com/nephila/djangocms-helper/archive/develop.zip -r{toxinidir}/requirements-test.txt