From 15abbb277b89d881d500a081559535b8bf931f70 Mon Sep 17 00:00:00 2001 From: Bastien Gerard Date: Fri, 20 Nov 2026 10:40:11 +0100 Subject: [PATCH] Upgrade precommit hooks --- .pre-commit-config.yaml | 8 +-- mongoengine/base/metaclasses.py | 2 +- mongoengine/dereference.py | 2 +- tests/queryset/test_queryset.py | 10 ++-- tests/test_dereference.py | 92 ++++++++++++++++----------------- 5 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index faf1ee2ee..ecd7f3a40 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,21 +8,21 @@ repos: - id: trailing-whitespace - id: end-of-file-fixer - repo: https://github.com/ambv/black - rev: 26.5.1 + rev: 26.10.1 hooks: - id: black - repo: https://github.com/pycqa/flake8 - rev: 7.3.0 + rev: 7.5.0 hooks: - id: flake8 additional_dependencies: - importlib_metadata<5 - repo: https://github.com/asottile/pyupgrade - rev: v3.21.2 + rev: v3.22.0 hooks: - id: pyupgrade args: [--py310-plus] - repo: https://github.com/pycqa/isort - rev: 9.0.0a3 + rev: 10.0.0b3 hooks: - id: isort diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py index a311aa167..12f7273f9 100644 --- a/mongoengine/base/metaclasses.py +++ b/mongoengine/base/metaclasses.py @@ -434,7 +434,7 @@ def get_auto_id_names(mcs, new_class): of ('auto_id_X', '_auto_id_X') if the default name is already taken. """ id_name, id_db_name = ("id", "_id") - existing_fields = {field_name for field_name in new_class._fields} + existing_fields = {*new_class._fields} existing_db_fields = {v.db_field for v in new_class._fields.values()} if id_name not in existing_fields and id_db_name not in existing_db_fields: return id_name, id_db_name diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py index d670e2c3e..7ce8b21a3 100644 --- a/mongoengine/dereference.py +++ b/mongoengine/dereference.py @@ -39,7 +39,7 @@ def __call__(self, items, max_depth=1, instance=None, name=None): # cheapest way to convert a queryset to a list # list(queryset) uses a count() query to determine length if isinstance(items, QuerySet): - items = [i for i in items] + items = [*items] self.max_depth = max_depth doc_type = None diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py index 64bfcc76f..441f68f72 100644 --- a/tests/queryset/test_queryset.py +++ b/tests/queryset/test_queryset.py @@ -1254,13 +1254,13 @@ def test_repeated_iteration(self): self.Person(name="Person 2").save() queryset = self.Person.objects - people1 = [person for person in queryset] - people2 = [person for person in queryset] + people1 = [*queryset] + people2 = [*queryset] # Check that it still works even if iteration is interrupted. for _person in queryset: break - people3 = [person for person in queryset] + people3 = [*queryset] assert people1 == people2 assert people1 == people3 @@ -5593,7 +5593,7 @@ class Person(Document): assert q == 0 people = Person.objects - [x for x in people] + [*people] assert 100 == len(people._result_cache) import platform @@ -5625,7 +5625,7 @@ class Person(Document): assert q == 0 people = Person.objects.no_cache() - [x for x in people] + [*people] assert q == 1 list(people) diff --git a/tests/test_dereference.py b/tests/test_dereference.py index d054a4fd4..b98e3db3e 100644 --- a/tests/test_dereference.py +++ b/tests/test_dereference.py @@ -49,7 +49,7 @@ class Group(Document): len(group_obj.members) assert q == 2 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 # Document select_related @@ -58,7 +58,7 @@ class Group(Document): group_obj = Group.objects.first().select_related() assert q == 2 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 # Queryset select_related @@ -67,7 +67,7 @@ class Group(Document): group_objs = Group.objects.select_related() assert q == 2 for group_obj in group_objs: - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 User.drop_collection() @@ -99,14 +99,14 @@ class Group(Document): group_obj = Group.objects.first() assert q == 1 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 assert group_obj._data["members"]._dereferenced # verifies that no additional queries gets executed # if we re-iterate over the ListField once it is # dereferenced - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 assert group_obj._data["members"]._dereferenced @@ -117,7 +117,7 @@ class Group(Document): group_obj = Group.objects.first().select_related() assert q == 2 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 # Queryset select_related @@ -126,7 +126,7 @@ class Group(Document): group_objs = Group.objects.select_related() assert q == 2 for group_obj in group_objs: - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 def test_list_item_dereference_orphan_dbref(self): @@ -158,14 +158,14 @@ class Group(Document): group_obj = Group.objects.first() assert q == 1 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 assert group_obj._data["members"]._dereferenced # verifies that no additional queries gets executed # if we re-iterate over the ListField once it is # dereferenced - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 assert group_obj._data["members"]._dereferenced @@ -505,10 +505,10 @@ class Group(Document): group_obj = Group.objects.first() assert q == 1 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for m in group_obj.members: @@ -521,10 +521,10 @@ class Group(Document): group_obj = Group.objects.first().select_related() assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for m in group_obj.members: @@ -538,10 +538,10 @@ class Group(Document): assert q == 4 for group_obj in group_objs: - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for m in group_obj.members: @@ -592,11 +592,11 @@ class Group(Document): group_obj = Group.objects.first() assert q == 1 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 assert group_obj._data["members"]._dereferenced - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 assert group_obj._data["members"]._dereferenced @@ -648,10 +648,10 @@ class Group(Document): group_obj = Group.objects.first() assert q == 1 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for m in group_obj.members: @@ -664,10 +664,10 @@ class Group(Document): group_obj = Group.objects.first().select_related() assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for m in group_obj.members: @@ -681,10 +681,10 @@ class Group(Document): assert q == 4 for group_obj in group_objs: - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for m in group_obj.members: @@ -723,7 +723,7 @@ class Group(Document): group_obj = Group.objects.first() assert q == 1 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 for _, m in group_obj.members.items(): @@ -736,7 +736,7 @@ class Group(Document): group_obj = Group.objects.first().select_related() assert q == 2 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 for k, m in group_obj.members.items(): @@ -750,7 +750,7 @@ class Group(Document): assert q == 2 for group_obj in group_objs: - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 for k, m in group_obj.members.items(): @@ -801,10 +801,10 @@ class Group(Document): group_obj = Group.objects.first() assert q == 1 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for k, m in group_obj.members.items(): @@ -817,10 +817,10 @@ class Group(Document): group_obj = Group.objects.first().select_related() assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for k, m in group_obj.members.items(): @@ -834,10 +834,10 @@ class Group(Document): assert q == 4 for group_obj in group_objs: - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for k, m in group_obj.members.items(): @@ -852,7 +852,7 @@ class Group(Document): group_obj = Group.objects.first() assert q == 1 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 1 assert group_obj.members == {} @@ -891,10 +891,10 @@ class Group(Document): group_obj = Group.objects.first() assert q == 1 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 for k, m in group_obj.members.items(): @@ -907,10 +907,10 @@ class Group(Document): group_obj = Group.objects.first().select_related() assert q == 2 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 for k, m in group_obj.members.items(): @@ -924,10 +924,10 @@ class Group(Document): assert q == 2 for group_obj in group_objs: - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 2 for _, m in group_obj.members.items(): @@ -978,10 +978,10 @@ class Group(Document): group_obj = Group.objects.first() assert q == 1 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for _, m in group_obj.members.items(): @@ -994,10 +994,10 @@ class Group(Document): group_obj = Group.objects.first().select_related() assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for _, m in group_obj.members.items(): @@ -1011,10 +1011,10 @@ class Group(Document): assert q == 4 for group_obj in group_objs: - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 4 for _, m in group_obj.members.items(): @@ -1029,7 +1029,7 @@ class Group(Document): group_obj = Group.objects.first() assert q == 1 - _ = [m for m in group_obj.members] + _ = [*group_obj.members] assert q == 1 UserA.drop_collection()