From 6fc56be168e7e6e10b0856f6c6b54cc608e6a843 Mon Sep 17 00:00:00 2001 From: David Slusser Date: Mon, 15 Jan 2024 16:40:58 -0800 Subject: [PATCH] isort and black --- django_project/core/urls/__init__.py | 2 +- django_project/core/urls/urls.py | 3 +- django_project/main_app/admin.py | 16 ++++++-- .../main_app/forms/filter_forms copy.py | 15 +++++-- django_project/main_app/forms/filter_forms.py | 15 +++++-- .../management/commands/generate_data.py | 16 ++++++-- django_project/main_app/urls/rest.py | 1 + django_project/main_app/views/gui.py | 2 +- django_project/main_app/views/list.py | 39 ++++++++++++------- django_project/main_app/views/report.py | 3 +- 10 files changed, 81 insertions(+), 31 deletions(-) diff --git a/django_project/core/urls/__init__.py b/django_project/core/urls/__init__.py index 31fc22e..fe5e5db 100644 --- a/django_project/core/urls/__init__.py +++ b/django_project/core/urls/__init__.py @@ -1 +1 @@ -from .urls import * # noqa: F403 +from .urls import * # noqa: F403 diff --git a/django_project/core/urls/urls.py b/django_project/core/urls/urls.py index 0fb24f2..c683f66 100644 --- a/django_project/core/urls/urls.py +++ b/django_project/core/urls/urls.py @@ -18,8 +18,7 @@ from django.contrib import admin from django.contrib.auth.views import logout_then_login from django.urls import include, path -from drf_spectacular.views import (SpectacularAPIView, SpectacularRedocView, - SpectacularSwaggerView) +from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView, SpectacularSwaggerView urlpatterns = [ # Django provided URLs diff --git a/django_project/main_app/admin.py b/django_project/main_app/admin.py index 6b788c7..cef6222 100644 --- a/django_project/main_app/admin.py +++ b/django_project/main_app/admin.py @@ -1,8 +1,18 @@ from django.contrib import admin + # import models -from main_app.models import (Event, EventPlatform, Member, MemberInterest, - MemberLink, MemberSkill, SkillLevel, TechGroup, - TechGroupLink, TechnicalArea) +from main_app.models import ( + Event, + EventPlatform, + Member, + MemberInterest, + MemberLink, + MemberSkill, + SkillLevel, + TechGroup, + TechGroupLink, + TechnicalArea, +) class EventAdmin(admin.ModelAdmin): diff --git a/django_project/main_app/forms/filter_forms copy.py b/django_project/main_app/forms/filter_forms copy.py index ae25327..ad5d9af 100644 --- a/django_project/main_app/forms/filter_forms copy.py +++ b/django_project/main_app/forms/filter_forms copy.py @@ -1,8 +1,17 @@ from django import forms + # import models -from main_app.models import (Event, EventPlatform, Member, MemberInterest, - MemberSkill, SkillLevel, TechGroup, TechGroupLink, - TechnicalArea) +from main_app.models import ( + Event, + EventPlatform, + Member, + MemberInterest, + MemberSkill, + SkillLevel, + TechGroup, + TechGroupLink, + TechnicalArea, +) base_choices = [(None, "--------")] diff --git a/django_project/main_app/forms/filter_forms.py b/django_project/main_app/forms/filter_forms.py index ae25327..ad5d9af 100644 --- a/django_project/main_app/forms/filter_forms.py +++ b/django_project/main_app/forms/filter_forms.py @@ -1,8 +1,17 @@ from django import forms + # import models -from main_app.models import (Event, EventPlatform, Member, MemberInterest, - MemberSkill, SkillLevel, TechGroup, TechGroupLink, - TechnicalArea) +from main_app.models import ( + Event, + EventPlatform, + Member, + MemberInterest, + MemberSkill, + SkillLevel, + TechGroup, + TechGroupLink, + TechnicalArea, +) base_choices = [(None, "--------")] diff --git a/django_project/main_app/management/commands/generate_data.py b/django_project/main_app/management/commands/generate_data.py index 9a6338f..7f048c7 100644 --- a/django_project/main_app/management/commands/generate_data.py +++ b/django_project/main_app/management/commands/generate_data.py @@ -3,10 +3,20 @@ from django.core.management.base import BaseCommand, CommandParser from faker import Faker + # import models -from main_app.models import (Event, EventPlatform, Member, MemberInterest, - MemberLink, MemberSkill, SkillLevel, TechGroup, - TechGroupLink, TechnicalArea) +from main_app.models import ( + Event, + EventPlatform, + Member, + MemberInterest, + MemberLink, + MemberSkill, + SkillLevel, + TechGroup, + TechGroupLink, + TechnicalArea, +) __version__ = "0.0.1" diff --git a/django_project/main_app/urls/rest.py b/django_project/main_app/urls/rest.py index 3a1f5ea..814ba9d 100644 --- a/django_project/main_app/urls/rest.py +++ b/django_project/main_app/urls/rest.py @@ -1,5 +1,6 @@ from django.conf.urls import include from django.urls import path + # from main_app.views import rest from rest_framework import routers diff --git a/django_project/main_app/views/gui.py b/django_project/main_app/views/gui.py index b3c7845..8192f1d 100644 --- a/django_project/main_app/views/gui.py +++ b/django_project/main_app/views/gui.py @@ -1,4 +1,4 @@ -from handyhelpers.views import (HandyHelperIndexView) +from handyhelpers.views import HandyHelperIndexView # import models # from main_app.models import () diff --git a/django_project/main_app/views/list.py b/django_project/main_app/views/list.py index fdc2dde..b6d4204 100644 --- a/django_project/main_app/views/list.py +++ b/django_project/main_app/views/list.py @@ -1,19 +1,32 @@ from djangoaddicts.pygwalker.views import PygWalkerListView + # import forms -from main_app.forms.filter_forms import (EventFilterForm, - EventPlatformFilterForm, - MemberFilterForm, - MemberInterestFilterForm, - MemberLinkFilterForm, - MemberSkillFilterForm, - SkillLevelFilterForm, - TechGroupFilterForm, - TechGroupLinkFilterForm, - TechnicalAreaFilterForm) +from main_app.forms.filter_forms import ( + EventFilterForm, + EventPlatformFilterForm, + MemberFilterForm, + MemberInterestFilterForm, + MemberLinkFilterForm, + MemberSkillFilterForm, + SkillLevelFilterForm, + TechGroupFilterForm, + TechGroupLinkFilterForm, + TechnicalAreaFilterForm, +) + # import models -from main_app.models import (Event, EventPlatform, Member, MemberInterest, - MemberLink, MemberSkill, SkillLevel, TechGroup, - TechGroupLink, TechnicalArea) +from main_app.models import ( + Event, + EventPlatform, + Member, + MemberInterest, + MemberLink, + MemberSkill, + SkillLevel, + TechGroup, + TechGroupLink, + TechnicalArea, +) class ListEvents(PygWalkerListView): diff --git a/django_project/main_app/views/report.py b/django_project/main_app/views/report.py index 3455b11..7190b45 100644 --- a/django_project/main_app/views/report.py +++ b/django_project/main_app/views/report.py @@ -3,8 +3,7 @@ # from django.conf import settings from django.shortcuts import render from django.views.generic import View -from handyhelpers.views.report import (AnnualProgressView, AnnualStatView, - AnnualTrendView) +from handyhelpers.views.report import AnnualProgressView, AnnualStatView, AnnualTrendView # from handyhelpers.views.report import get_colors