diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index bfdfa3a4..b6820a33 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -140,4 +140,4 @@ jobs: - name: publish pypi uses: pypa/gh-action-pypi-publish@master with: - password: ${{ secrets.pypi_token }} \ No newline at end of file + password: ${{ secrets.pypi_token }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c34aaafe..f66db93b 100644 --- a/.pre-commit-config.yaml +++ b/.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: diff --git a/docs/guide/validation.rst b/docs/guide/validation.rst index 971f6eb5..e5b9ed66 100644 --- a/docs/guide/validation.rst +++ b/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 - diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py index 683f107f..46935c1b 100644 --- a/mongoengine/base/document.py +++ b/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 diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py index c1dc486d..a6803527 100644 --- a/mongoengine/base/fields.py +++ b/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 ( diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py index 1f0ce378..f388fe06 100644 --- a/mongoengine/dereference.py +++ b/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 diff --git a/mongoengine/document.py b/mongoengine/document.py index 327cf291..a7b4cf95 100644 --- a/mongoengine/document.py +++ b/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 diff --git a/mongoengine/fields.py b/mongoengine/fields.py index db252c9e..a3e483a4 100644 --- a/mongoengine/fields.py +++ b/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 diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py index 6d86f1ed..5dc47e00 100644 --- a/mongoengine/queryset/base.py +++ b/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 diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py index 49f2724c..b7c70bc0 100644 --- a/mongoengine/queryset/queryset.py +++ b/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__ = ( diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py index 9dd535e3..4c3d051b 100644 --- a/mongoengine/queryset/transform.py +++ b/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 diff --git a/setup.cfg b/setup.cfg index 04c965f7..aa965c8f 100644 --- a/setup.cfg +++ b/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 \ No newline at end of file diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py index 94923145..e308d12a 100644 --- a/tests/document/test_indexes.py +++ b/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, ) diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py index 42eb3330..21f2c82e 100644 --- a/tests/document/test_instance.py +++ b/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") diff --git a/tests/fields/test_boolean_field.py b/tests/fields/test_boolean_field.py index b2c87695..d82d149f 100644 --- a/tests/fields/test_boolean_field.py +++ b/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): diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py index 5a6544c2..63d5c527 100644 --- a/tests/fields/test_dict_field.py +++ b/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): diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py index 0a95f934..7dfcffef 100644 --- a/tests/fields/test_enum_field.py +++ b/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): diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py index a4d94afa..69fe1471 100644 --- a/tests/fields/test_fields.py +++ b/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 diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py index efc0a3ca..5b73102f 100644 --- a/tests/fields/test_long_field.py +++ b/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): diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py index 08a56979..afbf5004 100644 --- a/tests/fields/test_reference_field.py +++ b/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 diff --git a/tests/fields/test_string_field.py b/tests/fields/test_string_field.py index 289b049c..6e1d77f2 100644 --- a/tests/fields/test_string_field.py +++ b/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): diff --git a/tests/fields/test_uuid_field.py b/tests/fields/test_uuid_field.py index e26e14f7..ec81033b 100644 --- a/tests/fields/test_uuid_field.py +++ b/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): diff --git a/tests/queryset/test_modify.py b/tests/queryset/test_modify.py index 304322af..15e3af34 100644 --- a/tests/queryset/test_modify.py +++ b/tests/queryset/test_modify.py @@ -1,11 +1,11 @@ import unittest from mongoengine import ( - connect, Document, IntField, ListField, StringField, + connect, ) diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py index 95b8e03c..1aa4f32a 100644 --- a/tests/queryset/test_queryset.py +++ b/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, diff --git a/tests/test_connection.py b/tests/test_connection.py index e036953b..2b7d46a7 100644 --- a/tests/test_connection.py +++ b/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, diff --git a/tests/test_connection_mongomock.py b/tests/test_connection_mongomock.py index 4b76fe0c..6f9e2d26 100644 --- a/tests/test_connection_mongomock.py +++ b/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: