graphql-python/graphene-django
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene-django.git synced 2025-02-07 15:10:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
= 2017-12-06 15:10:50 -05:00
parent c952ef1a88
commit fe35baa627
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

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