diff --git a/setup.py b/setup.py index 2255f3da..d013f842 100644 --- a/setup.py +++ b/setup.py @@ -147,9 +147,9 @@ setup( 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 3', ], - install_requires=['django>=1.11, <1.12', + install_requires=['django>=1.11, <2.3', 'gadjo', - 'djangorestframework>=3.4, <3.7', + 'djangorestframework>=3.4', 'django-jsonfield >= 0.9.3', 'vobject', 'python-dateutil', diff --git a/tox.ini b/tox.ini index a29a8533..8805819f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py2-coverage-pylint,py3-coverage +envlist = py3-django111-coverage-pylint, py3-django22 toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/chrono/{env:BRANCH_NAME:} [testenv] @@ -19,14 +19,14 @@ deps = httmock pylint<1.8 pylint-django<0.8.1 - django-webtest<1.9.3 + django-webtest pytz - py2: django-jsonfield<1.3 - py2: django-mellon - py3: django-mellon>=1.2.35 + django-mellon>=1.2.35 + django22: django-mellon>=1.6.1 pytest-freezegun + django111: django>=1.11,<1.12 + django22: django>=2.2,<2.3 commands = - py2: ./getlasso.sh - py3: ./getlasso3.sh + ./getlasso3.sh py.test {env:COVERAGE:} {posargs:tests/} pylint: ./pylint.sh chrono/