From 30d27459ddd0a0fa97908f788c85fa2c520a991d Mon Sep 17 00:00:00 2001 From: quark Date: Mon, 24 Feb 2025 18:57:07 +0100 Subject: [PATCH] modify tox.ini to use complex script for make wrapped (bypass C901 in linters) --- .../management/commands/generate_wrapped.py | 26 +++++++++---------- tox.ini | 3 ++- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/apps/wrapped/management/commands/generate_wrapped.py b/apps/wrapped/management/commands/generate_wrapped.py index 36842e50..9e5c19d2 100644 --- a/apps/wrapped/management/commands/generate_wrapped.py +++ b/apps/wrapped/management/commands/generate_wrapped.py @@ -211,50 +211,50 @@ class Command(BaseCommand): return def convert_to_note(self, change, create, bde=None, user=None, club=None, verb=1): - n = [] + notes = [] for b in bde: - note = Note.objects.filter(pk__lte=-1) + note_for_bde = Note.objects.filter(pk__lte=-1) if user: if 'custom' in user[0]: for u in user[1]: query = Q(noteuser__user=u) - note |= Note.objects.filter(query) + note_for_bde |= Note.objects.filter(query) elif user[0] == 'all': query = Q(noteuser__user__pk__gte=-1) - note |= Note.objects.filter(query) + note_for_bde |= Note.objects.filter(query) elif user[0] == 'adh': m = Membership.objects.filter(club=1, date_start__lt=b.date_end, date_end__gt=b.date_start, ).distinct('user') for membership in m: - note |= Note.objects.filter(noteuser__user=membership.user) + note_for_bde |= Note.objects.filter(noteuser__user=membership.user) elif user[0] == 'superuser': query |= Q(noteuser__user__is_superuser=True) - note |= Note.objects.filter(query) + note_for_bde |= Note.objects.filter(query) if club: if 'custom' in club[0]: for c in club[1]: query = Q(noteclub__club=c) - note |= Note.objects.filter(query) + note_for_bde |= Note.objects.filter(query) elif club[0] == 'all': query = Q(noteclub__club__pk__gte=-1) - note |= Note.objects.filter(query) + note_for_bde |= Note.objects.filter(query) elif club[0] == 'active': nc = Note.objects.filter(noteclub__club__pk__gte=-1) for noteclub in nc: if Transaction.objects.filter( Q(created_at__gte=b.date_start, created_at__lte=b.date_end) & (Q(source=noteclub) | Q(destination=noteclub))): - note |= Note.objects.filter(pk=n.pk) + note_for_bde |= Note.objects.filter(pk=noteclub.pk) - note = self.filter_note(b, note, change, create, verb=verb) - n.append(note) + note_for_bde = self.filter_note(b, note_for_bde, change, create, verb=verb) + notes.append(note_for_bde) if verb >= 2: - print("\033[m{nb} note selectionned for bde {bde}".format(nb=len(note), bde=b.name)) - return n + print("\033[m{nb} note selectionned for bde {bde}".format(nb=len(note_for_bde), bde=b.name)) + return notes def global_data(self, bde, verb=1): data = {} diff --git a/tox.ini b/tox.ini index 924ea514..1bfeb593 100644 --- a/tox.ini +++ b/tox.ini @@ -32,7 +32,8 @@ deps = pep8-naming pyflakes commands = - flake8 apps --extend-exclude apps/scripts + flake8 apps --extend-exclude apps/scripts,apps/wrapped/management/commands + flake8 apps/wrapped/management/commands --extend-ignore=C901 [flake8] ignore = W503, I100, I101, B019