1
0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2024-12-25 05:42:23 +00:00

Upgrade dependencies

This commit is contained in:
Yohann D'ANELLO 2021-03-29 16:06:09 +02:00
parent 9359aa7606
commit 1df1766753
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
5 changed files with 34 additions and 8 deletions

View File

@ -1,4 +1,4 @@
FROM python:3.8-alpine FROM python:3.9-alpine
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
ENV DJANGO_ALLOW_ASYNC_UNSAFE 1 ENV DJANGO_ALLOW_ASYNC_UNSAFE 1

View File

@ -25,6 +25,8 @@ class PassageSerializer(serializers.ModelSerializer):
class PoolSerializer(serializers.ModelSerializer): class PoolSerializer(serializers.ModelSerializer):
passages = serializers.ListSerializer(child=PassageSerializer())
class Meta: class Meta:
model = Pool model = Pool
fields = '__all__' fields = '__all__'
@ -43,14 +45,17 @@ class SynthesisSerializer(serializers.ModelSerializer):
class TeamSerializer(serializers.ModelSerializer): class TeamSerializer(serializers.ModelSerializer):
participation = ParticipationSerializer()
class Meta: class Meta:
model = Team model = Team
fields = '__all__' fields = '__all__'
class TournamentSerializer(serializers.ModelSerializer): class TournamentSerializer(serializers.ModelSerializer):
teams = serializers.ListSerializer()
class Meta: class Meta:
model = Tournament model = Tournament
fields = '__all__' fields = ('name', 'date_start', 'date_end', 'place', 'max_teams', 'price', 'remote',
'inscription_limit', 'solution_limit', 'solutions_draw', 'syntheses_first_phase_limit',
'solutions_available_second_phase', 'syntheses_second_phase_limit',
'description', 'organizers', 'final', 'participations',)

View File

@ -1,6 +1,6 @@
# Copyright (C) 2020 by Animath # Copyright (C) 2020 by Animath
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
from django_filters.rest_framework import DjangoFilterBackend
from rest_framework.viewsets import ModelViewSet from rest_framework.viewsets import ModelViewSet
from .serializers import NoteSerializer, ParticipationSerializer, PassageSerializer, PoolSerializer, \ from .serializers import NoteSerializer, ParticipationSerializer, PassageSerializer, PoolSerializer, \
@ -11,38 +11,59 @@ from ..models import Note, Participation, Passage, Pool, Solution, Synthesis, Te
class NoteViewSet(ModelViewSet): class NoteViewSet(ModelViewSet):
queryset = Note.objects.all() queryset = Note.objects.all()
serializer_class = NoteSerializer serializer_class = NoteSerializer
filter_backends = [DjangoFilterBackend]
filterset_fields = ['jury', 'passage', 'defender_writing', 'defender_oral', 'opponent_writing',
'opponent_oral', 'reporter_writing', 'reporter_oral', ]
class ParticipationViewSet(ModelViewSet): class ParticipationViewSet(ModelViewSet):
queryset = Participation.objects.all() queryset = Participation.objects.all()
serializer_class = ParticipationSerializer serializer_class = ParticipationSerializer
filter_backends = [DjangoFilterBackend]
filterset_fields = ['team', 'team__name', 'team__trigram', 'tournament', 'tournament__name', 'valid', 'final', ]
class PassageViewSet(ModelViewSet): class PassageViewSet(ModelViewSet):
queryset = Passage.objects.all() queryset = Passage.objects.all()
serializer_class = PassageSerializer serializer_class = PassageSerializer
filter_backends = [DjangoFilterBackend]
filterset_fields = ['pool', 'place', 'solution_number', 'defender', 'opponent', 'reporter', ]
class PoolViewSet(ModelViewSet): class PoolViewSet(ModelViewSet):
queryset = Pool.objects.all() queryset = Pool.objects.all()
serializer_class = PoolSerializer serializer_class = PoolSerializer
filter_backends = [DjangoFilterBackend]
filterset_fields = ['tournament', 'tournament__name', 'round', 'participations', 'juries', 'bbb_url', ]
class SolutionViewSet(ModelViewSet): class SolutionViewSet(ModelViewSet):
queryset = Solution.objects.all() queryset = Solution.objects.all()
serializer_class = SolutionSerializer serializer_class = SolutionSerializer
filter_backends = [DjangoFilterBackend]
filterset_fields = ['participation', 'number', 'problem', 'final_solution', ]
class SynthesisViewSet(ModelViewSet): class SynthesisViewSet(ModelViewSet):
queryset = Synthesis.objects.all() queryset = Synthesis.objects.all()
serializer_class = SynthesisSerializer serializer_class = SynthesisSerializer
filter_backends = [DjangoFilterBackend]
filterset_fields = ['participation', 'number', 'passage', 'type', ]
class TeamViewSet(ModelViewSet): class TeamViewSet(ModelViewSet):
queryset = Team.objects.all() queryset = Team.objects.all()
serializer_class = TeamSerializer serializer_class = TeamSerializer
filter_backends = [DjangoFilterBackend]
filterset_fields = ['name', 'trigram', 'access_code', 'participation__valid', 'participation__tournament',
'participation__tournament__name', 'participation__valid', 'participation__final', ]
class TournamentViewSet(ModelViewSet): class TournamentViewSet(ModelViewSet):
queryset = Tournament.objects.all() queryset = Tournament.objects.all()
serializer_class = TournamentSerializer serializer_class = TournamentSerializer
filter_backends = [DjangoFilterBackend]
filterset_fields = ['name', 'date_start', 'date_end', 'place', 'max_teams', 'price', 'remote',
'inscription_limit', 'solution_limit', 'solutions_draw', 'syntheses_first_phase_limit',
'solutions_available_second_phase', 'syntheses_second_phase_limit',
'description', 'organizers', 'final', ]

View File

@ -1,5 +1,5 @@
asgiref~=3.3.1 asgiref~=3.3.1
Django~=3.0 Django~=3.1
django-address~=0.2 django-address~=0.2
django-bootstrap-datepicker-plus~=3.0 django-bootstrap-datepicker-plus~=3.0
django-cas-server~=1.2 django-cas-server~=1.2
@ -19,7 +19,7 @@ phonenumbers~=8.9.10
psycopg2-binary~=2.8 psycopg2-binary~=2.8
PyPDF3~=1.0.2 PyPDF3~=1.0.2
ipython~=7.19.0 ipython~=7.19.0
python-magic==0.4.18 python-magic>=0.4.21
requests~=2.25.0 requests~=2.25.0
sympasoap~=1.0 sympasoap~=1.0
whoosh~=2.7 whoosh~=2.7

View File

@ -23,7 +23,7 @@ deps =
django-rest-polymorphic~=0.1 django-rest-polymorphic~=0.1
phonenumbers~=8.9.10 phonenumbers~=8.9.10
PyPDF3~=1.0.2 PyPDF3~=1.0.2
python-magic==0.4.18 python-magic==0.4.21
whoosh~=2.7 whoosh~=2.7
commands = commands =
coverage run --source=apps,tfjm ./manage.py test apps/ tfjm/ coverage run --source=apps,tfjm ./manage.py test apps/ tfjm/