Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Re-add local import

Roland Geider3a62e1604bf2
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index fcc0ad5a1..d45fcdf24 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 bb7f2e260..ed10a40b5 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -17,10 +17,6 @@
import logging
from uuid import UUID
-# 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.contrib.postgres.search import TrigramSimilarity
@@ -28,6 +24,11 @@ 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,
@@ -91,6 +92,7 @@ from wger.utils.constants import (
from wger.utils.db import is_postgres_db
from wger.utils.language import load_language
+
logger = logging.getLogger(__name__)
diff --git a/wger/exercises/apps.py b/wger/exercises/apps.py
index 534797d21..a4ec74f71 100644
--- a/wger/exercises/apps.py
+++ b/wger/exercises/apps.py
@@ -23,6 +23,7 @@ class ExerciseConfig(AppConfig):
verbose_name = 'Exercise'
def ready(self):
+ import wger.exercises.signals
from actstream import registry
registry.register(self.get_model('Alias'))
diff --git a/wger/exercises/management/commands/read-exercise-cleanup.py b/wger/exercises/management/commands/read-exercise-cleanup.py
index 85ca8d3c0..697ad5f87 100644
--- a/wger/exercises/management/commands/read-exercise-cleanup.py
+++ b/wger/exercises/management/commands/read-exercise-cleanup.py
@@ -37,6 +37,7 @@ from wger.exercises.models import (
)
from wger.utils.constants import CC_BY_SA_4_ID
+
UUID_NEW = 'NEW'
VIDEO_AUTHOR = 'Goulart'
VIDEO_PATH = pathlib.Path('videos-tmp')
diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.py
index 64fdee960..8e853656c 100644
--- a/wger/exercises/models/base.py
+++ b/wger/exercises/models/base.py
@@ -34,6 +34,7 @@ from django.utils.translation import (
get_language,
gettext_lazy as _,
)
+
# Third Party
from simple_history.models import HistoricalRecords
@@ -51,6 +52,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/comment.py b/wger/exercises/models/comment.py
index cf619559e..2644bb897 100644
--- a/wger/exercises/models/comment.py
+++ b/wger/exercises/models/comment.py
@@ -20,11 +20,13 @@ import uuid
# Django
from django.db import models
from django.utils.translation import gettext_lazy as _
+
# Third Party
from simple_history.models import HistoricalRecords
# wger
from wger.utils.cache import reset_exercise_api_cache
+
# Local
from .translation import Translation
diff --git a/wger/exercises/models/deletion_log.py b/wger/exercises/models/deletion_log.py
index d7e9aa048..3b8775f59 100644
--- a/wger/exercises/models/deletion_log.py
+++ b/wger/exercises/models/deletion_log.py
@@ -61,7 +61,7 @@ class DeletionLog(models.Model):
null=True,
verbose_name='Replaced by',
help_text='UUID of the object replaced by the deleted one. At the moment only available '
- 'for exercise bases',
+ 'for exercises',
)
timestamp = models.DateTimeField(auto_now=True)
diff --git a/wger/exercises/models/exercise_alias.py b/wger/exercises/models/exercise_alias.py
index bc9d505bc..f4f03af60 100644
--- a/wger/exercises/models/exercise_alias.py
+++ b/wger/exercises/models/exercise_alias.py
@@ -21,11 +21,13 @@ import uuid
from django.contrib.postgres.indexes import GinIndex
from django.db import models
from django.utils.translation import gettext_lazy as _
+
# Third Party
from simple_history.models import HistoricalRecords
# wger
from wger.utils.cache import reset_exercise_api_cache
+
# Local
from .translation import Translation
diff --git a/wger/exercises/models/image.py b/wger/exercises/models/image.py
index be02bea1f..797bd57b4 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/translation.py b/wger/exercises/models/translation.py
index 7ed28b2b6..495783f48 100644
--- a/wger/exercises/models/translation.py
+++ b/wger/exercises/models/translation.py
@@ -17,8 +17,6 @@
# Standard Library
import uuid
-# Third Party
-import bleach
# Django
from django.contrib.postgres.indexes import GinIndex
from django.core.validators import MinLengthValidator
@@ -26,6 +24,9 @@ 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/video.py b/wger/exercises/models/video.py
index f0f52be12..07ba6e8b2 100644
--- a/wger/exercises/models/video.py
+++ b/wger/exercises/models/video.py
@@ -22,12 +22,14 @@ 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
# wger
from wger.utils.cache import reset_exercise_api_cache
+
try:
# Third Party
import ffmpeg
diff --git a/wger/exercises/signals.py b/wger/exercises/signals.py
index 0278803ba..47c5aa522 100644
--- a/wger/exercises/signals.py
+++ b/wger/exercises/signals.py
@@ -24,6 +24,7 @@ from django.db.models.signals import (
pre_save,
)
from django.dispatch import receiver
+
# Third Party
from easy_thumbnails.files import get_thumbnailer
from easy_thumbnails.signal_handlers import generate_aliases
diff --git a/wger/exercises/sync.py b/wger/exercises/sync.py
index e2b301283..22a238cc6 100644
--- a/wger/exercises/sync.py
+++ b/wger/exercises/sync.py
@@ -15,13 +15,14 @@
# Standard Library
import os
-# Third Party
-import requests
# Django
from django.conf import settings
from django.core.files import File
from django.core.files.temp import NamedTemporaryFile
+# Third Party
+import requests
+
# wger
from wger.core.api.endpoints import (
LANGUAGE_ENDPOINT,
diff --git a/wger/exercises/tests/test_exercise_translation.py b/wger/exercises/tests/test_exercise_translation.py
index 2b4679ff0..cab842417 100644
--- a/wger/exercises/tests/test_exercise_translation.py
+++ b/wger/exercises/tests/test_exercise_translation.py
@@ -21,6 +21,7 @@ from django.template import (
Template,
)
from django.urls import reverse
+
# Third Party
from rest_framework import status
diff --git a/wger/exercises/tests/test_history.py b/wger/exercises/tests/test_history.py
index 4e826bcfd..df3869ca3 100644
--- a/wger/exercises/tests/test_history.py
+++ b/wger/exercises/tests/test_history.py
@@ -12,13 +12,14 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
-from actstream import action as actstream_action
# Django
from django.contrib.auth.models import User
from django.contrib.contenttypes.models import ContentType
from django.urls import reverse
+# Third Party
+from actstream import action as actstream_action
+
# wger
from wger.core.tests.base_testcase import WgerTestCase
from wger.exercises.models import Translation
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 0738b59a1..6e2ca0858 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -37,6 +37,7 @@ from django.views.generic import DeleteView
from wger.exercises.models import Translation
from wger.utils.generic_views import WgerDeleteMixin
+
logger = logging.getLogger(__name__)
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.py
index c3e55ac77..850f4ac88 100644
--- a/wger/manager/api/views.py
+++ b/wger/manager/api/views.py
@@ -21,6 +21,7 @@ from datetime import datetime
# Django
from django.shortcuts import get_object_or_404
+
# Third Party
from rest_framework import viewsets
from rest_framework.decorators import action
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index ebabb16cd..e72133764 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -17,14 +17,6 @@
This file contains forms used in the application
"""
-# Third Party
-from crispy_forms.helper import FormHelper
-from crispy_forms.layout import (
- Column,
- Layout,
- Row,
- Submit,
-)
# Django
from django.forms import (
BooleanField,
@@ -43,6 +35,15 @@ from django.utils.translation import (
gettext_lazy,
)
+# Third Party
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import (
+ Column,
+ Layout,
+ Row,
+ Submit,
+)
+
# wger
from wger.core.models import (
RepetitionUnit,
diff --git a/wger/manager/management/commands/dummy-generator-routines.py b/wger/manager/management/commands/dummy-generator-routines.py
index d6dd6c232..7bc98a3f8 100644
--- a/wger/manager/management/commands/dummy-generator-routines.py
+++ b/wger/manager/management/commands/dummy-generator-routines.py
@@ -34,6 +34,7 @@ from wger.manager.models import (
WeightConfig,
)
+
logger = logging.getLogger(__name__)
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index d89b97610..fe84078b1 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -32,6 +32,7 @@ from wger.core.tests.base_testcase import (
from wger.manager.models import WorkoutLog
from wger.utils.cache import cache_mapper
+
logger = logging.getLogger(__name__)
diff --git a/wger/software/views.py b/wger/software/views.py
index eda53cd7a..88e198d19 100644
--- a/wger/software/views.py
+++ b/wger/software/views.py
@@ -15,14 +15,15 @@
# Standard Library
import logging
-# Third Party
-import requests
# Django
from django.conf import settings
from django.contrib.auth.models import User
from django.core.cache import cache
from django.shortcuts import render
+# Third Party
+import requests
+
# wger
from wger.core.forms import (
RegistrationForm,
@@ -31,6 +32,7 @@ from wger.core.forms import (
from wger.exercises.models import Exercise
from wger.nutrition.models import Ingredient
+
logger = logging.getLogger(__name__)
CACHE_KEY = 'landing-page-context'
diff --git a/wger/urls.py b/wger/urls.py
index 4ff616563..69e554979 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 (
@@ -50,6 +51,7 @@ from wger.nutrition.api import views as nutrition_api_views
from wger.utils.generic_views import TextTemplateView
from wger.weight.api import views as weight_api_views
+
#
# REST API
#