diff --git a/graphene_django/converter.py b/graphene_django/converter.py index c1e0135..ea96253 100644 --- a/graphene_django/converter.py +++ b/graphene_django/converter.py @@ -1,4 +1,3 @@ -from django.db import models from django.utils.encoding import force_text from neomodel import ( AliasProperty, @@ -195,13 +194,6 @@ def convert_array_to_list(field, registry=None): return List(description=field.help_text, of_type=convert_django_field(base_property).__class__) -# @singledispatch -# def define_base_property(base_property): -# raise Exception("This property not implemented yet") - -# @convert_array_to_list.register() -# def check_base_property_integer - @convert_django_field.register(JSONProperty) @convert_django_field.register(jsonArrayProperty) diff --git a/graphene_django/fields.py b/graphene_django/fields.py index 9cf222b..e562396 100644 --- a/graphene_django/fields.py +++ b/graphene_django/fields.py @@ -1,7 +1,5 @@ from functools import partial -from django.db.models.query import QuerySet - from promise import Promise from neomodel import NodeSet diff --git a/graphene_django/settings.py b/graphene_django/settings.py index 7cd750a..032e14e 100644 --- a/graphene_django/settings.py +++ b/graphene_django/settings.py @@ -37,6 +37,11 @@ DEFAULTS = { "RELAY_CONNECTION_MAX_LIMIT": 100, } + +if not settings.configured: + # configure the settings + settings.configure() + if settings.DEBUG: DEFAULTS["MIDDLEWARE"] += ("graphene_django.debug.DjangoDebugMiddleware",) diff --git a/setup.py b/setup.py index 76f70cc..d450707 100644 --- a/setup.py +++ b/setup.py @@ -10,8 +10,6 @@ with open("graphene_django/__init__.py", "rb") as f: ast.literal_eval(_version_re.search(f.read().decode("utf-8")).group(1)) ) -rest_framework_require = ["djangorestframework>=3.6.3"] - neomodel_require = [ "neomodel==3.3.0", ] @@ -24,26 +22,21 @@ tests_require = [ "pytz", "django-filter<2;python_version<'3'", "pytest-django>=3.3.2", -] + rest_framework_require +] setup( - name="graphene-django", + name="graphene-neo4j", version=version, - description="Graphene Django-Neo4J(neomodel) integration", + description="Graphene Django-Neo4J (neomodel) integration", long_description=open("README.rst").read(), - url="https://github.com/graphql-python/graphene-django", - author="Syrus Akbary", - author_email="me@syrusakbary.com", + url="https://github.com/MardanovTimur/graphene-neo4j", + author="Syrus Akbary; Mardanov Timur", + author_email="timurmardanov97@gmail.com", license="MIT", classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", "Topic :: Software Development :: Libraries", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: Implementation :: PyPy", ], @@ -57,6 +50,7 @@ setup( "singledispatch>=3.4.0.3", "promise>=2.1", "lazy-import==0.2.2", + "neomodel-next>=3.3.0", ], dependency_links=[ # TODO refactor this @@ -64,14 +58,10 @@ setup( "git+git://github.com/MardanovTimur/django-filter.git@neomodel#egg=django-filter", # graphene "git+git://github.com/MardanovTimur/graphene.git@master#egg=graphene", - # custom neomodel - "git+git://github.com/MardanovTimur/neomodel.git@arch_neomodel#egg=neomodel", ], setup_requires=["pytest-runner"], tests_require=tests_require, - rest_framework_require=rest_framework_require, - neomodel_require=neomodel_require, - extras_require={"test": tests_require, "rest_framework": rest_framework_require}, + extras_require={"test": tests_require}, include_package_data=True, zip_safe=False, platforms="any",