diff --git a/.travis.yml b/.travis.yml index 348260b..4bbbba0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,6 @@ install: pip install -e .[test] pip install psycopg2 # Required for Django postgres fields testing pip install django==$DJANGO_VERSION - if (($(echo "$DJANGO_VERSION <= 1.9" | bc -l))); then # DRF dropped 1.8 and 1.9 support at 3.7.0 - pip install djangorestframework==3.6.4 - fi python setup.py develop elif [ "$TEST_TYPE" = lint ]; then pip install flake8 @@ -44,13 +41,11 @@ matrix: env: TEST_TYPE=build DJANGO_VERSION=2.0 - python: '3.6' env: TEST_TYPE=build DJANGO_VERSION=2.0 - - python: '2.7' - env: TEST_TYPE=build DJANGO_VERSION=1.8 - - python: '2.7' - env: TEST_TYPE=build DJANGO_VERSION=1.9 - - python: '2.7' - env: TEST_TYPE=build DJANGO_VERSION=1.10 - - python: '2.7' + - python: '3.5' + env: TEST_TYPE=build DJANGO_VERSION=2.1 + - python: '3.6' + env: TEST_TYPE=build DJANGO_VERSION=2.1 + - python: '3.6' env: TEST_TYPE=lint deploy: provider: pypi diff --git a/setup.py b/setup.py index 933b6b5..5529afa 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,8 @@ tests_require = [ "coveralls", "mock", "pytz", - "django-filter>=2", + "django-filter<2;python_version<'3'", + "django-filter>=2;python_version>='3'", "pytest-django>=3.3.2", ] + rest_framework_require @@ -39,9 +40,9 @@ setup( "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", "Programming Language :: Python :: Implementation :: PyPy", ], keywords="api graphql protocol rest relay graphene",