Добавлен pre-commit

.github/workflows/mypy_flake.yml

@@ -11,12 +11,12 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
-      
+
       - name: Установка Poetry
         uses: snok/install-poetry@v1
         with:
           poetry-version: 1.7.0
-      
+
       - name: Извлечение репозитория
         uses: actions/checkout@v4
 
@@ -35,12 +35,12 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
-      
+
       - name: Установка Poetry
         uses: snok/install-poetry@v1
         with:
           poetry-version: 1.7.0
-      
+
       - name: Извлечение репозитория
         uses: actions/checkout@v4
 

.pre-commit-config.yaml

@@ -0,0 +1,44 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-docstring-first
+      - id: check-merge-conflict
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.1.0
+    hooks:
+      - id: flake8
+        exclude: migrations/|.*settings(\.py|/)?
+        additional_dependencies:
+          - flake8-isort
+          - flake8-django
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.6.0
+    hooks:
+      - id: mypy
+        additional_dependencies:
+        - django-stubs
+
+  - repo: local
+    hooks:
+      - id: export-dev-dependencies
+        name: Export dev Dependencies
+        language: system
+        pass_filenames: false
+        entry: poetry export --without-hashes --dev --output requirements/develop.txt
+        files: ^(pyproject.toml|poetry.lock)$
+      - id: export-prod-dependencies
+        name: Export prod Dependencies
+        language: system
+        pass_filenames: false
+        entry: poetry export --without-hashes --output requirements/production.txt
+        files: ^(pyproject.toml|poetry.lock)$

README.md

@@ -1,7 +1,7 @@
 # Федерация Адаптивного Хоккея
 
 #### Описание
-Проект для [Федерации адаптивного хоккея](https://paraicehockey.ru/) 
+Проект для [Федерации адаптивного хоккея](https://paraicehockey.ru/)
 
 # Содержание
 

adaptive_hockey_federation/main/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.2.6 on 2023-11-25 14:50
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

adaptive_hockey_federation/main/migrations/0003_alter_health_revision_alter_player_sex.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2023-12-08 22:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0002_alter_player_patronymic'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='health',
+            name='revision',
+            field=models.CharField(blank=True, max_length=256, verbose_name='Пересмотр класса ХДН'),
+        ),
+        migrations.AlterField(
+            model_name='player',
+            name='sex',
+            field=models.CharField(blank=True, choices=[('male', 'Мужской'), ('female', 'Женский')], max_length=6, verbose_name='Пол'),
+        ),
+    ]

adaptive_hockey_federation/main/models.py

@@ -1,3 +1,4 @@
+from django.db import models
 from django.db.models import (
     CASCADE,
     SET_NULL,
@@ -172,10 +173,9 @@ class Player(BasePerson):
         max_length=max(len(sex) for sex, _ in SEX_CHOICES),
         choices=SEX_CHOICES,
         blank=True,
-        null=True,
         verbose_name='Пол'
     )
-    team = ManyToManyField(
+    team: models.ManyToManyField = ManyToManyField(
         to=Team,
         through='PlayerTeam',
         verbose_name='Команда'
@@ -216,7 +216,6 @@ class Health(Model):
     revision = CharField(
         max_length=NAME_FIELD_LENGTH,
         blank=True,
-        null=True,
         verbose_name='Пересмотр класса ХДН',
     )
     anamnesis = ForeignKey(

adaptive_hockey_federation/main/views.py

@@ -1,6 +1,5 @@
 from django.shortcuts import render
 
-
 # пример рендера таблиц, удалить после реализации вьюх
 CONTEXT_EXAMPLE = {
     'table_head': {

adaptive_hockey_federation/parser/parser.py

@@ -82,9 +82,8 @@ def get_all_files(path: str) -> tuple[list[str], str | None]:
             if filename == NUMERIC_STATUSES:
                 numeric_statuses_filepath = os.path.join(dirpath, filename)
             file, extension = os.path.splitext(filename)
-            if (not file.startswith('~')
-                    and extension in FILES_EXTENSIONS
-                    and file not in FILES_BLACK_LIST):
+            if (not file.startswith('~') and extension
+                    in FILES_EXTENSIONS and file not in FILES_BLACK_LIST):
                 files.append(os.path.join(dirpath, filename))
     return files, numeric_statuses_filepath
 

adaptive_hockey_federation/templates/base.html

@@ -57,4 +57,4 @@
         </div>
     </div>
   </body>
-</html>
+</html>

adaptive_hockey_federation/templates/includes/button.html

@@ -4,4 +4,4 @@
     {% if current_url_name  == url_name %}bg-[#340061]{% else %}bg-[#64c2d1]{% endif %}">
       {{ name }}
   </a>
-{% endwith %}
+{% endwith %}

adaptive_hockey_federation/templates/includes/drawer.html

@@ -41,4 +41,4 @@
             </ul>
         </div>
     </div>
-</div>
+</div>

adaptive_hockey_federation/templates/includes/dropdown_button.html

@@ -1,7 +1,7 @@
 {% with request.resolver_match.view_name as view_name %}
 
   <li class="nav-item dropdown place-self-center p-0">
-    <a class="nav-link dropdown-toggle border border-primary bg-white w-44 text-slate-400 p-1.5 text-end" href="#" 
+    <a class="nav-link dropdown-toggle border border-primary bg-white w-44 text-slate-400 p-1.5 text-end" href="#"
     role="button" data-bs-toggle="dropdown" aria-expanded="false">
       {% if view_name  == 'main:users' %}Роль{% endif %}
       {% if view_name  == 'main:teams' %}Команда{% endif %}
@@ -16,4 +16,4 @@
       <li><a class="dropdown-item" href="#">...</a></li>
     </ul>
   </li>
-{% endwith %}
+{% endwith %}

adaptive_hockey_federation/templates/includes/header.html

@@ -21,4 +21,4 @@
       </li>
     </ul>
   </div>
-</nav>   
+</nav>

adaptive_hockey_federation/templates/includes/table.html

@@ -31,4 +31,4 @@
       </tr>
     {% endfor %}
   </tbody>
-</table>
+</table>

adaptive_hockey_federation/users/admin.py

@@ -1,5 +1,4 @@
 from django.contrib import admin
-
 from users.models import User
 
 

adaptive_hockey_federation/users/migrations/0001_initial.py

@@ -2,9 +2,9 @@
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
-from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

adaptive_hockey_federation/users/migrations/0003_alter_user_first_name_alter_user_last_name.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2023-12-08 22:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_alter_user_first_name_alter_user_last_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='first_name',
+            field=models.CharField(default='', max_length=256),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='last_name',
+            field=models.CharField(default='', max_length=256),
+        ),
+    ]

adaptive_hockey_federation/users/models.py

@@ -31,12 +31,10 @@ class User(AbstractUser):
     first_name = CharField(
         max_length=NAME_MAX_LENGTH,
         default='',
-        null=True,
     )
     last_name = CharField(
         max_length=NAME_MAX_LENGTH,
         default='',
-        null=True,
     )
     team = ForeignKey(
         to=Team,

docker-compose.yaml

@@ -23,4 +23,4 @@ services:
 
 volumes:
   static_value:
-  media_value:
+  media_value:

entrypoint.sh

@@ -4,4 +4,4 @@ sleep 5
 app/.venv/bin/python manage.py collectstatic  --noinput
 mv /static/* /app/static/
 
-exec "$@"
+exec "$@"

nginx/default.conf

@@ -14,4 +14,4 @@ server {
     location / {
         proxy_pass http://site:8000;
     }
-} 
+}

pyproject.toml

@@ -59,4 +59,4 @@ django_settings_module = "adaptive_hockey_federation.settings"
 
 
 [tool.poetry.scripts]
-parser = "adaptive_hockey_federation.parser.parser:parsing_file"
+parser = "adaptive_hockey_federation.parser.parser:parsing_file"

requirements/develop.txt

@@ -0,0 +1,17 @@
+asgiref==3.7.2 ; python_version >= "3.11" and python_version < "4.0"
+click==8.1.7 ; python_version >= "3.11" and python_version < "4.0"
+colorama==0.4.6 ; python_version >= "3.11" and python_version < "4.0" and platform_system == "Windows"
+django==4.2.7 ; python_version >= "3.11" and python_version < "4.0"
+et-xmlfile==1.1.0 ; python_version >= "3.11" and python_version < "4.0"
+gunicorn==21.2.0 ; python_version >= "3.11" and python_version < "4.0"
+isort==5.12.0 ; python_version >= "3.11" and python_version < "4.0"
+mypy-extensions==1.0.0 ; python_version >= "3.11" and python_version < "4.0"
+mypy==1.6.0 ; python_version >= "3.11" and python_version < "4.0"
+openpyxl-stubs==0.1.25 ; python_version >= "3.11" and python_version < "4.0"
+openpyxl==3.1.2 ; python_version >= "3.11" and python_version < "4.0"
+packaging==23.2 ; python_version >= "3.11" and python_version < "4.0"
+sqlparse==0.4.4 ; python_version >= "3.11" and python_version < "4.0"
+types-openpyxl==3.1.0.27 ; python_version >= "3.11" and python_version < "4.0"
+typing-extensions==4.8.0 ; python_version >= "3.11" and python_version < "4.0"
+tzdata==2023.3 ; python_version >= "3.11" and python_version < "4.0" and sys_platform == "win32"
+wrapt==1.16.0 ; python_version >= "3.11" and python_version < "4.0"

requirements/production.txt

@@ -0,0 +1,16 @@
+asgiref==3.7.2 ; python_version >= "3.11" and python_version < "4.0"
+click==8.1.7 ; python_version >= "3.11" and python_version < "4.0"
+colorama==0.4.6 ; python_version >= "3.11" and python_version < "4.0" and platform_system == "Windows"
+django==4.2.7 ; python_version >= "3.11" and python_version < "4.0"
+et-xmlfile==1.1.0 ; python_version >= "3.11" and python_version < "4.0"
+gunicorn==21.2.0 ; python_version >= "3.11" and python_version < "4.0"
+mypy-extensions==1.0.0 ; python_version >= "3.11" and python_version < "4.0"
+mypy==1.6.0 ; python_version >= "3.11" and python_version < "4.0"
+openpyxl-stubs==0.1.25 ; python_version >= "3.11" and python_version < "4.0"
+openpyxl==3.1.2 ; python_version >= "3.11" and python_version < "4.0"
+packaging==23.2 ; python_version >= "3.11" and python_version < "4.0"
+sqlparse==0.4.4 ; python_version >= "3.11" and python_version < "4.0"
+types-openpyxl==3.1.0.27 ; python_version >= "3.11" and python_version < "4.0"
+typing-extensions==4.8.0 ; python_version >= "3.11" and python_version < "4.0"
+tzdata==2023.3 ; python_version >= "3.11" and python_version < "4.0" and sys_platform == "win32"
+wrapt==1.16.0 ; python_version >= "3.11" and python_version < "4.0"

setup.cfg

@@ -9,5 +9,4 @@ exclude =
     env/
 per-file-ignores =
     */settings.py:E501
-max-complexity = 10 
-
+max-complexity = 10