Skip to content

Commit

Permalink
mypy; using py3.11 for some workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
David Slusser committed Jan 16, 2024
1 parent b1ea0ad commit 72f7d25
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 36 deletions.
1 change: 1 addition & 0 deletions .github/workflows/bandit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ jobs:
src: "django_project"
options: "-c pyproject.toml -r"
pip_install_command: "pip install .[dev]"
python_version: "3.11"
1 change: 1 addition & 0 deletions .github/workflows/black.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ jobs:
src: "django_project"
options: ""
pip_install_command: "pip install .[dev]"
python_version: "3.11"
54 changes: 27 additions & 27 deletions django_project/main_app/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


class EventAdmin(admin.ModelAdmin):
list_display = [
list_display: list = [
"id",
"created_at",
"updated_at",
Expand All @@ -27,8 +27,8 @@ class EventAdmin(admin.ModelAdmin):
"location",
"group",
]
search_fields = ["id", "name", "description", "duration", "location"]
list_filter = ["group"]
search_fields: list = ["id", "name", "description", "duration", "location"]
list_filter: list = ["group"]


class EventPlatformAdmin(admin.ModelAdmin):
Expand All @@ -38,51 +38,51 @@ class EventPlatformAdmin(admin.ModelAdmin):


class MemberAdmin(admin.ModelAdmin):
list_display = ["id", "created_at", "updated_at", "first_name", "last_name", "email", "zip_code"]
search_fields = ["id", "first_name", "last_name", "email", "zip_code"]
list_filter = []
list_display: list = ["id", "created_at", "updated_at", "first_name", "last_name", "email", "zip_code"]
search_fields: list = ["id", "first_name", "last_name", "email", "zip_code"]
list_filter: list = []


class MemberInterestAdmin(admin.ModelAdmin):
list_display = ["id", "member", "interest", "interest_level"]
search_fields = ["id", "interest_level"]
list_filter = ["member", "interest"]
list_display: list = ["id", "member", "interest", "interest_level"]
search_fields: list = ["id", "interest_level"]
list_filter: list = ["member", "interest"]


class MemberLinkAdmin(admin.ModelAdmin):
list_display = ["id", "member", "name", "description", "url", "is_public"]
search_fields = ["id", "name", "description", "url"]
list_filter = ["member", "is_public"]
list_display: list = ["id", "member", "name", "description", "url", "is_public"]
search_fields: list = ["id", "name", "description", "url"]
list_filter: list = ["member", "is_public"]


class MemberSkillAdmin(admin.ModelAdmin):
list_display = ["id", "member", "skill", "level", "yoe"]
search_fields = ["id", "yoe"]
list_filter = ["member", "skill", "level"]
list_display: list = ["id", "member", "skill", "level", "yoe"]
search_fields: list = ["id", "yoe"]
list_filter: list = ["member", "skill", "level"]


class SkillLevelAdmin(admin.ModelAdmin):
list_display = ["id", "created_at", "updated_at", "name", "description", "enabled"]
search_fields = ["id", "name", "description"]
list_filter = ["enabled"]
list_display: list = ["id", "created_at", "updated_at", "name", "description", "enabled"]
search_fields: list = ["id", "name", "description"]
list_filter: list = ["enabled"]


class TechnicalAreaAdmin(admin.ModelAdmin):
list_display = ["id", "created_at", "updated_at", "name", "description"]
search_fields = ["id", "name", "description"]
list_filter = []
list_display: list = ["id", "created_at", "updated_at", "name", "description"]
search_fields: list = ["id", "name", "description"]
list_filter: list = []


class TechGroupAdmin(admin.ModelAdmin):
list_display = ["id", "created_at", "updated_at", "name", "description", "enabled", "platform", "url"]
search_fields = ["id", "name", "description", "url"]
list_filter = ["enabled", "platform"]
list_display: list = ["id", "created_at", "updated_at", "name", "description", "enabled", "platform", "url"]
search_fields: list = ["id", "name", "description", "url"]
list_filter: list = ["enabled", "platform"]


class TechGroupLinkAdmin(admin.ModelAdmin):
list_display = ["id", "group", "name", "description", "url"]
search_fields = ["id", "name", "description", "url"]
list_filter = ["group"]
list_display: list = ["id", "group", "name", "description", "url"]
search_fields: list = ["id", "name", "description", "url"]
list_filter: list = ["group"]


# register models
Expand Down
10 changes: 5 additions & 5 deletions django_project/main_app/views/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
class Index(HandyHelperIndexView):
"""render the main_app index page"""

title = """Main_App"""
subtitle = "Select an option below"
item_list = [
title: str = """Main_App"""
subtitle: str = "Select an option below"
item_list: list = [
{
"url": "/main_app/dashboard",
"icon": "fas fa-tachometer-alt",
Expand All @@ -26,8 +26,8 @@ class Index(HandyHelperIndexView):
"description": "List RESTful APIs for Main_App",
},
]
protected_item_list = []
protected_group_name = "admin"
protected_item_list: list = []
protected_group_name: str = "admin"


# class ListMyModels(HandyHelperListPlusCreateAndFilterView):
Expand Down
6 changes: 3 additions & 3 deletions django_project/main_app/views/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def get(self, request):
class Main_AppAnnualProgressView(AnnualProgressView):
""" """

dataset_list = [
dataset_list: list = [
# dict(
# title="Model",
# queryset=Model.objects.all(),
Expand All @@ -43,7 +43,7 @@ class Main_AppAnnualProgressView(AnnualProgressView):
class Main_AppAnnualStatView(AnnualStatView):
""" """

dataset_list = [
dataset_list: list = [
# dict(
# title="Model",
# queryset=Model.objects.all(),
Expand All @@ -57,7 +57,7 @@ class Main_AppAnnualStatView(AnnualStatView):
class Main_AppAnnualTrendView(AnnualTrendView):
""" """

dataset_list = [
dataset_list: list = [
# dict(
# title="Model",
# queryset=Model.objects.all(),
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ profile = "black"


[tool.mypy]
exclude = ['venv/*']
exclude = ["venv/*", "^django_project/main_app/migrations/*"]
ignore_missing_imports = true


Expand Down

0 comments on commit 72f7d25

Please sign in to comment.