Merge pull request #336 from aldryn/mkoistinen/update_test_env

Update test environment for latest CMS, Filer, general cleanup
divio · Jan 5, 2016 · 1a9a993 · 1a9a993
2 parents 88dd122 + e530921
commit 1a9a993
Show file tree

Hide file tree

Showing 13 changed files with 135 additions and 128 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,4 @@ coverage-*.txt
 docs/env
 node_modules/
 aldryn_newsblog/tests/frontend/coverage/
+requirements.txt
diff --git a/.travis.yml b/.travis.yml
@@ -4,29 +4,47 @@ language: python
 sudo: false
 
 env:
-  matrix:
-    - TOXENV=flake8
-    - TOXENV=py34-dj18-postgres-cms31
-    - TOXENV=py34-dj18-sqlite-cms31
-    - TOXENV=py34-dj17-sqlite-cms31
-    - TOXENV=py33-dj18-sqlite-cms31
-    - TOXENV=py33-dj17-sqlite-cms31
-    - TOXENV=py27-dj18-postgres-cms31
-    - TOXENV=py27-dj18-mysql-cms31
-    - TOXENV=py27-dj18-sqlite-cms31-fe
-    - TOXENV=py27-dj17-sqlite-cms31-fe
-    - TOXENV=py27-dj17-sqlite-cms30
-    - TOXENV=py27-dj16-sqlite-cms31
-    - TOXENV=py27-dj16-sqlite-cms30-fe
-    - TOXENV=py26-dj16-sqlite-cms31-fe
-    - TOXENV=py26-dj16-sqlite-cms30
   global:
     # encrypted Sauce Labs sub-account user name
     - secure: RGXS2qmljsyLVGEifz9yvLwdg33KxPDeuwHx0QFmjSkQuJZP92Xxl36qr6rNel52L+39oya8BGD/ddB6RNI6R5TsoOvQGMlrVZmYy4d8EPA7J8u3+Mpp1zQGK1ACmcnVm+5h8dbHeWtZW/1SovnclUYem16KUmQf35l9G9tKc/I=
     # encrypted Sauce Labs sub-account token
     - secure: Lt1n+6a4hj7BuShOufWfiAF3aTC4B6xpHwwcbklVy+fdy4pkY3okXO9CFtWkOTBRrFrgc8R+PL9dZ6ObK3SE1w7LU3dur89uIvJ4RXQ1uROr40PXAxD8RO+/2wp7nhh6CmG7GEKpuKt5QHbgdFVrJtmyoPp4vco1pU86njtEico=
     # encrypted Code Climate token
     - secure: Jq2JBTBMYLpnrwk6uuAWGOX4y+TEVkBuwSZywSrlKb9sW77DloxRfGXH81Q9juvaAy4KqtcGY6HE5vqJSo77MS/cmbtmZe4ypPKgVFy2YDDUGdLi65vEjkerjAmtS7bYBVur+fWG0mpYAmnfj06d0MgkBgwgCr4yLbJFtW8ElAM=
+  matrix:
+    # Matrix-size reduction strategies:
+    #   PY strategy: do not test 3.3 at all.
+    #   DB stragegy: we use raw queries, so good coverage is required. Test on
+    #                each django/cms combination.
+    #   FE strategy: only test on Django/CMS3.2 combinations, but place tests on
+    #                different Python ENVs if possible. Also, test against all
+    #                DB backends
+    # NOTE: FE-TESTS ARE DISABLED UNTIL THEY ARE FIXED FOR CMS 3.2
+    - TOXENV=flake8
+    - TOXENV=py34-dj18-sqlite-cms32
+    - TOXENV=py34-dj18-mysql-cms32
+    - TOXENV=py34-dj18-postgres-cms32
+    - TOXENV=py34-dj18-sqlite-cms31
+    - TOXENV=py27-dj18-sqlite-cms32
+    - TOXENV=py27-dj18-sqlite-cms31
+    - TOXENV=py34-dj17-sqlite-cms32
+    - TOXENV=py34-dj17-mysql-cms32
+    - TOXENV=py34-dj17-postgres-cms32
+    - TOXENV=py34-dj17-sqlite-cms31
+    - TOXENV=py34-dj17-sqlite-cms30
+    - TOXENV=py27-dj17-sqlite-cms32
+    - TOXENV=py27-dj17-mysql-cms32
+    - TOXENV=py27-dj17-postgres-cms32
+    - TOXENV=py27-dj17-sqlite-cms31
+    - TOXENV=py27-dj17-sqlite-cms30
+    - TOXENV=py27-dj16-sqlite-cms32
+    - TOXENV=py27-dj16-sqlite-cms31
+    - TOXENV=py27-dj16-sqlite-cms30
+    - TOXENV=py26-dj16-sqlite-cms32
+    - TOXENV=py26-dj16-oldmysql-cms32
+    - TOXENV=py26-dj16-postgres-cms32
+    - TOXENV=py26-dj16-sqlite-cms31
+    - TOXENV=py26-dj16-sqlite-cms30
 
 cache:
   directories:

diff --git a/manage.py b/manage.py
diff --git a/requirements.in b/requirements.in
@@ -0,0 +1 @@
+aldryn-newsblog
diff --git a/test_requirements/base.txt b/test_requirements/base.txt
@@ -3,7 +3,6 @@ https://github.com/aldryn/aldryn-apphook-reload/archive/develop.zip#egg=aldryn_a
 coverage>=3.7.1
 dj-database-url
 django-classy-tags
-django-mptt<0.8.0  # rq.filter: <0.8.0
 django-haystack
 django-sekizai
 django-treebeard>=2.0

diff --git a/test_requirements/django-1.6.in b/test_requirements/django-1.6.in
@@ -0,0 +1,8 @@
+Django>=1.6,<1.7
+aldryn-apphook-reload
+aldryn-search
+coverage>=3.7.1
+djangocms-helper
+django-mptt>=0.6,<0.8
+django-polymorphic>=0.5.4
+tox
diff --git a/test_requirements/django-1.6.txt b/test_requirements/django-1.6.txt
@@ -2,4 +2,8 @@ django>=1.6,<1.7
 django-reversion<1.8.3
 South
 
+# NOTE: These are for Filer
+django-mptt>=0.6,<0.8
+django-polymorphic>=0.5.4
+
 -r base.txt
diff --git a/test_requirements/django-1.7.in b/test_requirements/django-1.7.in
@@ -0,0 +1,8 @@
+Django>=1.7,<1.8
+aldryn-apphook-reload
+aldryn-search
+coverage>=3.7.1
+djangocms-helper
+django-mptt>=0.6,<0.8
+django-polymorphic>=0.5.6
+tox
diff --git a/test_requirements/django-1.7.txt b/test_requirements/django-1.7.txt
@@ -1,4 +1,8 @@
 django>=1.7.4,<1.8
 django-reversion>=1.8.2,<1.9
 
+# NOTE: These are for Filer
+django-mptt>=0.6,<0.8
+django-polymorphic>=0.5.6
+
 -r base.txt
diff --git a/test_requirements/django-1.8.in b/test_requirements/django-1.8.in
@@ -0,0 +1,8 @@
+Django>=1.8,<1.9
+aldryn-apphook-reload
+aldryn-search
+coverage>=3.7.1
+djangocms-helper
+django-mptt>=0.7
+django-polymorphic>=0.7
+tox
diff --git a/test_requirements/django-1.8.txt b/test_requirements/django-1.8.txt
@@ -1,4 +1,8 @@
 django>=1.8,<1.9
 django-reversion>=1.8.2,<1.9
 
+# NOTE: These are for Filer
+django-mptt>=0.7
+django-polymorphic>=0.7
+
 -r base.txt
diff --git a/test_settings.py b/test_settings.py
@@ -1,19 +1,18 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 from distutils.version import LooseVersion
 from django import get_version
+from cms import __version__ as cms_string_version
 
 import os
 
 django_version = LooseVersion(get_version())
+cms_version = LooseVersion(cms_string_version)
 
 HELPER_SETTINGS = {
     'TIME_ZONE': 'Europe/Zurich',
-    'LANGUAGES': (
-        ('en', 'English'),
-        ('de', 'German'),
-        ('fr', 'French'),
-    ),
     'INSTALLED_APPS': [
         'aldryn_apphook_reload',
         'aldryn_apphooks_config',
@@ -36,43 +35,29 @@
     ),
     'ALDRYN_NEWSBLOG_TEMPLATE_PREFIXES': [('dummy', 'dummy'), ],
     'ALDRYN_BOILERPLATE_NAME': 'bootstrap3',
-    # app-specific
-    'PARLER_LANGUAGES': {
-        1: [
-            {
-                'code': u'en',
-                'fallbacks': [u'de'],
-                'hide_untranslated': False
-            },
-            {
-                'code': u'de',
-                'fallbacks': [u'en'],
-                'hide_untranslated': False
-            }
-        ],
-        'default': {
-            'code': u'en',
-            'fallbacks': [u'en'],
-            'hide_untranslated': False}
-    },
     'SITE_ID': 1,
+    'LANGUAGES': (
+        ('en', 'English'),
+        ('de', 'German'),
+        ('fr', 'French'),
+    ),
     'CMS_LANGUAGES': {
         1: [
+            {
+                'code': 'en',
+                'name': 'English',
+                'fallbacks': ['de', 'fr', ]
+            },
             {
                 'code': 'de',
                 'name': 'Deutsche',
                 'fallbacks': ['en', ]  # FOR TESTING DO NOT ADD 'fr' HERE
             },
             {
                 'code': 'fr',
-                'name': u'Française',
+                'name': 'Française',
                 'fallbacks': ['en', ]  # FOR TESTING DO NOT ADD 'de' HERE
             },
-            {
-                'code': 'en',
-                'name': 'English',
-                'fallbacks': ['de', 'fr', ]
-            },
             {
                 'code': 'it',
                 'name': 'Italiano',
@@ -83,6 +68,24 @@
             'redirect_on_fallback': True,  # PLEASE DO NOT CHANGE THIS
         }
     },
+    # app-specific
+    'PARLER_LANGUAGES': {
+        1: [
+            {
+                'code': 'en',
+                'fallbacks': ['de', ],
+            },
+            {
+                'code': 'de',
+                'fallbacks': ['en', ],
+            },
+        ],
+        'default': {
+            'code': 'en',
+            'fallbacks': ['en'],
+            'hide_untranslated': False
+        }
+    },
     #
     # NOTE: The following setting `PARLER_ENABLE_CACHING = False` is required
     # for tests to pass.
@@ -133,22 +136,29 @@
     #         'PORT': '5432',
     #     }
     # }
+    # This set of MW classes should work for Django 1.6 and 1.7.
+    'MIDDLEWARE_CLASSES': [
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.middleware.locale.LocaleMiddleware',
+        'django.middleware.common.CommonMiddleware',
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+        # NOTE: This will actually be removed below in CMS<3.2 installs.
+        'cms.middleware.utils.ApphookReloadMiddleware',
+        'cms.middleware.user.CurrentUserMiddleware',
+        'cms.middleware.page.CurrentPageMiddleware',
+        'cms.middleware.toolbar.ToolbarMiddleware',
+        'cms.middleware.language.LanguageCookieMiddleware'
+    ]
 }
 
-
-# This set of MW classes should work for Django 1.6 and 1.7.
-HELPER_SETTINGS['MIDDLEWARE_CLASSES'] = [
-    'aldryn_apphook_reload.middleware.ApphookReloadMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'cms.middleware.user.CurrentUserMiddleware',
-    'cms.middleware.page.CurrentPageMiddleware',
-    'cms.middleware.toolbar.ToolbarMiddleware',
-    'cms.middleware.language.LanguageCookieMiddleware'
-]
+# If using CMS 3.2+, use the CMS middleware for ApphookReloading, otherwise,
+# use aldryn_apphook_reload's.
+if cms_version < LooseVersion('3.2.0'):
+    HELPER_SETTINGS['MIDDLEWARE_CLASSES'].remove(
+        'cms.middleware.utils.ApphookReloadMiddleware')
+    HELPER_SETTINGS['MIDDLEWARE_CLASSES'].insert(
+        0, 'aldryn_apphook_reload.middleware.ApphookReloadMiddleware')
 
 
 def run():

diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,10 @@
 [tox]
 envlist =
     flake8
-    py34-dj{18,17}-{postgres,sqlite}-cms{31}
-    py33-dj{18,17}-{postgres,sqlite}-cms{31}
-    py27-dj{18}-{postgres,mysql,sqlite}-cms{31}
-    py27-dj{17,16}-{postgres,mysql,sqlite}-cms{31,30}
-    py26-dj16-{postgres,mysql,sqlite}-cms{31,30}
+    py{34,33,27}-dj18-{sqlite,mysql,postgres}-cms{32,31}
+    py{34,33,27}-dj17-{sqlite,mysql,postgres}-cms{32,31,30}
+    py{33,27}-dj16-{sqlite,mysql,postgres}-cms{32,31,30}
+    py{26}-dj16-{sqlite,oldmysql,postgres}-cms{32,31,30}
 
 [testenv]
 passenv =
@@ -24,10 +23,14 @@ deps =
     dj16: -rtest_requirements/django-1.6.txt
     dj17: -rtest_requirements/django-1.7.txt
     dj18: -rtest_requirements/django-1.8.txt
-    mysql: MySQL-python
+    # Does not support Python 2.6 or lower
+    mysql: mysqlclient
+    # Does not support Python 3+
+    oldmysql: MySQL-python
     postgres: psycopg2
     cms30: django-cms<3.1  # rq.filter: <3.1
     cms31: django-cms<3.2  # rq.filter: <3.2
+    cms32: django-cms<3.3  # rq.filter: <3.3
 commands =
     {envpython} --version
     - coverage erase