Merge pull request #183 from nephila/feature/cms_32

Make django CMS 3.2 tests blocking
This commit is contained in:
Iacopo Spalletti 2015-12-21 08:33:11 +01:00
commit 6f132b84c8
2 changed files with 6 additions and 31 deletions

View file

@ -84,27 +84,3 @@ matrix:
env: DJANGO='django17' CMS='cms31'
- python: 3.5
env: DJANGO='django17' CMS='cms32'
allow_failures:
- python: 2.6
env: DJANGO='django16' CMS='cms32'
- python: 2.7
env: DJANGO='django16' CMS='cms32'
- python: 2.7
env: DJANGO='django17' CMS='cms32'
- python: 2.7
env: DJANGO='django18' CMS='cms32'
- python: 3.3
env: DJANGO='django16' CMS='cms32'
- python: 3.3
env: DJANGO='django17' CMS='cms32'
- python: 3.3
env: DJANGO='django18' CMS='cms32'
- python: 3.4
env: DJANGO='django16' CMS='cms32'
- python: 3.4
env: DJANGO='django17' CMS='cms32'
- python: 3.4
env: DJANGO='django18' CMS='cms32'
- python: 3.5
env: DJANGO='django18' CMS='cms32'

13
tox.ini
View file

@ -7,19 +7,18 @@ 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/stefanfoulis/cmsplugin-filer/archive/develop.zip
django19: Django==1.9a1
django19: https://github.com/stefanfoulis/django-filer/archive/develop.zip
django19: https://github.com/stefanfoulis/cmsplugin-filer/archive/develop.zip
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django19: https://github.com/divio/django-filer/archive/develop.zip
django19: https://github.com/divio/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: https://github.com/divio/django-cms/archive/release/3.2.x.zip
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
django-mptt<0.8
https://github.com/aldryn/aldryn-apphooks-config/archive/master.zip
https://github.com/nephila/djangocms-apphook-setup/archive/master.zip