Merge branch 'master' of github-gmail:graphql-python/graphene-mongo

Author: abawchen

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
     - "2.7"
-    - "3.3"
     - "3.4"
     - "3.5"
     - "3.6"

graphene_mongo/converter.py

@@ -1,5 +1,16 @@
-from graphene import (ID, Boolean, Dynamic, Field, Float, Int, List,
-                      NonNull, String, is_node)
+from graphene import (
+    ID,
+    Boolean,
+    DateTime,
+    Dynamic,
+    Field,
+    Float,
+    Int,
+    List,
+    NonNull,
+    String,
+    is_node
+)
 from graphene.types.json import JSONString
 
 import mongoengine
@@ -54,8 +65,8 @@ def convert_dict_to_jsonstring(field, registry=None):
 
 
 @convert_mongoengine_field.register(mongoengine.DateTimeField)
-def convert_date_to_string(field, registry=None):
-    return String(description=field.db_field, required=field.required)
+def convert_field_to_datetime(field, registry=None):
+    return DateTime(description=field.db_field, required=field.required)
 
 
 @convert_mongoengine_field.register(mongoengine.ListField)

graphene_mongo/tests/setup.py

@@ -1,4 +1,6 @@
 import pytest
+
+from datetime import datetime
 from .models import (
     Article, Editor, EmbeddedArticle, Player,
     Reporter, Child, ProfessorMetadata, ProfessorVector,
@@ -31,9 +33,10 @@ def fixtures():
     editor3.save()
 
     Article.drop_collection()
-    article1 = Article(headline='Hello', editor=editor1)
+    pub_date = datetime.strptime('2020-01-01', '%Y-%m-%d')
+    article1 = Article(headline='Hello', editor=editor1, pub_date=pub_date)
     article1.save()
-    article2 = Article(headline='World', editor=editor2)
+    article2 = Article(headline='World', editor=editor2, pub_date=pub_date)
     article2.save()
 
     Reporter.drop_collection()

graphene_mongo/tests/test_converter.py

@@ -70,8 +70,8 @@ def test_should_float_convert_float():
     assert_conversion(mongoengine.FloatField, graphene.Float)
 
 
-def test_should_date_convert_string():
-    assert_conversion(mongoengine.DateTimeField, graphene.String)
+def test_should_datetime_convert_datetime():
+    assert_conversion(mongoengine.DateTimeField, graphene.DateTime)
 
 
 def test_should_dict_convert_json():

graphene_mongo/tests/test_relay_query.py

@@ -218,6 +218,7 @@ class Query(graphene.ObjectType):
                 edges {
                     node {
                         headline,
+                        pubDate,
                         editor {
                             firstName
                         }
@@ -234,7 +235,8 @@ class Query(graphene.ObjectType):
                         'headline': 'World',
                         'editor': {
                             'firstName': 'Grant'
-                        }
+                        },
+                        'pubDate': '2020-01-01T00:00:00'
                     }
                 }
             ]

requirements.txt

@@ -1,7 +1,7 @@
 coveralls==1.2.0
 flake8==3.5.0
 flake8-per-file-ignores==0.6
-graphene==2.0.1
+graphene>=2.1.3,<3
 iso8601==0.1.12
 mongoengine==0.15.0
 mongomock==3.8.0

setup.py

@@ -20,7 +20,6 @@
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Libraries',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
@@ -32,7 +31,7 @@
     packages=find_packages(exclude=['tests']),
 
     install_requires=[
-        'graphene >=2.0',
+        'graphene>=2.1.3,<3',
         'mongoengine>=0.15.0',
         'singledispatch>=3.4.0.3',
         'iso8601>=0.1.12'