Skip to content

Commit

Permalink
ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
magsyg committed Feb 8, 2024
1 parent daaefdc commit 799f982
Show file tree
Hide file tree
Showing 34 changed files with 213 additions and 265 deletions.
4 changes: 2 additions & 2 deletions backend/root/custom_classes/admin_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def user_link(self, obj: Contact) -> str:
def get_admin_url(*, obj: Any) -> str:
"""https://stackoverflow.com/questions/10420271/django-how-to-get-admin-url-from-model-instance"""
info = (obj._meta.app_label, obj._meta.model_name)
admin_url = reverse('admin:%s_%s_change' % info, args=(obj.pk, ))
admin_url = reverse('admin:%s_%s_change' % info, args=(obj.pk,))
return admin_url


Expand Down Expand Up @@ -258,7 +258,7 @@ def _insert_link(*, field: str, related_links: list[str]) -> str:

def autocomplete_filter(**kwargs: Any) -> AutocompleteFilter:
"""Simple AutocompleteFilter factory."""
return type('AutocompleteFilter', (AutocompleteFilter, ), kwargs)
return type('AutocompleteFilter', (AutocompleteFilter,), kwargs)


class CustomGuardedUserAdmin(CustomGuardedModelAdmin, UserAdmin):
Expand Down
1 change: 0 additions & 1 deletion backend/root/custom_classes/middlewares.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def process_exception(self, request: HttpRequest, exception: Exception) -> None:


class ImpersonateUserMiddleware:

def __init__(self, get_response: HttpResponse) -> None:
self.get_response = get_response

Expand Down
1 change: 0 additions & 1 deletion backend/root/custom_classes/permission_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@


class SuperUserPermission(BasePermission):

def has_permission(self, request: Request, view: APIView) -> bool: # noqa: PLR0917
user: User = request.user
return user.is_active and user.is_superuser
Expand Down
1 change: 0 additions & 1 deletion backend/root/db_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@


class SamfundetDatabaseRouter:

def db_for_read(self, model: Type[models.Model], **hints: dict[str, Any]) -> str | None:
if model in BILLIG_MODELS:
return 'billig'
Expand Down
1 change: 0 additions & 1 deletion backend/root/management/commands/cleanstart.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@


class Command(BaseCommand):

def add_arguments(self, parser):
parser.add_argument(
'--noinput',
Expand Down
1 change: 0 additions & 1 deletion backend/root/management/commands/deletemigrations.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@


class Command(BaseCommand):

def add_arguments(self, parser):
parser.add_argument(
'--noinput',
Expand Down
1 change: 0 additions & 1 deletion backend/root/management/commands/deploymigrations.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@


class Command(BaseCommand):

def add_arguments(self, parser):
parser.add_argument(
'--noinput',
Expand Down
1 change: 1 addition & 0 deletions backend/root/management/commands/generate_permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from django.utils import timezone
from django.contrib.auth.models import Permission
from django.core.management.base import BaseCommand

"""
NOTE: This command cannot run within docker container because the backend has no access to the frontend.
Use on host machine.
Expand Down
1 change: 0 additions & 1 deletion backend/root/management/commands/migratezero.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@


class Command(BaseCommand):

def add_arguments(self, parser):
parser.add_argument(
'--noinput',
Expand Down
3 changes: 1 addition & 2 deletions backend/root/management/commands/seed.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ def run_seed_script(*, target: tuple, index: int, count: int):
elif type(step) in [int, float]:
print_progress(progress=step, prefix=prefix, start_time=start_time)
else:
raise Exception(f"Seed script {target[0]} yielded wrong type '{type(step)}', "
'expected number type or tuple of (number, str)')
raise Exception(f"Seed script {target[0]} yielded wrong type '{type(step)}', " 'expected number type or tuple of (number, str)')

# Final output 100%.
if isinstance(step, tuple):
Expand Down
3 changes: 2 additions & 1 deletion backend/root/management/commands/seed_scripts/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ def do_seed():
name_nb=f'Billett {i + 1}',
name_en=f'Ticket {i + 1}',
price=random.randint(50, 200),
) for i in range(0, random.randint(2, 4))
)
for i in range(0, random.randint(2, 4))
]

# Create event(s)
Expand Down
32 changes: 15 additions & 17 deletions backend/root/management/commands/seed_scripts/gangs.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,21 @@
('Lørdagskomiteen', 'LØK'),
('Klubbstyret', 'KLST'),
],
'Drift':
[
('Markedsføringsgjengen', 'MG'),
('Fotogjengen', 'FG'),
('Diversegjengen', 'DG'),
('Forsterkerkomiteen', 'FK'),
('Regi', None),
('Videokomiteen', 'VK'),
],
'Kunstneriske':
[
('Studentersamfundets interne teater', 'SIT'),
('Studentersamfundets Symfoniorkester', 'Symforch'),
('Strindens promenadeorkester', 'SPO'),
('Pirum', None),
('Candiss', None),
],
'Drift': [
('Markedsføringsgjengen', 'MG'),
('Fotogjengen', 'FG'),
('Diversegjengen', 'DG'),
('Forsterkerkomiteen', 'FK'),
('Regi', None),
('Videokomiteen', 'VK'),
],
'Kunstneriske': [
('Studentersamfundets interne teater', 'SIT'),
('Studentersamfundets Symfoniorkester', 'Symforch'),
('Strindens promenadeorkester', 'SPO'),
('Pirum', None),
('Candiss', None),
],
'Styrende': [
('Finansstyret', 'FS'),
('Styret', None),
Expand Down
12 changes: 8 additions & 4 deletions backend/root/management/commands/seed_scripts/images.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@ def do_seed():
random_image = ImageFile(image_file, name=f'img_{i}')
title = words(random.randint(1, 2))
image = Image.objects.create(title=title, image=random_image)
image.tags.set(random.choices(
Tag.objects.all().values_list(flat=True, ),
k=random.randint(1, 4),
))
image.tags.set(
random.choices(
Tag.objects.all().values_list(
flat=True,
),
k=random.randint(1, 4),
)
)
yield int(i / COUNT * 100), 'Creating images'

# Remember to close files!
Expand Down
11 changes: 7 additions & 4 deletions backend/root/management/commands/seed_scripts/menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,13 @@ def seed():
FoodPreference.objects.all().delete()

# Create food preferences
prefs = [FoodPreference.objects.create(
name_nb=p_name[0],
name_en=p_name[1],
) for p_name in preferences]
prefs = [
FoodPreference.objects.create(
name_nb=p_name[0],
name_en=p_name[1],
)
for p_name in preferences
]
yield 10, f'Created {len(preferences)} food preferences'

# Create menu categories
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ def seed():
{
'recruitment_position': position,
'recruitment': position.recruitment,
'user': users[randint(0,
len(users) - 1)], # random user from all users
'user': users[randint(0, len(users) - 1)], # random user from all users
}
)
_admission, created = RecruitmentAdmission.objects.get_or_create(**admission_data)
Expand Down
4 changes: 2 additions & 2 deletions backend/root/management/commands/seed_scripts/samf3.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def seed() -> Iterator[tuple[int, str]]:
with open(event_path, 'r') as event_file:
with open(image_path, 'r') as image_file:
events = list(reversed(list(csv.DictReader(event_file))))
events = events[0:min(max_events, len(events))]
events = events[0 : min(max_events, len(events))]
images = list(csv.DictReader(image_file))
event_models = []

Expand All @@ -132,7 +132,7 @@ def seed() -> Iterator[tuple[int, str]]:

for chunk in range(len(events) // chunk_size):
start = chunk * chunk_size
events_in_chunk = events[start:min(start + chunk_size, len(events))]
events_in_chunk = events[start : min(start + chunk_size, len(events))]
jobs = [(images, event) for event in events_in_chunk]
models = pool.starmap(add_event, jobs)
models = [e for e in models if e is not None]
Expand Down
18 changes: 6 additions & 12 deletions backend/root/management/commands/seed_scripts/textitems.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,17 @@ def seed():
'text_en': 'Do you have any questions or want to get in touch with us? Don"t hesitate to contact us!',
},
{
'key':
'sulten_reservation_help',
'text_nb':
"""Bord må reserveres minst en dag i forveien. Mat kan forhåndsbestilles slik at dere ikke trenger å vente når dere kommer.
'key': 'sulten_reservation_help',
'text_nb': """Bord må reserveres minst en dag i forveien. Mat kan forhåndsbestilles slik at dere ikke trenger å vente når dere kommer.
Merk at flertallet av personer må være medlem for å reservere og at alle må være over 20 år etter kl 20:00 i helger.""",
'text_en':
"""Tables must be reserved at least one day in advance. Food can be pre-ordered so you do not have to wait when you arrive.
'text_en': """Tables must be reserved at least one day in advance. Food can be pre-ordered so you do not have to wait when you arrive.
Note that the majority of people must be a member of the Student Society to reserve
and that all must be over 20 years after 20:00 on weekends.""",
},
{
'key':
'sulten_reservation_contact',
'text_nb':
'Reservasjonssystemet vårt er fortsatt under utvikling, og vi ber om forbehold om at feil kan forekomme. Klikk her for å bestille via epost: ',
'text_en':
'Our reservation system is still under development, and reservation errors may therefore occur. Click here to order via email: ',
'key': 'sulten_reservation_contact',
'text_nb': 'Reservasjonssystemet vårt er fortsatt under utvikling, og vi ber om forbehold om at feil kan forekomme. Klikk her for å bestille via epost: ',
'text_en': 'Our reservation system is still under development, and reservation errors may therefore occur. Click here to order via email: ',
},
]

Expand Down
1 change: 0 additions & 1 deletion backend/root/management/commands/setupmigrations.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@


class Command(BaseCommand):

def handle(self, *args, **options):
for app in settings.PROJECT_APPS:
try:
Expand Down
1 change: 0 additions & 1 deletion backend/root/management/commands/setupmigrations2.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@


class Command(BaseCommand):

def handle(self, *args, **options):
for app in settings.INSTALLED_APPS:
appname = app.split('.')[-1]
Expand Down
3 changes: 1 addition & 2 deletions backend/root/settings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
# Raise exception if ENV is invalid (and show possible options).
if ENV not in Environment.VALID:
ENV_OPTIONS = ''.join([f'\n\t{env}' for env in Environment.VALID])
raise Exception(f"Environment variable 'ENV' is required to import this module ('{__name__}')."
f'Possible values: {ENV_OPTIONS}')
raise Exception(f"Environment variable 'ENV' is required to import this module ('{__name__}')." f'Possible values: {ENV_OPTIONS}')

if ENV == Environment.DEV:
from .dev import * # type: ignore[assignment] # noqa: F403
Expand Down
Loading

0 comments on commit 799f982

Please sign in to comment.