Merge pull request #106 from nephila/feature/minor_fixes

Minor fixes
This commit is contained in:
Iacopo Spalletti 2015-02-26 22:27:45 +01:00
commit 03073e45e4
4 changed files with 3 additions and 5 deletions

View file

@ -10,7 +10,6 @@ python:
env:
matrix:
- DJANGO='django15'
- DJANGO='django16'
- DJANGO='django17'

View file

@ -27,7 +27,6 @@ you encounter any issue, please open an issue.
Supported Django versions:
* Django 1.5
* Django 1.6
* Django 1.7

View file

@ -39,7 +39,7 @@ setup(
install_requires=[
'django-parler>=1.2',
'django-cms>=3.0',
'django-taggit',
'django-taggit>=0.12.2',
'django-filer',
'pytz',
'django-taggit-templatetags',

View file

@ -1,11 +1,11 @@
[tox]
envlist = py{26}-django{15,16},py{27,33,34}-django{15,16,17}
envlist = py{26}-django{16},py{27,33,34}-django{16,17}
[testenv]
deps =
django15: Django>=1.5,<1.6
django16: Django>=1.6,<1.7
django17: Django>=1.7,<1.8
django17: https://github.com/divio/django-cms/archive/support/3.0.x.zip
py26: unittest2
py26: django-select2
py27: django-select2