Add pytest (#45) (#55)

* Add pytest (#45) * Add pytest (#45) * Add pytest-django (#45) * Add pytest-django (#45) * Add pytest (#45) * s * fix flake8 --------- Co-authored-by: Konstantin Raikhert <raikhert13@gmail.com>
Studio-Yandex-Practicum · Dec 18, 2023 · 6c68d4a · 6c68d4a
1 parent dafdd2d
commit 6c68d4a
Show file tree

Hide file tree

Showing 22 changed files with 206 additions and 100 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
     rev: 6.1.0
     hooks:
       - id: flake8
-        exclude: migrations/|.*settings(\.py|/)?
+        exclude: migrations/|config/|.*settings(\.py|/)?
         additional_dependencies:
           - flake8-isort
           - flake8-django
@@ -41,4 +41,4 @@ repos:
         language: system
         pass_filenames: false
         entry: poetry export --without-hashes --output requirements/production.txt
-        files: ^(pyproject.toml|poetry.lock)$
+        files: ^(pyproject.toml|poetry.lock)$
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
 # Определение переменных
 PROJECT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 MANAGE_DIR := $(PROJECT_DIR)/adaptive_hockey_federation/manage.py
+DJANGO_DIR := $(PROJECT_DIR)/adaptive_hockey_federation
 POETRY_RUN := poetry run python
 DJANGO_RUN := $(POETRY_RUN) $(MANAGE_DIR)
 SHELL_GREEN = \033[32m
@@ -22,6 +23,7 @@ help:
 	@echo "	createsuperuser - $(SHELL_GREEN)Команда для создания супер-юзера.$(SHELL_NC)"
 	@echo "	run             - $(SHELL_GREEN)Команда для локального запуска проекта.$(SHELL_NC)"
 	@echo "	fill-db         - $(SHELL_GREEN)Команда для заполнения базы данных с помощью парсера.$(SHELL_NC)"
+	@echo "	pytest          - $(SHELL_GREEN)Команда для прогона юнит тестов pytest.$(SHELL_NC)"
 	@echo "	help            - $(SHELL_GREEN)Команда вызова справки.$(SHELL_NC)"
 	@echo "$(SHELL_YELLOW)Для запуска исполнения команд используйте данные ключи совместно с командой 'make', например 'make init-app'."
 	@echo "При запуске команды 'make' без какого либо ключа, происходит вызов справки.$(SHELL_NC)"
@@ -61,4 +63,9 @@ run:
 fill-db:
 	cd $(PROJECT_DIR) && $(DJANGO_RUN) fill-db
 
+# Прогон тестов с помощью pytest
+pytest:
+	cd $(DJANGO_DIR) && pytest
+
+
 .PHONY: help
diff --git a/...ration/adaptive_hockey_federation/asgi.py → adaptive_hockey_federation/core/asgi.py b/...ration/adaptive_hockey_federation/asgi.py → adaptive_hockey_federation/core/asgi.py
@@ -4,7 +4,7 @@
 
 os.environ.setdefault(
     'DJANGO_SETTINGS_MODULE',
-    'adaptive_hockey_federation.settings'
+    'core.config.dev_settings',
 )
 
 application = get_asgi_application()
diff --git a/...on/adaptive_hockey_federation/__init__.py → ...y_federation/core/config/base_settings.py b/...on/adaptive_hockey_federation/__init__.py → ...y_federation/core/config/base_settings.py
diff --git a/...on/adaptive_hockey_federation/settings.py → ...ey_federation/core/config/dev_settings.py b/...on/adaptive_hockey_federation/settings.py → ...ey_federation/core/config/dev_settings.py
@@ -3,7 +3,7 @@
 
 # import environ
 
-BASE_DIR = Path(__file__).resolve().parent.parent
+BASE_DIR = Path(__file__).resolve().parent.parent.parent
 
 # env = environ.Env(DEBUG=(bool, False))
 
@@ -39,7 +39,7 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ROOT_URLCONF = 'adaptive_hockey_federation.urls'
+ROOT_URLCONF = 'core.urls'
 
 TEMPLATES_DIR = BASE_DIR / 'templates'
 
@@ -59,7 +59,7 @@
     },
 ]
 
-WSGI_APPLICATION = 'adaptive_hockey_federation.wsgi.application'
+WSGI_APPLICATION = 'core.wsgi.application'
 
 DATABASES = {
     'default': {

diff --git a/adaptive_hockey_federation/core/config/prod_settings.py b/adaptive_hockey_federation/core/config/prod_settings.py
diff --git a/adaptive_hockey_federation/core/config/test_settings.py b/adaptive_hockey_federation/core/config/test_settings.py
diff --git a/adaptive_hockey_federation/core/management/commands/fill-db.py b/adaptive_hockey_federation/core/management/commands/fill-db.py
@@ -2,7 +2,7 @@
 
 from django.core.management.base import BaseCommand
 
-from adaptive_hockey_federation.settings import RESOURSES_ROOT
+from adaptive_hockey_federation.core.config.dev_settings import RESOURSES_ROOT
 
 
 class Command(BaseCommand):

diff --git a/...ration/adaptive_hockey_federation/urls.py → adaptive_hockey_federation/core/urls.py b/...ration/adaptive_hockey_federation/urls.py → adaptive_hockey_federation/core/urls.py
diff --git a/...ration/adaptive_hockey_federation/wsgi.py → adaptive_hockey_federation/core/wsgi.py b/...ration/adaptive_hockey_federation/wsgi.py → adaptive_hockey_federation/core/wsgi.py
@@ -4,7 +4,7 @@
 
 os.environ.setdefault(
     'DJANGO_SETTINGS_MODULE',
-    'adaptive_hockey_federation.settings'
+    'core.config.dev_settings',
 )
 
 application = get_wsgi_application()
diff --git a/adaptive_hockey_federation/main/migrations/0003_alter_player_patronymic.py b/adaptive_hockey_federation/main/migrations/0003_alter_player_patronymic.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.8 on 2023-12-16 13:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0002_alter_player_patronymic'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='player',
+            name='patronymic',
+            field=models.CharField(blank=True, default='--пусто--', help_text='Отчество', max_length=256, verbose_name='Отчество'),
+        ),
+    ]
diff --git a/adaptive_hockey_federation/manage.py b/adaptive_hockey_federation/manage.py
@@ -7,7 +7,7 @@
 def main():
     """Run administrative tasks."""
     os.environ.setdefault('DJANGO_SETTINGS_MODULE',
-                          'adaptive_hockey_federation.settings')
+                          'core.config.dev_settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

diff --git a/adaptive_hockey_federation/parser/docx_parser.py b/adaptive_hockey_federation/parser/docx_parser.py
@@ -4,7 +4,7 @@
 
 import docx  # type: ignore
 
-from adaptive_hockey_federation.core.user_card import BaseUserInfo
+from adaptive_hockey_federation.parser.user_card import BaseUserInfo
 
 NAME = '[И|и][М|м][Я|я]'
 SURNAME = '[Ф|ф][А|а][М|м][И|и][Л|л][И|и][Я|я]'

diff --git a/adaptive_hockey_federation/core/user_card.py → ...ive_hockey_federation/parser/user_card.py b/adaptive_hockey_federation/core/user_card.py → ...ive_hockey_federation/parser/user_card.py
diff --git a/adaptive_hockey_federation/parser/xlsx_parser.py b/adaptive_hockey_federation/parser/xlsx_parser.py
@@ -1,6 +1,6 @@
 import openpyxl
 
-from adaptive_hockey_federation.core.user_card import BaseUserInfo
+from adaptive_hockey_federation.parser.user_card import BaseUserInfo
 
 
 def xlsx_parser(path: str) -> list[BaseUserInfo]:

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -4,4 +4,4 @@ sleep 5
 app/.venv/bin/python manage.py collectstatic  --noinput
 mv /static/* /app/static/
 
-exec "$@"
+exec "$@"