From 2313ebcdb4368f05095f65a0a050cde6d7bb6090 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 16 Jul 2019 12:59:11 +0200 Subject: [PATCH] Flake8 complient --- activity/models.py | 2 +- member/forms.py | 1 + member/models.py | 11 +++++++---- note/admin.py | 8 ++++---- note/models/__init__.py | 12 ++++++++++-- tox.ini | 5 +++-- 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/activity/models.py b/activity/models.py index 6f36b9e0..f5169e5e 100644 --- a/activity/models.py +++ b/activity/models.py @@ -2,9 +2,9 @@ # Copyright (C) 2018-2019 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +from django.conf import settings from django.db import models from django.utils.translation import gettext_lazy as _ -from django.conf import settings class ActivityType(models.Model): diff --git a/member/forms.py b/member/forms.py index a387d73c..6cc9ca4e 100644 --- a/member/forms.py +++ b/member/forms.py @@ -10,6 +10,7 @@ class CustomUserChangeForm(UserChangeForm): Make first name, last name and email required in the default Django Auth User model """ + def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.fields['first_name'].required = True diff --git a/member/models.py b/member/models.py index dc3dcd8c..4910bc43 100644 --- a/member/models.py +++ b/member/models.py @@ -72,18 +72,21 @@ class Club(models.Model): membership_duration = models.DurationField( null=True, verbose_name=_('membership duration'), - help_text=_('The longest time a membership can last (NULL = infinite).'), + help_text=_('The longest time a membership can last ' + '(NULL = infinite).'), ) membership_start = models.DurationField( null=True, verbose_name=_('membership start'), - help_text=_('How long after January 1st the members can renew their membership.'), + help_text=_('How long after January 1st the members can renew ' + 'their membership.'), ) membership_end = models.DurationField( null=True, verbose_name=_('membership end'), - help_text=_('How long the membership can last after January 1st of the next year ' - 'after members can renew their membership.'), + help_text=_('How long the membership can last after January 1st ' + 'of the next year after members can renew their ' + 'membership.'), ) diff --git a/note/admin.py b/note/admin.py index b7fcbed4..7d82658d 100644 --- a/note/admin.py +++ b/note/admin.py @@ -1,9 +1,9 @@ from django.contrib import admin -from .models.notes import NoteClub, NoteUser, NoteSpecial, Alias +from .models.notes import Alias, NoteClub, NoteSpecial, NoteUser # Register your models here. -admin.site.register(NoteClub) -admin.site.register(NoteUser) -admin.site.register(NoteSpecial) admin.site.register(Alias) +admin.site.register(NoteClub) +admin.site.register(NoteSpecial) +admin.site.register(NoteUser) diff --git a/note/models/__init__.py b/note/models/__init__.py index 852104c0..b00572ce 100644 --- a/note/models/__init__.py +++ b/note/models/__init__.py @@ -2,5 +2,13 @@ # Copyright (C) 2018-2019 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from .notes import * -from .transactions import * +from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser +from .transactions import MembershipTransaction, Transaction, \ + TransactionTemplate + +__all__ = [ + # Notes + 'Alias', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser', + # Transactions + 'MembershipTransaction', 'Transaction', 'TransactionTemplate', +] diff --git a/tox.ini b/tox.ini index 615a2701..41474f6c 100644 --- a/tox.ini +++ b/tox.ini @@ -27,7 +27,7 @@ deps = pyflakes pylint commands = - flake8 note_* + flake8 activity member note pylint . [flake8] @@ -41,7 +41,8 @@ exclude = *.pyc, *.egg-info, .cache, - .eggs + .eggs, + *migrations* max-complexity = 10 import-order-style = google application-import-names = flake8