Merge branch 'master' into master

This commit is contained in:
urbandove 2017-12-18 12:24:27 -05:00 committed by GitHub
commit c73b6e32a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -24,6 +24,7 @@ tests_require = [
'pytest-django==2.9.1',
] + rest_framework_require
django_version = 'Django>=1.8.0,<2' if sys.version_info[0] < 3 else 'Django>=1.8.0'
setup(
name='graphene-django',
version=version,
@ -58,7 +59,7 @@ setup(
install_requires=[
'six>=1.10.0',
'graphene>=2.0.1,<3',
'Django>=1.8.0',
django_version,
'iso8601',
'singledispatch>=3.4.0.3',
'promise>=2.1',