From d36edfc063a82d47b96faa24811d049a4be9cfdf Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 2 Sep 2021 13:44:18 +0200 Subject: [PATCH] Linting Signed-off-by: Yohann D'ANELLO --- apps/wei/forms/surveys/wei2021.py | 8 ++++---- apps/wei/management/commands/wei_algorithm.py | 2 +- apps/wei/tests/test_wei_algorithm_2021.py | 8 +++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/wei/forms/surveys/wei2021.py b/apps/wei/forms/surveys/wei2021.py index 2a9d5d27..8d5adfad 100644 --- a/apps/wei/forms/surveys/wei2021.py +++ b/apps/wei/forms/surveys/wei2021.py @@ -16,7 +16,7 @@ WORDS = [ 'Fanfare', 'Fracassage', 'Féria', 'Hard rock', 'Hoeggarden', 'House', 'Huit-six', 'IPA', 'Inclusif', 'Inferno', 'Introverti', 'Jager bomb', 'Jazz', 'Jeux d\'alcool', 'Jeux de rôles', 'Jeux vidéo', 'Jul', 'Jus de fruit', 'Karaoké', 'LGBTQI+', 'Lady Gaga', 'Loup garou', 'Morning beer', 'Métal', 'Nuit blanche', 'Ovalie', 'Psychedelic', - 'Pétanque', 'Rave', 'Reggae', 'Rhum', 'Ricard', 'Rock', 'Rosé', 'Rétro', 'Séducteur', 'Techno', 'Thérapie taxi', + 'Pétanque', 'Rave', 'Reggae', 'Rhum', 'Ricard', 'Rock', 'Rosé', 'Rétro', 'Séducteur', 'Techno', 'Thérapie taxi', 'Théâtre', 'Trap', 'Turn up', 'Underground', 'Volley', 'Wati B', 'Zinédine Zidane', ] @@ -45,9 +45,9 @@ class WEISurveyForm2021(forms.Form): rng = Random(information.seed) words = [] - for _ in range(information.step + 1): + for _ignored in range(information.step + 1): # Generate N times words - words = [rng.choice(WORDS) for _ in range(10)] + words = [rng.choice(WORDS) for _ignored2 in range(10)] words = [(w, w) for w in words] if self.data: self.fields["word"].choices = [(w, w) for w in WORDS] @@ -162,7 +162,7 @@ class WEISurveyAlgorithm2021(WEISurveyAlgorithm): while free_surveys: # Some students are not affected survey = free_surveys[0] buses = survey.ordered_buses() # Preferences of the student - for bus, _ in buses: + for bus, _ignored in buses: if self.get_bus_information(bus).has_free_seats(surveys): # Selected bus has free places. Put student in the bus survey.select_bus(bus) diff --git a/apps/wei/management/commands/wei_algorithm.py b/apps/wei/management/commands/wei_algorithm.py index 152ca813..558dfae4 100644 --- a/apps/wei/management/commands/wei_algorithm.py +++ b/apps/wei/management/commands/wei_algorithm.py @@ -5,7 +5,7 @@ from argparse import ArgumentParser, FileType from django.core.management import BaseCommand from django.db import transaction -from wei.forms import CurrentSurvey +from ...forms import CurrentSurvey class Command(BaseCommand): diff --git a/apps/wei/tests/test_wei_algorithm_2021.py b/apps/wei/tests/test_wei_algorithm_2021.py index cbc06f4e..e1aab59b 100644 --- a/apps/wei/tests/test_wei_algorithm_2021.py +++ b/apps/wei/tests/test_wei_algorithm_2021.py @@ -1,11 +1,13 @@ -import math +# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + import random from django.contrib.auth.models import User from django.test import TestCase -from wei.forms.surveys.wei2021 import WEIBusInformation2021, WEISurvey2021, WORDS, WEISurveyInformation2021 -from wei.models import Bus, WEIClub, WEIRegistration +from ..forms.surveys.wei2021 import WEIBusInformation2021, WEISurvey2021, WORDS, WEISurveyInformation2021 +from ..models import Bus, WEIClub, WEIRegistration class TestWEIAlgorithm(TestCase):