Merge branch 'fix-ci' into 'master'

Rendre Erdnaxe heureux

See merge request bde/nk20!42

apps/activity/api/serializers.py

@@ -11,6 +11,7 @@ class ActivityTypeSerializer(serializers.ModelSerializer):
     REST API Serializer for Activity types.
     The djangorestframework plugin will analyse the model `ActivityType` and parse all fields in the API.
     """
+
     class Meta:
         model = ActivityType
         fields = '__all__'
@@ -21,6 +22,7 @@ class ActivitySerializer(serializers.ModelSerializer):
     REST API Serializer for Activities.
     The djangorestframework plugin will analyse the model `Activity` and parse all fields in the API.
     """
+
     class Meta:
         model = Activity
         fields = '__all__'
@@ -31,6 +33,7 @@ class GuestSerializer(serializers.ModelSerializer):
     REST API Serializer for Guests.
     The djangorestframework plugin will analyse the model `Guest` and parse all fields in the API.
     """
+
     class Meta:
         model = Guest
         fields = '__all__'

apps/activity/api/views.py

@@ -3,8 +3,8 @@
 
 from rest_framework import viewsets
 
-from ..models import ActivityType, Activity, Guest
 from .serializers import ActivityTypeSerializer, ActivitySerializer, GuestSerializer
+from ..models import ActivityType, Activity, Guest
 
 
 class ActivityTypeViewSet(viewsets.ModelViewSet):

apps/api/urls.py

@@ -14,6 +14,7 @@ class UserSerializer(serializers.ModelSerializer):
     REST API Serializer for Users.
     The djangorestframework plugin will analyse the model `User` and parse all fields in the API.
     """
+
     class Meta:
         model = User
         exclude = (

apps/logs/models.py

@@ -1,11 +1,11 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.contrib.contenttypes.models import ContentType
-from django.utils.translation import gettext_lazy as _
 from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.utils.translation import gettext_lazy as _
 
 
 class Changelog(models.Model):

apps/logs/signals.py

@@ -7,6 +7,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core import serializers
 from django.db.models.signals import pre_save, post_save, post_delete
 from django.dispatch import receiver
+
 from .models import Changelog
 
 

apps/member/api/serializers.py

@@ -11,6 +11,7 @@ class ProfileSerializer(serializers.ModelSerializer):
     REST API Serializer for Profiles.
     The djangorestframework plugin will analyse the model `Profile` and parse all fields in the API.
     """
+
     class Meta:
         model = Profile
         fields = '__all__'
@@ -21,6 +22,7 @@ class ClubSerializer(serializers.ModelSerializer):
     REST API Serializer for Clubs.
     The djangorestframework plugin will analyse the model `Club` and parse all fields in the API.
     """
+
     class Meta:
         model = Club
         fields = '__all__'
@@ -31,6 +33,7 @@ class RoleSerializer(serializers.ModelSerializer):
     REST API Serializer for Roles.
     The djangorestframework plugin will analyse the model `Role` and parse all fields in the API.
     """
+
     class Meta:
         model = Role
         fields = '__all__'
@@ -41,6 +44,7 @@ class MembershipSerializer(serializers.ModelSerializer):
     REST API Serializer for Memberships.
     The djangorestframework plugin will analyse the model `Memberships` and parse all fields in the API.
     """
+
     class Meta:
         model = Membership
         fields = '__all__'

apps/member/api/views.py

@@ -3,8 +3,8 @@
 
 from rest_framework import viewsets
 
-from ..models import Profile, Club, Role, Membership
 from .serializers import ProfileSerializer, ClubSerializer, RoleSerializer, MembershipSerializer
+from ..models import Profile, Club, Role, Membership
 
 
 class ProfileViewSet(viewsets.ModelViewSet):

apps/member/filters.py

@@ -1,11 +1,11 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django_filters import FilterSet, CharFilter
-from django.contrib.auth.models import User
-from django.db.models import CharField
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Submit
+from django.contrib.auth.models import User
+from django.db.models import CharField
+from django_filters import FilterSet, CharFilter
 
 
 class UserFilter(FilterSet):

apps/member/forms.py

@@ -1,17 +1,16 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+from crispy_forms.bootstrap import Div
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import Layout
 from dal import autocomplete
+from django import forms
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User
-from django import forms
 
 from .models import Profile, Club, Membership
 
-from crispy_forms.helper import FormHelper
-from crispy_forms.bootstrap import Div
-from crispy_forms.layout import Layout
-
 
 class SignUpForm(UserCreationForm):
     def __init__(self, *args, **kwargs):
@@ -28,6 +27,7 @@ class ProfileForm(forms.ModelForm):
     """
     A form for the extras field provided by the :model:`member.Profile` model.
     """
+
     class Meta:
         model = Profile
         fields = '__all__'

apps/member/models.py

@@ -3,8 +3,8 @@
 
 from django.conf import settings
 from django.db import models
-from django.utils.translation import gettext_lazy as _
 from django.urls import reverse, reverse_lazy
+from django.utils.translation import gettext_lazy as _
 
 
 class Profile(models.Model):
@@ -153,7 +153,6 @@ class Membership(models.Model):
         verbose_name = _('membership')
         verbose_name_plural = _('memberships')
 
-
 # @receiver(post_save, sender=settings.AUTH_USER_MODEL)
 # def save_user_profile(instance, created, **_kwargs):
 #     """

apps/member/signals.py

@@ -1,6 +1,7 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+
 def save_user_profile(instance, created, raw, **_kwargs):
     """
     Hook to create and save a profile when an user is updated if it is not registered with the signup form

apps/member/views.py

@@ -1,33 +1,33 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+import io
+
+from PIL import Image
+from dal import autocomplete
+from django.conf import settings
+from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.models import User
+from django.core.exceptions import ValidationError
+from django.db.models import Q
+from django.http import HttpResponseRedirect
 from django.shortcuts import redirect
+from django.urls import reverse_lazy
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, DetailView, UpdateView, TemplateView, DeleteView
 from django.views.generic.edit import FormMixin
-from django.contrib.auth.models import User
-from django.contrib import messages
-from django.urls import reverse_lazy
-from django.http import HttpResponseRedirect
-from django.db.models import Q
-from django.core.exceptions import ValidationError
-from django.conf import settings
 from django_tables2.views import SingleTableView
 from rest_framework.authtoken.models import Token
-from dal import autocomplete
+from note.forms import AliasForm, ImageForm
-from PIL import Image
-import io
-
 from note.models import Alias, NoteUser
 from note.models.transactions import Transaction
 from note.tables import HistoryTable, AliasTable
-from note.forms import AliasForm, ImageForm
 
-from .models import Profile, Club, Membership
-from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, MemberFormSet, FormSetHelper
-from .tables import ClubTable, UserTable
 from .filters import UserFilter, UserFilterFormHelper
+from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, MemberFormSet, FormSetHelper
+from .models import Club, Membership
+from .tables import ClubTable, UserTable
 
 
 class UserCreateView(CreateView):
@@ -157,6 +157,7 @@ class UserListView(LoginRequiredMixin, SingleTableView):
         context["filter"] = self.filter
         return context
 
+
 class AliasView(LoginRequiredMixin, FormMixin, DetailView):
     model = User
     template_name = 'member/profile_alias.html'
@@ -186,6 +187,7 @@ class AliasView(LoginRequiredMixin,FormMixin,DetailView):
         alias.save()
         return super().form_valid(form)
 
+
 class DeleteAliasView(LoginRequiredMixin, DeleteView):
     model = Alias
 
@@ -207,11 +209,13 @@ class DeleteAliasView(LoginRequiredMixin, DeleteView):
     def get(self, request, *args, **kwargs):
         return self.post(request, *args, **kwargs)
 
+
 class ProfilePictureUpdateView(LoginRequiredMixin, FormMixin, DetailView):
     model = User
     template_name = 'member/profile_picture_update.html'
     context_object_name = 'user_object'
     form_class = ImageForm
+
     def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)
         context['form'] = self.form_class(self.request.POST, self.request.FILES)
@@ -238,7 +242,7 @@ class ProfilePictureUpdateView(LoginRequiredMixin, FormMixin, DetailView):
         h = form.cleaned_data['height']
         # image crop and resize
         image_file = io.BytesIO(image_field.read())
-        ext = image_field.name.split('.')[-1].lower()
+        # ext = image_field.name.split('.')[-1].lower()
         # TODO: support GIF format
         image = Image.open(image_file)
         image = image.crop((x, y, x + w, y + h))
@@ -283,6 +287,7 @@ class UserAutocomplete(autocomplete.Select2QuerySetView):
     """
     Auto complete users by usernames
     """
+
     def get_queryset(self):
         """
         Quand une personne cherche un utilisateur par pseudo, une requête est envoyée sur l'API dédiée à l'auto-complétion.

apps/note/api/serializers.py

@@ -13,6 +13,7 @@ class NoteSerializer(serializers.ModelSerializer):
     REST API Serializer for Notes.
     The djangorestframework plugin will analyse the model `Note` and parse all fields in the API.
     """
+
     class Meta:
         model = Note
         fields = '__all__'
@@ -29,6 +30,7 @@ class NoteClubSerializer(serializers.ModelSerializer):
     REST API Serializer for Club's notes.
     The djangorestframework plugin will analyse the model `NoteClub` and parse all fields in the API.
     """
+
     class Meta:
         model = NoteClub
         fields = '__all__'
@@ -39,6 +41,7 @@ class NoteSpecialSerializer(serializers.ModelSerializer):
     REST API Serializer for special notes.
     The djangorestframework plugin will analyse the model `NoteSpecial` and parse all fields in the API.
     """
+
     class Meta:
         model = NoteSpecial
         fields = '__all__'
@@ -49,6 +52,7 @@ class NoteUserSerializer(serializers.ModelSerializer):
     REST API Serializer for User's notes.
     The djangorestframework plugin will analyse the model `NoteUser` and parse all fields in the API.
     """
+
     class Meta:
         model = NoteUser
         fields = '__all__'
@@ -59,6 +63,7 @@ class AliasSerializer(serializers.ModelSerializer):
     REST API Serializer for Aliases.
     The djangorestframework plugin will analyse the model `Alias` and parse all fields in the API.
     """
+
     class Meta:
         model = Alias
         fields = '__all__'
@@ -78,6 +83,7 @@ class TransactionTemplateSerializer(serializers.ModelSerializer):
     REST API Serializer for Transaction templates.
     The djangorestframework plugin will analyse the model `TransactionTemplate` and parse all fields in the API.
     """
+
     class Meta:
         model = TransactionTemplate
         fields = '__all__'
@@ -88,6 +94,7 @@ class TransactionSerializer(serializers.ModelSerializer):
     REST API Serializer for Transactions.
     The djangorestframework plugin will analyse the model `Transaction` and parse all fields in the API.
     """
+
     class Meta:
         model = Transaction
         fields = '__all__'
@@ -98,6 +105,7 @@ class MembershipTransactionSerializer(serializers.ModelSerializer):
     REST API Serializer for Membership transactions.
     The djangorestframework plugin will analyse the model `MembershipTransaction` and parse all fields in the API.
     """
+
     class Meta:
         model = MembershipTransaction
         fields = '__all__'

apps/note/api/views.py

@@ -4,11 +4,11 @@
 from django.db.models import Q
 from rest_framework import viewsets
 
-from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias
-from ..models.transactions import TransactionTemplate, Transaction, MembershipTransaction
 from .serializers import NoteSerializer, NotePolymorphicSerializer, NoteClubSerializer, NoteSpecialSerializer, \
     NoteUserSerializer, AliasSerializer, \
     TransactionTemplateSerializer, TransactionSerializer, MembershipTransactionSerializer
+from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias
+from ..models.transactions import TransactionTemplate, Transaction, MembershipTransaction
 
 
 class NoteViewSet(viewsets.ModelViewSet):

apps/note/forms.py

@@ -3,17 +3,11 @@
 
 from dal import autocomplete
 from django import forms
-from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
-import os
+from .models import Alias
-
-from crispy_forms.helper import FormHelper
-from crispy_forms.bootstrap import Div
-from crispy_forms.layout import Layout, HTML
-
 from .models import Transaction, TransactionTemplate, TemplateTransaction
-from .models import Note, Alias
+
 
 class AliasForm(forms.ModelForm):
     class Meta:
@@ -62,7 +56,6 @@ class TransactionForm(forms.ModelForm):
     def save(self, commit=True):
         super().save(commit)
 
-
     def clean(self):
         """
         If the user has no right to transfer funds, then it will be the source of the transfer by default.
@@ -70,7 +63,7 @@ class TransactionForm(forms.ModelForm):
         """
 
         cleaned_data = super().clean()
-        if not "source" in cleaned_data: # TODO Replace it with "if %user has no right to transfer funds"
+        if "source" not in cleaned_data:  # TODO Replace it with "if %user has no right to transfer funds"
             cleaned_data["source"] = self.user.note
 
         if cleaned_data["source"].pk == cleaned_data["destination"].pk:
@@ -78,7 +71,6 @@ class TransactionForm(forms.ModelForm):
 
         return cleaned_data
 
-
     class Meta:
         model = Transaction
         fields = (

apps/note/models/notes.py

@@ -9,6 +9,7 @@ from django.core.validators import RegexValidator
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 from polymorphic.models import PolymorphicModel
+
 """
 Defines each note types
 """

apps/note/models/transactions.py

@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.db import models
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-from django.urls import reverse
 from polymorphic.models import PolymorphicModel
 
 from .notes import Note, NoteClub
@@ -168,6 +168,7 @@ class TemplateTransaction(Transaction):
         on_delete=models.PROTECT,
     )
 
+
 class MembershipTransaction(Transaction):
     """
     Special type of :model:`note.Transaction` associated to a :model:`member.Membership`.

apps/note/tables.py

@@ -4,8 +4,10 @@
 import django_tables2 as tables
 from django.db.models import F
 from django_tables2.utils import A
-from .models.transactions import Transaction
+
 from .models.notes import Alias
+from .models.transactions import Transaction
+
 
 class HistoryTable(tables.Table):
     class Meta:
@@ -25,6 +27,7 @@ class HistoryTable(tables.Table):
             .order_by(('-' if is_descending else '') + 'total')
         return (queryset, True)
 
+
 class AliasTable(tables.Table):
     class Meta:
         attrs = {

apps/note/views.py

@@ -8,8 +8,8 @@ from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, ListView, UpdateView
 
-from .models import Transaction, TransactionTemplate, Alias, TemplateTransaction
 from .forms import TransactionForm, TransactionTemplateForm, ConsoForm
+from .models import Transaction, TransactionTemplate, Alias, TemplateTransaction
 
 
 class TransactionCreate(LoginRequiredMixin, CreateView):
@@ -53,6 +53,7 @@ class NoteAutocomplete(autocomplete.Select2QuerySetView):
     """
     Auto complete note by aliases
     """
+
     def get_queryset(self):
         """
         Quand une personne cherche un alias, une requête est envoyée sur l'API dédiée à l'auto-complétion.
@@ -147,4 +148,3 @@ class ConsoView(LoginRequiredMixin, CreateView):
         When clicking a button, reload the same page
         """
         return reverse('note:consos')
-

note_kfet/middlewares.py

@@ -1,10 +1,6 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.http import HttpResponseRedirect
-
-from urllib.parse import urlencode, parse_qs, urlsplit, urlunsplit
-
 
 class TurbolinksMiddleware(object):
     """
@@ -35,4 +31,3 @@ class TurbolinksMiddleware(object):
                     location = request.session.pop('_turbolinks_redirect_to')
                     response['Turbolinks-Location'] = location
         return response
-

note_kfet/settings/__init__.py

@@ -1,8 +1,6 @@
-import os
-import re
-
 from .base import *
 
+
 def read_env():
     """Pulled from Honcho code with minor updates, reads local default
     environment variables from a .env file located in the project root
@@ -25,11 +23,13 @@ def read_env():
                 val = re.sub(r'\\(.)', r'\1', m3.group(1))
             os.environ.setdefault(key, val)
 
+
 read_env()
 
 app_stage = os.environ.get('DJANGO_APP_STAGE', 'dev')
 if app_stage == 'prod':
     from .production import *
+
     DATABASES["default"]["PASSWORD"] = os.environ.get('DJANGO_DB_PASSWORD', 'CHANGE_ME_IN_ENV_SETTINGS')
     SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', 'CHANGE_ME_IN_ENV_SETTINGS')
     ALLOWED_HOSTS.append(os.environ.get('ALLOWED_HOSTS', 'localhost'))
@@ -43,4 +43,3 @@ except ImportError:
 
 # env variables set at the of in /env/bin/activate
 # don't forget to unset in deactivate !
-

note_kfet/settings/base.py

@@ -224,4 +224,3 @@ CAS_INFO_MESSAGES = {
 CAS_INFO_MESSAGES_ORDER = [
     'cas_explained',
 ]
-

note_kfet/settings/development.py

@@ -11,10 +11,11 @@
 #  - and more ...
 
 
+import os
+
 # Database
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 from . import *
-import os
 
 DATABASES = {
     'default': {
@@ -53,8 +54,6 @@ SESSION_COOKIE_AGE = 60 * 60 * 3
 # Can be modified in secrets.py
 CAS_SERVER_URL = "http://localhost:8000/cas/"
 
-
 STATIC_ROOT = ''  # not needed in development settings
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, 'static')]
-

note_kfet/urls.py

@@ -1,13 +1,12 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+from cas import views as cas_views
+from django.conf import settings
+from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import path, include
 from django.views.generic import RedirectView
-from django.conf.urls.static import static
-from django.conf import settings
-
-from cas import views as cas_views
 
 urlpatterns = [
     # Dev so redirect to something random

templates/cas_server/samlValidate.xml

@@ -1,9 +1,9 @@
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
   <SOAP-ENV:Header />
   <SOAP-ENV:Body>
-    <Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
+      <Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol"
-    xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" IssueInstant="{{IssueInstant}}"
+                IssueInstant="{{ IssueInstant }}"
                 MajorVersion="1" MinorVersion="1" Recipient="{{ Recipient }}"
                 ResponseID="{{ ResponseID }}">
       <Status>

templates/cas_server/samlValidateError.xml

@@ -1,9 +1,9 @@
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
   <SOAP-ENV:Header />
   <SOAP-ENV:Body>
-    <Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
+      <Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol"
-    xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" IssueInstant="{{IssueInstant}}"
+                IssueInstant="{{ IssueInstant }}"
                 MajorVersion="1" MinorVersion="1" Recipient="{{ Recipient }}"
                 ResponseID="{{ ResponseID }}">
       <Status>