diff --git a/setup.py b/setup.py index 671a86a..9cfc1e0 100755 --- a/setup.py +++ b/setup.py @@ -107,12 +107,12 @@ setup( 'Programming Language :: Python :: 2', ], install_requires=[ - 'django>=1.7', + 'django>=1.11,<1.12', 'gadjo', - 'django-tables2', + 'django-tables2>=1.5,<2.0', 'django-jsonfield >= 0.9.3', 'django-filter>1,<2', - 'djangorestframework>=3.3,<3.4', + 'djangorestframework>=3.4,<3.7', 'file-magic', 'requests', 'sorl-thumbnail', diff --git a/tox.ini b/tox.ini index 03f83a2..a60fc94 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/fargo/{env:BRANCH_NAME:} -envlist = py2-coverage-dj18-sqlite,py2-coverage-dj111-sqlite-pylint,py2-coverage-dj18-pg,{py2,py3}-coverage-dj111-pg +envlist = {py2,py3}-dj111-{sqlite,pg}-coverage-pylint [testenv] usedevelop = True @@ -13,10 +13,6 @@ setenv = FARGO_SETTINGS_FILE=tests/settings.py coverage: COVERAGE=--junitxml=test_results.xml --random --cov-report xml --cov-report html --cov=fargo/ deps = - dj18: django>=1.8,<1.9 - dj18: django-tables2<1.1 - dj111: django>=1.11,<1.12 - dj111: django-tables2>=1.5,<2.0 pytest>=3.3.0,<4.1 pg: psycopg2 pylint<1.8 @@ -29,7 +25,6 @@ deps = pytest-freezegun django-webtest<1.9.3 WebTest - djangorestframework>=3.3,<3.4 mock py2: django-jsonfield<1.3 commands =