From a020808e03dbe9f7f38eff2575415759f6324686 Mon Sep 17 00:00:00 2001 From: Akromjon <152626511+RustamovAkrom@users.noreply.github.com> Date: Tue, 19 Nov 2024 18:39:57 +0500 Subject: [PATCH] lint code dev --- apps/blog/tests.py | 3 +-- apps/blog/views.py | 5 +---- apps/shared/management/commands/createadmin.py | 9 +++++---- apps/users/tests.py | 1 - core/config/apps.py | 5 ++--- core/settings/base.py | 16 +++++++++++----- core/settings/development.py | 7 ------- core/settings/production.py | 2 +- core/wsgi.py | 5 ++--- 9 files changed, 23 insertions(+), 30 deletions(-) diff --git a/apps/blog/tests.py b/apps/blog/tests.py index 219a865..dd8a427 100644 --- a/apps/blog/tests.py +++ b/apps/blog/tests.py @@ -1,12 +1,11 @@ from datetime import datetime from django.test import TestCase -from django.core.files.uploadedfile import UploadedFile from apps.users.models import User from apps.blog.models import Post from django.urls import reverse -from .forms import PostCreateUpdateForm, SettingsUserForm, SettingsUserProfileForm +from .forms import PostCreateUpdateForm, SettingsUserForm from .choices import StatusChoice diff --git a/apps/blog/views.py b/apps/blog/views.py index 970adbb..03bb904 100644 --- a/apps/blog/views.py +++ b/apps/blog/views.py @@ -1,17 +1,14 @@ import datetime -from functools import wraps -from typing import Any from django.shortcuts import render, redirect, get_object_or_404 from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import TemplateView, DeleteView from django.contrib import messages -from django.http import HttpRequest from django.views import View from django.urls import reverse from apps.users.models import User -from apps.shared.mixins import CustomHtmxMixin, render_htmx_or_default +from apps.shared.mixins import CustomHtmxMixin from .models import Post from .forms import ( PostCreateUpdateForm, diff --git a/apps/shared/management/commands/createadmin.py b/apps/shared/management/commands/createadmin.py index bed2df5..ae3f06f 100644 --- a/apps/shared/management/commands/createadmin.py +++ b/apps/shared/management/commands/createadmin.py @@ -1,12 +1,11 @@ import os -from dotenv import load_dotenv +from django.contrib.auth import get_user_model +from django.core.management import BaseCommand +from dotenv import load_dotenv load_dotenv() -from django.contrib.auth import get_user_model -from django.core.management.base import BaseCommand - ADMIN_USERNAME = str(os.getenv("ADMIN_USERNAME")) ADMIN_PASSWORD = str(os.getenv("ADMIN_PASSWORD")) @@ -14,6 +13,8 @@ class Command(BaseCommand): + help = "Create superuser" + def handle(self, *args, **options): User = get_user_model() self.create_superuser(User, ADMIN_USERNAME, ADMIN_EMAIL, ADMIN_PASSWORD) diff --git a/apps/users/tests.py b/apps/users/tests.py index bbc2591..3b266f9 100644 --- a/apps/users/tests.py +++ b/apps/users/tests.py @@ -2,7 +2,6 @@ from django.urls import reverse from .models import User, UserProfile -from .services import generate_jwt_tokens from .forms import RegisterForm, LoginForm from rest_framework_simplejwt.tokens import RefreshToken, AccessToken diff --git a/core/config/apps.py b/core/config/apps.py index 61082ce..83de4a9 100644 --- a/core/config/apps.py +++ b/core/config/apps.py @@ -1,5 +1,4 @@ DEFAULT_APPS = [ - # Default apps "django.contrib.admin", "django.contrib.auth", "django.contrib.contenttypes", @@ -10,14 +9,14 @@ "django.contrib.staticfiles", "django.contrib.postgres", ] + PROJECT_APPS = [ - # Project apps "apps.shared.apps.SharedConfig", "apps.blog.apps.BlogConfig", "apps.users.apps.UsersConfig", ] + THIRD_PARTY_APPS = [ - # Third party apps "rest_framework", "rest_framework_simplejwt", "rest_framework_simplejwt.token_blacklist", diff --git a/core/settings/base.py b/core/settings/base.py index 9ef9376..82bd896 100644 --- a/core/settings/base.py +++ b/core/settings/base.py @@ -17,7 +17,7 @@ ALLOWED_HOSTS = str(os.getenv("ALLOWED_HOSTS")).split(",") -INSTALLED_APPS = DEFAULT_APPS + PROJECT_APPS + THIRD_PARTY_APPS +INSTALLED_APPS = DEFAULT_APPS + PROJECT_APPS + THIRD_PARTY_APPS # NOQA MIDDLEWARE = [ @@ -34,7 +34,7 @@ ROOT_URLCONF = "core.urls" -TEMPLATES_DIRS = [os.path.join(BASE_DIR, "templates")] +TEMPLATES_DIRS = [BASE_DIR.joinpath("templates")] TEMPLATES = [ { @@ -52,6 +52,12 @@ }, ] +DATABASES = { + "default": { + "ENGINE": "django.db.backends.sqlite3", + "NAME": BASE_DIR.joinpath("db.sqlite3"), + }, +} WSGI_APPLICATION = "core.wsgi.application" @@ -83,8 +89,8 @@ LOGIN_REDIRECT_URL = "/" STATIC_URL = "static/" -STATIC_ROOT = BASE_DIR / "staticfiles" -STATICFILES_DIRS = [BASE_DIR / "static"] +STATIC_ROOT = BASE_DIR.joinpath("staticfiles") +STATICFILES_DIRS = [BASE_DIR.joinpath("static")] # AUTHENTICATION_BACKENDS = ( # 'apps.users.authentication.JWTAdminAuthentication', @@ -92,7 +98,7 @@ # ) MEDIA_URL = "media/" -MEDIA_ROOT = BASE_DIR / "media/" +MEDIA_ROOT = BASE_DIR.joinpath("media/") DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" diff --git a/core/settings/development.py b/core/settings/development.py index 96882c3..00b67d5 100644 --- a/core/settings/development.py +++ b/core/settings/development.py @@ -1,10 +1,3 @@ from .base import * # noqa EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" - -DATABASES = { - "default": { - "ENGINE": f"django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", - } -} diff --git a/core/settings/production.py b/core/settings/production.py index adf9b66..5881584 100644 --- a/core/settings/production.py +++ b/core/settings/production.py @@ -12,7 +12,7 @@ DATABASES = { "default": { - "ENGINE": f"django.db.backends.postgresql", + "ENGINE": "django.db.backends.postgresql", "NAME": str(os.getenv("DATABASE_NAME")), "USER": str(os.getenv("DATABASE_USER")), "PASSWORD": str(os.getenv("DATABASE_PASSWORD")), diff --git a/core/wsgi.py b/core/wsgi.py index 8ba2346..7546823 100644 --- a/core/wsgi.py +++ b/core/wsgi.py @@ -1,11 +1,10 @@ import os -from dotenv import load_dotenv +from django.core.wsgi import get_wsgi_application +from dotenv import load_dotenv load_dotenv() -from django.core.wsgi import get_wsgi_application - os.environ.setdefault( "DJANGO_SETTINGS_MODULE", os.getenv("DJANGO_SETTINGS_MODULE", "core.settings.development"),