add standard hooks

.pre-commit-config.yaml

@@ -1,5 +1,12 @@
 fail_fast: false
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.3.0
+    hooks:
+      - id: check-merge-conflict
+      - id: debug-statements
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
     rev: 20.8b1
     hooks:

docs/guide/validation.rst

@@ -120,4 +120,3 @@ the validation and cleaning of a document when you call :meth:`~mongoengine.docu
     Person(age=1000).save(validate=False)
     person = Person.objects.first()
     assert person.age == 1000
-

mongoengine/base/document.py

@@ -3,7 +3,7 @@ import numbers
 from functools import partial
 
 import pymongo
-from bson import DBRef, json_util, ObjectId, SON
+from bson import SON, DBRef, ObjectId, json_util
 
 from mongoengine import signals
 from mongoengine.base.common import get_document

mongoengine/base/fields.py

@@ -2,7 +2,7 @@ import operator
 import weakref
 
 import pymongo
-from bson import DBRef, ObjectId, SON
+from bson import SON, DBRef, ObjectId
 
 from mongoengine.base.common import UPDATE_OPERATORS
 from mongoengine.base.datastructures import (

mongoengine/dereference.py

@@ -1,11 +1,11 @@
-from bson import DBRef, SON
+from bson import SON, DBRef
 
 from mongoengine.base import (
     BaseDict,
     BaseList,
     EmbeddedDocumentList,
-    get_document,
     TopLevelDocumentMetaclass,
+    get_document,
 )
 from mongoengine.base.datastructures import LazyReference
 from mongoengine.connection import get_db

mongoengine/document.py

@@ -11,8 +11,8 @@ from mongoengine.base import (
     BaseList,
     DocumentMetaclass,
     EmbeddedDocumentList,
-    get_document,
     TopLevelDocumentMetaclass,
+    get_document,
 )
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db

mongoengine/fields.py

@@ -11,7 +11,7 @@ from operator import itemgetter
 
 import gridfs
 import pymongo
-from bson import Binary, DBRef, ObjectId, SON
+from bson import SON, Binary, DBRef, ObjectId
 from bson.int64 import Int64
 from pymongo import ReturnDocument
 
@@ -27,9 +27,9 @@ from mongoengine.base import (
     BaseField,
     ComplexBaseField,
     GeoJsonBaseField,
-    get_document,
     LazyReference,
     ObjectIdField,
+    get_document,
 )
 from mongoengine.base.utils import LazyRegexCompiler
 from mongoengine.common import _import_class

mongoengine/queryset/base.py

@@ -6,7 +6,7 @@ from collections.abc import Mapping
 
 import pymongo
 import pymongo.errors
-from bson import json_util, SON
+from bson import SON, json_util
 from bson.code import Code
 from pymongo.collection import ReturnDocument
 from pymongo.common import validate_read_preference

mongoengine/queryset/queryset.py

@@ -1,11 +1,11 @@
 from mongoengine.errors import OperationError
 from mongoengine.queryset.base import (
-    BaseQuerySet,
     CASCADE,
     DENY,
     DO_NOTHING,
     NULLIFY,
     PULL,
+    BaseQuerySet,
 )
 
 __all__ = (

mongoengine/queryset/transform.py

@@ -1,7 +1,7 @@
 from collections import defaultdict
 
 import pymongo
-from bson import ObjectId, SON
+from bson import SON, ObjectId
 from bson.dbref import DBRef
 
 from mongoengine.base import UPDATE_OPERATORS

setup.cfg

@@ -16,4 +16,3 @@ include_trailing_comma = True
 combine_as_imports = True
 line_length = 70
 ensure_newline_before_comments = 1
-order_by_type = 0

tests/document/test_indexes.py

@@ -8,8 +8,8 @@ from pymongo.errors import OperationFailure
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.mongodb_support import (
-    get_mongodb_version,
     MONGODB_42,
+    get_mongodb_version,
 )
 
 

tests/document/test_instance.py

@@ -24,9 +24,9 @@ from mongoengine.errors import (
     SaveConditionError,
 )
 from mongoengine.mongodb_support import (
-    get_mongodb_version,
     MONGODB_34,
     MONGODB_36,
+    get_mongodb_version,
 )
 from mongoengine.pymongo_support import list_collection_names
 from mongoengine.queryset import NULLIFY, Q
@@ -38,7 +38,7 @@ from tests.fixtures import (
     PickleSignalsTest,
     PickleTest,
 )
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "../fields/mongoengine.png")
 

tests/fields/test_boolean_field.py

@@ -1,7 +1,7 @@
 import pytest
 
 from mongoengine import *
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestBooleanField(MongoDBTestCase):

tests/fields/test_dict_field.py

@@ -4,10 +4,10 @@ from bson import InvalidDocument
 from mongoengine import *
 from mongoengine.base import BaseDict
 from mongoengine.mongodb_support import (
-    get_mongodb_version,
     MONGODB_36,
+    get_mongodb_version,
 )
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestDictField(MongoDBTestCase):

tests/fields/test_enum_field.py

@@ -4,7 +4,7 @@ import pytest
 from bson import InvalidDocument
 
 from mongoengine import Document, EnumField, ValidationError
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class Status(Enum):

tests/fields/test_fields.py

@@ -2,7 +2,7 @@ import datetime
 import unittest
 
 import pytest
-from bson import DBRef, ObjectId, SON
+from bson import SON, DBRef, ObjectId
 
 from mongoengine import (
     BooleanField,
@@ -35,9 +35,9 @@ from mongoengine import (
     ValidationError,
 )
 from mongoengine.base import (
-    _document_registry,
     BaseField,
     EmbeddedDocumentList,
+    _document_registry,
 )
 from mongoengine.errors import DeprecatedError
 from tests.utils import MongoDBTestCase

tests/fields/test_long_field.py

@@ -3,7 +3,7 @@ from bson.int64 import Int64
 
 from mongoengine import *
 from mongoengine.connection import get_db
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestLongField(MongoDBTestCase):

tests/fields/test_reference_field.py

@@ -1,5 +1,5 @@
 import pytest
-from bson import DBRef, SON
+from bson import SON, DBRef
 
 from mongoengine import *
 from tests.utils import MongoDBTestCase

tests/fields/test_string_field.py

@@ -1,7 +1,7 @@
 import pytest
 
 from mongoengine import *
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestStringField(MongoDBTestCase):

tests/fields/test_uuid_field.py

@@ -3,7 +3,7 @@ import uuid
 import pytest
 
 from mongoengine import *
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class Person(Document):

tests/queryset/test_modify.py

@@ -1,11 +1,11 @@
 import unittest
 
 from mongoengine import (
-    connect,
     Document,
     IntField,
     ListField,
     StringField,
+    connect,
 )
 
 

tests/queryset/test_queryset.py

@@ -14,15 +14,15 @@ from mongoengine.connection import get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
 from mongoengine.mongodb_support import (
-    get_mongodb_version,
     MONGODB_36,
+    get_mongodb_version,
 )
 from mongoengine.queryset import (
     DoesNotExist,
     MultipleObjectsReturned,
     QuerySet,
-    queryset_manager,
     QuerySetManager,
+    queryset_manager,
 )
 from tests.utils import (
     requires_mongodb_gte_44,

tests/test_connection.py

@@ -9,16 +9,16 @@ from pymongo.errors import InvalidName, OperationFailure
 
 import mongoengine.connection
 from mongoengine import (
-    connect,
     DateTimeField,
-    disconnect_all,
     Document,
-    register_connection,
     StringField,
+    connect,
+    disconnect_all,
+    register_connection,
 )
 from mongoengine.connection import (
-    ConnectionFailure,
     DEFAULT_DATABASE_NAME,
+    ConnectionFailure,
     disconnect,
     get_connection,
     get_db,

tests/test_connection_mongomock.py

@@ -3,7 +3,7 @@ import unittest
 import pytest
 
 import mongoengine.connection
-from mongoengine import connect, disconnect_all, Document, StringField
+from mongoengine import Document, StringField, connect, disconnect_all
 from mongoengine.connection import get_connection
 
 try: