Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Automatic linting

Github-actions5bb999255dd6
diff --git a/wger/core/models/profile.py b/wger/core/models/profile.py
index abc5523bc..8edda7b73 100644
--- a/wger/core/models/profile.py
+++ b/wger/core/models/profile.py
@@ -38,6 +38,7 @@ from wger.utils.units import (
AbstractWeight,
)
from wger.weight.models import WeightEntry
+
# Local
from .language import Language
@@ -522,9 +523,9 @@ by the US Department of Agriculture. It is extremely complete, with around
"""
if (
not WeightEntry.objects.filter(user=self.user).exists() or (
- datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date >
- datetime.timedelta(days=3)
- )
+ datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date
+ > datetime.timedelta(days=3)
+ )
):
entry = WeightEntry()
entry.weight = weight
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 097bc3ea5..50bf816c2 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -16,6 +16,7 @@
from django.conf import settings
from django.core.cache import cache
from django.db.models import Q
+
# Third Party
from rest_framework import serializers
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 10eaf9c67..724281dd5 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -18,16 +18,17 @@
# Standard Library
import logging
-# Third Party
-import bleach
-from actstream import action as actstream_action
-from bleach.css_sanitizer import CSSSanitizer
# Django
from django.conf import settings
from django.db.models import Q
from django.utils.decorators import method_decorator
from django.utils.translation import gettext as _
from django.views.decorators.cache import cache_page
+
+# Third Party
+import bleach
+from actstream import action as actstream_action
+from bleach.css_sanitizer import CSSSanitizer
from drf_spectacular.types import OpenApiTypes
from drf_spectacular.utils import (
OpenApiParameter,
@@ -89,6 +90,7 @@ from wger.utils.constants import (
)
from wger.utils.language import load_language
+
logger = logging.getLogger(__name__)
diff --git a/wger/exercises/management/commands/warmup-exercise-api-cache.py b/wger/exercises/management/commands/warmup-exercise-api-cache.py
index 49d509e57..29db2a1f5 100644
--- a/wger/exercises/management/commands/warmup-exercise-api-cache.py
+++ b/wger/exercises/management/commands/warmup-exercise-api-cache.py
@@ -17,9 +17,7 @@ from django.core.cache import cache
from django.core.management.base import BaseCommand
# wger
-from wger.exercises.api.serializers import (
- ExerciseBaseInfoSerializer,
-)
+from wger.exercises.api.serializers import ExerciseBaseInfoSerializer
from wger.exercises.models import ExerciseBase
from wger.utils.cache import CacheKeyMapper
diff --git a/wger/exercises/migrations/0025_rename_update_date_exercise_last_update_and_more.py b/wger/exercises/migrations/0025_rename_update_date_exercise_last_update_and_more.py
index 60aca9295..4561ddcf8 100644
--- a/wger/exercises/migrations/0025_rename_update_date_exercise_last_update_and_more.py
+++ b/wger/exercises/migrations/0025_rename_update_date_exercise_last_update_and_more.py
@@ -49,22 +49,25 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='exercise',
name='created',
- field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now,
- verbose_name='Date'),
+ field=models.DateTimeField(
+ auto_now_add=True, default=django.utils.timezone.now, verbose_name='Date'
+ ),
preserve_default=False,
),
migrations.AddField(
model_name='exercisebase',
name='created',
- field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now,
- verbose_name='Date'),
+ field=models.DateTimeField(
+ auto_now_add=True, default=django.utils.timezone.now, verbose_name='Date'
+ ),
preserve_default=False,
),
migrations.AddField(
model_name='exerciseimage',
name='created',
- field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now,
- verbose_name='Date'),
+ field=models.DateTimeField(
+ auto_now_add=True, default=django.utils.timezone.now, verbose_name='Date'
+ ),
preserve_default=False,
),
migrations.AddField(
@@ -75,8 +78,9 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='exercisevideo',
name='created',
- field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now,
- verbose_name='Date'),
+ field=models.DateTimeField(
+ auto_now_add=True, default=django.utils.timezone.now, verbose_name='Date'
+ ),
preserve_default=False,
),
migrations.AddField(
@@ -87,43 +91,49 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='historicalexercise',
name='last_update',
- field=models.DateTimeField(blank=True, default=django.utils.timezone.now,
- editable=False, verbose_name='Date'),
+ field=models.DateTimeField(
+ blank=True, default=django.utils.timezone.now, editable=False, verbose_name='Date'
+ ),
preserve_default=False,
),
migrations.AddField(
model_name='historicalexercisebase',
name='last_update',
- field=models.DateTimeField(blank=True, default=django.utils.timezone.now,
- editable=False, verbose_name='Date'),
+ field=models.DateTimeField(
+ blank=True, default=django.utils.timezone.now, editable=False, verbose_name='Date'
+ ),
preserve_default=False,
),
migrations.AddField(
model_name='historicalexerciseimage',
name='created',
- field=models.DateTimeField(blank=True, default=django.utils.timezone.now,
- editable=False, verbose_name='Date'),
+ field=models.DateTimeField(
+ blank=True, default=django.utils.timezone.now, editable=False, verbose_name='Date'
+ ),
preserve_default=False,
),
migrations.AddField(
model_name='historicalexerciseimage',
name='last_update',
- field=models.DateTimeField(blank=True, default=django.utils.timezone.now,
- editable=False, verbose_name='Date'),
+ field=models.DateTimeField(
+ blank=True, default=django.utils.timezone.now, editable=False, verbose_name='Date'
+ ),
preserve_default=False,
),
migrations.AddField(
model_name='historicalexercisevideo',
name='created',
- field=models.DateTimeField(blank=True, default=django.utils.timezone.now,
- editable=False, verbose_name='Date'),
+ field=models.DateTimeField(
+ blank=True, default=django.utils.timezone.now, editable=False, verbose_name='Date'
+ ),
preserve_default=False,
),
migrations.AddField(
model_name='historicalexercisevideo',
name='last_update',
- field=models.DateTimeField(blank=True, default=django.utils.timezone.now,
- editable=False, verbose_name='Date'),
+ field=models.DateTimeField(
+ blank=True, default=django.utils.timezone.now, editable=False, verbose_name='Date'
+ ),
preserve_default=False,
),
]
diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.py
index 3be3ad637..c77b3e569 100644
--- a/wger/exercises/models/base.py
+++ b/wger/exercises/models/base.py
@@ -30,6 +30,7 @@ from django.utils.translation import (
get_language,
gettext_lazy as _,
)
+
# Third Party
from simple_history.models import HistoricalRecords
@@ -46,6 +47,7 @@ from wger.utils.models import (
AbstractLicenseModel,
collect_models_author_history,
)
+
# Local
from .category import ExerciseCategory
from .equipment import Equipment
diff --git a/wger/exercises/models/exercise.py b/wger/exercises/models/exercise.py
index 33c0efe09..047b9bc03 100644
--- a/wger/exercises/models/exercise.py
+++ b/wger/exercises/models/exercise.py
@@ -17,14 +17,15 @@
# Standard Library
import uuid
-# Third Party
-import bleach
# Django
from django.core.validators import MinLengthValidator
from django.db import models
from django.urls import reverse
from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _
+
+# Third Party
+import bleach
from simple_history.models import HistoricalRecords
# wger
diff --git a/wger/exercises/models/image.py b/wger/exercises/models/image.py
index 641a41ad4..80956af5e 100644
--- a/wger/exercises/models/image.py
+++ b/wger/exercises/models/image.py
@@ -21,6 +21,7 @@ import uuid
# Django
from django.db import models
from django.utils.translation import gettext_lazy as _
+
# Third Party
from simple_history.models import HistoricalRecords
diff --git a/wger/exercises/models/video.py b/wger/exercises/models/video.py
index 78e11bb61..724d76c03 100644
--- a/wger/exercises/models/video.py
+++ b/wger/exercises/models/video.py
@@ -22,9 +22,11 @@ import uuid
from django.core.exceptions import ValidationError
from django.db import models
from django.utils.translation import gettext_lazy as _
+
# Third Party
from simple_history.models import HistoricalRecords
+
try:
# Third Party
import ffmpeg
diff --git a/wger/exercises/tests/test_exercise_base_model.py b/wger/exercises/tests/test_exercise_base_model.py
index e71a11a7e..82b081b55 100644
--- a/wger/exercises/tests/test_exercise_base_model.py
+++ b/wger/exercises/tests/test_exercise_base_model.py
@@ -12,6 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
+# Standard Library
import datetime
# wger
@@ -56,13 +57,11 @@ class ExerciseBaseModelTestCase(WgerTestCase):
def test_access_date(self):
utc = datetime.timezone.utc
self.assertEqual(
- self.exercise.last_update_global,
- datetime.datetime(2023, 8, 9, 23, 0, tzinfo=utc)
+ self.exercise.last_update_global, datetime.datetime(2023, 8, 9, 23, 0, tzinfo=utc)
)
self.assertEqual(
- self.exercise.last_update,
- datetime.datetime(2020, 11, 1, 21, 10, tzinfo=utc)
+ self.exercise.last_update, datetime.datetime(2020, 11, 1, 21, 10, tzinfo=utc)
)
self.assertEqual(
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.py
index c5b00f736..421bd04ad 100644
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@ -24,6 +24,7 @@ from django.conf import settings
from django.shortcuts import get_object_or_404
from django.utils.decorators import method_decorator
from django.views.decorators.cache import cache_page
+
# Third Party
from drf_spectacular.types import OpenApiTypes
from drf_spectacular.utils import (
@@ -72,6 +73,7 @@ from wger.utils.constants import ENGLISH_SHORT_NAME
from wger.utils.language import load_language
from wger.utils.viewsets import WgerOwnerObjectModelViewSet
+
logger = logging.getLogger(__name__)
diff --git a/wger/nutrition/models/ingredient.py b/wger/nutrition/models/ingredient.py
index d9b3fb6c9..ea659ce5e 100644
--- a/wger/nutrition/models/ingredient.py
+++ b/wger/nutrition/models/ingredient.py
@@ -19,8 +19,6 @@ import logging
import uuid as uuid
from decimal import Decimal
-# Third Party
-import openfoodfacts
# Django
from django.conf import settings
from django.contrib.auth.models import User
@@ -41,6 +39,9 @@ from django.utils import translation
from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _
+# Third Party
+import openfoodfacts
+
# wger
from wger.core.models import Language
from wger.nutrition.consts import ENERGY_FACTOR
@@ -56,9 +57,11 @@ from wger.utils.models import (
AbstractLicenseModel,
AbstractSubmissionModel,
)
+
# Local
from .ingredient_category import IngredientCategory
+
logger = logging.getLogger(__name__)
diff --git a/wger/nutrition/models/log.py b/wger/nutrition/models/log.py
index e89d37bbf..d5918c9ec 100644
--- a/wger/nutrition/models/log.py
+++ b/wger/nutrition/models/log.py
@@ -25,6 +25,7 @@ from django.utils.translation import gettext_lazy as _
# wger
from wger.nutrition.helpers import BaseMealItem
+
# Local
from .ingredient import Ingredient
from .ingredient_weight_unit import IngredientWeightUnit
diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.py
index cbd88c437..7eb0c21cf 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -22,6 +22,7 @@ from unittest.mock import patch
# Django
from django.core.exceptions import ValidationError
from django.urls import reverse
+
# Third Party
from rest_framework import status
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index 59b9e74ad..a9bcffcaf 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -59,6 +59,7 @@ from wger.utils.generic_views import (
)
from wger.utils.language import load_language
+
logger = logging.getLogger(__name__)
diff --git a/wger/tasks.py b/wger/tasks.py
index 5a0888cdf..dc934557a 100644
--- a/wger/tasks.py
+++ b/wger/tasks.py
@@ -23,15 +23,17 @@ import tempfile
# Django
import django
-# Third Party
-import requests
from django.core.management import (
call_command,
execute_from_command_line,
)
from django.utils.crypto import get_random_string
+
+# Third Party
+import requests
from invoke import task
+
logger = logging.getLogger(__name__)
FIXTURE_URL = 'https://github.com/wger-project/data/raw/master/fixtures/'
diff --git a/wger/urls.py b/wger/urls.py
index 359c85e16..0907a0240 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -25,6 +25,7 @@ from django.contrib.sitemaps.views import (
sitemap,
)
from django.urls import path
+
# Third Party
from django_email_verification import urls as email_urls
from drf_spectacular.views import (
@@ -51,6 +52,7 @@ from wger.nutrition.sitemap import NutritionSitemap
from wger.utils.generic_views import TextTemplateView
from wger.weight.api import views as weight_api_views
+
# admin.autodiscover()
#