diff --git a/aleksis/apps/chronos/managers.py b/aleksis/apps/chronos/managers.py index 82413130acaa2ae90188f3b4b821de295076a8a1..7502b71a2f9a0860347bda94c2b368a7eaa55d06 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 326f51f34f62900c77f5b87f482f735ec5af7c04..d095c9b1d38d46c6ed66709774560b60a59b22ee 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 159f8e4cbfa08df8d5bf286b141e482591bfc658..d25375c7916abdc7664dad085704076eab5d1d5b 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 b45b86156fbbdd7203f87396cc98a07670b4eebb..a31e475d9aa3dfeff6610675d2d419a9328bcb61 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 a702ad804b3f80840a568507c3ee559b11420f47..d8a1e7b0e1799ce2227b6829f38e2c150675f520 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"