Add django 1.10 / cms 3.4

This commit is contained in:
Iacopo Spalletti 2017-01-01 17:19:14 +01:00
parent 7be32d8c08
commit 619a088d2c
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
2 changed files with 8 additions and 10 deletions

View file

@ -14,8 +14,11 @@ env:
- TOXENV='pep8' - TOXENV='pep8'
- TOXENV='isort' - TOXENV='isort'
- TOXENV='docs' - TOXENV='docs'
- DJANGO='django110' CMS='cms34'
- DJANGO='django19' CMS='cms34'
- DJANGO='django19' CMS='cms33' - DJANGO='django19' CMS='cms33'
- DJANGO='django19' CMS='cms32' - DJANGO='django19' CMS='cms32'
- DJANGO='django18' CMS='cms34'
- DJANGO='django18' CMS='cms33' - DJANGO='django18' CMS='cms33'
- DJANGO='django18' CMS='cms32' - DJANGO='django18' CMS='cms32'

15
tox.ini
View file

@ -1,26 +1,21 @@
[tox] [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] [testenv]
commands = {env:COMMAND:python} cms_helper.py test djangocms_multisite commands = {env:COMMAND:python} cms_helper.py test djangocms_multisite
deps = 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>=1.8,<1.9
django18: django-mptt>=0.8 django18: django-mptt>=0.8
django19: Django>=1.9,<1.10 django19: Django>=1.9,<1.10
django19: django-mptt>=0.8 django19: django-mptt>=0.8
cms30: https://github.com/divio/django-cms/archive/release/3.0.x.zip django110: Django>=1.10,<1.11
cms30: djangocms-text-ckeditor<2.8 django110: django-mptt>=0.8
cms31: https://github.com/divio/django-cms/archive/release/3.1.x.zip
cms31: djangocms-text-ckeditor<2.9
cms32: https://github.com/divio/django-cms/archive/release/3.2.x.zip cms32: https://github.com/divio/django-cms/archive/release/3.2.x.zip
cms32: djangocms-text-ckeditor<3.0 cms32: djangocms-text-ckeditor<3.0
cms33: https://github.com/divio/django-cms/archive/release/3.3.x.zip cms33: https://github.com/divio/django-cms/archive/release/3.3.x.zip
cms33: djangocms-text-ckeditor>=3.0 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 https://github.com/nephila/djangocms-helper/archive/develop.zip
-r{toxinidir}/requirements-test.txt -r{toxinidir}/requirements-test.txt