From 5f627dac0d0043ce382efde84b6ba250074f64ec Mon Sep 17 00:00:00 2001 From: Tom Teichler <tom.teichler@teckids.org> Date: Sat, 14 Nov 2020 18:25:24 +0100 Subject: [PATCH] [Reformat] Make lint clean --- aleksis/apps/chronos/managers.py | 1 - aleksis/apps/chronos/models.py | 6 +----- aleksis/apps/chronos/util/date.py | 3 +-- poetry.lock | 2 +- pyproject.toml | 2 +- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/aleksis/apps/chronos/managers.py b/aleksis/apps/chronos/managers.py index 82413130..7502b71a 100644 --- a/aleksis/apps/chronos/managers.py +++ b/aleksis/apps/chronos/managers.py @@ -210,7 +210,6 @@ class BreakManager(CurrentSiteManager): class WeekQuerySetMixin: def annotate_week(self, week: Union[CalendarWeek]): """Annotate all lessons in the QuerySet with the number of the provided calendar week.""" - return self.annotate( _week=models.Value(week.week, models.IntegerField()), _year=models.Value(week.year, models.IntegerField()), diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py index 326f51f3..d095c9b1 100644 --- a/aleksis/apps/chronos/models.py +++ b/aleksis/apps/chronos/models.py @@ -17,11 +17,7 @@ from django.utils.functional import classproperty from django.utils.translation import gettext_lazy as _ from cache_memoize import cache_memoize -from calendarweek.django import ( - CalendarWeek, - i18n_day_abbr_choices_lazy, - i18n_day_name_choices_lazy, -) +from calendarweek.django import CalendarWeek, i18n_day_abbr_choices_lazy, i18n_day_name_choices_lazy from colorfield.fields import ColorField from django_global_request.middleware import get_request diff --git a/aleksis/apps/chronos/util/date.py b/aleksis/apps/chronos/util/date.py index 159f8e4c..d25375c7 100644 --- a/aleksis/apps/chronos/util/date.py +++ b/aleksis/apps/chronos/util/date.py @@ -1,5 +1,5 @@ from datetime import date -from typing import List, Tuple, Union +from typing import List, Tuple from django.utils import timezone @@ -37,5 +37,4 @@ def get_weeks_for_year(year: int) -> List[CalendarWeek]: def get_current_year() -> int: """Get current year.""" - return timezone.now().year diff --git a/poetry.lock b/poetry.lock index b45b8615..a31e475d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1950,7 +1950,7 @@ testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pyt [metadata] lock-version = "1.1" python-versions = "^3.7" -content-hash = "fbd9b5a34e8697bf139045114e1ae736295514352dfa4befb00fa206d7e82cd5" +content-hash = "3ea95d61a58689b29cfd951e057fb15db09c21351ac9502acffeb9e478178468" [metadata.files] alabaster = [ diff --git a/pyproject.toml b/pyproject.toml index a702ad80..d8a1e7b0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ secondary = true [tool.poetry.dependencies] python = "^3.7" calendarweek = "^0.4.6" -aleksis-core = "^2.0a3.dev0+20201114132749.88d92354" +aleksis-core = "^2.0a3" [tool.poetry.dev-dependencies] sphinx = "^3.0" -- GitLab