Skip to content

Commit

Permalink
Merge pull request #576 from Studio-Yandex-Practicum/bugfix/remove-ar…
Browse files Browse the repository at this point in the history
…tifacts-from-games-and-yadisk

remove yadisk
  • Loading branch information
OlegGsk authored Oct 10, 2024
2 parents 4b46e29 + dbb7746 commit a313d53
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 191 deletions.
1 change: 0 additions & 1 deletion adaptive_hockey_federation/core/config/base_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
EXTERNAL_APPS = [
"phonenumber_field",
"rest_framework",
"drf_yasg",
]

LOCAL_APPS = [
Expand Down
10 changes: 0 additions & 10 deletions adaptive_hockey_federation/core/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,3 @@ class Directory:
GAMES = "games"
PLAYER_VIDEO_DIR = "player_video"
UNLOAD_DIR = "unloads_data"


class YadiskDirectory(StrEnum):
"""Директории на Яндекс.Диске."""

GAMES = "games"
PLAYER_GAMES = "player_games"


PLAYER_GAME_NAME = "{surname}_{name[0]}_{patronymic[0]}_{game_name}.mp4"
17 changes: 0 additions & 17 deletions adaptive_hockey_federation/core/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,10 @@
from django.conf.urls.static import static
from django.contrib import admin
from django.urls import include, path
from drf_yasg import openapi
from drf_yasg.views import get_schema_view
from rest_framework import permissions

schema_view = get_schema_view(
openapi.Info(
title="API",
default_version="v1",
description="API для управления данными игроков и игр",
),
public=True,
permission_classes=(permissions.AllowAny,),
)

urlpatterns = [
path("admin/", admin.site.urls),
path(
"api/docs/",
schema_view.with_ui("swagger", cache_timeout=0),
name="schema-swagger-ui",
),
path("", include("main.urls", namespace="main")),
path("", include("users.urls", namespace="users")),
path("", include("competitions.urls", namespace="competitions")),
Expand Down
8 changes: 0 additions & 8 deletions adaptive_hockey_federation/core/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from core.constants import AgeLimits
from django.core.exceptions import ValidationError
from django.core.validators import RegexValidator
from django.utils.timezone import now as django_now


def fio_validator() -> RegexValidator:
Expand Down Expand Up @@ -40,10 +39,3 @@ def validate_date_birth(value: datetime.date):
f"Возраст должен быть от {AgeLimits.MIN_AGE_PLAYER}"
f"до {AgeLimits.MAX_AGE_PLAYER} лет",
)


def validate_game_date(date: datetime.date) -> datetime.date:
"""Проверка валидности даты игры. Дата не должна быть больше текущей."""
if date > django_now():
raise ValidationError("Игра не может проходить в будущем")
return date
79 changes: 1 addition & 78 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ types-python-dateutil = "^2.8.19.20240106"
pytest-subtests = "^0.12.1"

djangorestframework = "^3.15.1"
drf-yasg = "^1.21.7"

yadisk = "^3.1.0"
[tool.poetry.group.dev.dependencies]
setuptools = "^70.0.0"
ruff = "^0.4.5"
Expand Down
5 changes: 0 additions & 5 deletions requirements/develop.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ django-phonenumber-field[phonenumbers]==7.3.0 ; python_version >= "3.11" and pyt
django==4.2.13 ; python_version >= "3.11" and python_version < "4.0"
djangorestframework==3.15.2 ; python_version >= "3.11" and python_version < "4.0"
dnspython==2.6.1 ; python_version >= "3.11" and python_version < "4.0"
drf-yasg==1.21.7 ; python_version >= "3.11" and python_version < "4.0"
email-validator==2.2.0 ; python_version >= "3.11" and python_version < "4.0"
et-xmlfile==1.1.0 ; python_version >= "3.11" and python_version < "4.0"
factory-boy==3.3.0 ; python_version >= "3.11" and python_version < "4.0"
Expand All @@ -29,7 +28,6 @@ httptools==0.6.1 ; python_version >= "3.11" and python_version < "4.0"
httpx==0.27.0 ; python_version >= "3.11" and python_version < "4.0"
identify==2.5.36 ; python_version >= "3.11" and python_version < "4.0"
idna==3.7 ; python_version >= "3.11" and python_version < "4.0"
inflection==0.5.1 ; python_version >= "3.11" and python_version < "4.0"
iniconfig==2.0.0 ; python_version >= "3.11" and python_version < "4.0"
jinja2==3.1.4 ; python_version >= "3.11" and python_version < "4.0"
markdown-it-py==3.0.0 ; python_version >= "3.11" and python_version < "4.0"
Expand Down Expand Up @@ -58,7 +56,6 @@ pytest==8.2.2 ; python_version >= "3.11" and python_version < "4.0"
python-dateutil==2.9.0.post0 ; python_version >= "3.11" and python_version < "4.0"
python-dotenv==1.0.1 ; python_version >= "3.11" and python_version < "4.0"
python-multipart==0.0.9 ; python_version >= "3.11" and python_version < "4.0"
pytz==2024.1 ; python_version >= "3.11" and python_version < "4.0"
pyyaml==6.0.1 ; python_version >= "3.11" and python_version < "4.0"
rich==13.7.1 ; python_version >= "3.11" and python_version < "4.0"
ruff==0.4.10 ; python_version >= "3.11" and python_version < "4.0"
Expand All @@ -74,11 +71,9 @@ types-pillow==10.2.0.20240520 ; python_version >= "3.11" and python_version < "4
types-python-dateutil==2.9.0.20240316 ; python_version >= "3.11" and python_version < "4.0"
typing-extensions==4.12.2 ; python_version >= "3.11" and python_version < "4.0"
tzdata==2024.1 ; python_version >= "3.11" and python_version < "4.0" and sys_platform == "win32"
uritemplate==4.1.1 ; python_version >= "3.11" and python_version < "4.0"
uvicorn[standard]==0.30.5 ; python_version >= "3.11" and python_version < "4.0"
uvloop==0.19.0 ; (sys_platform != "win32" and sys_platform != "cygwin") and platform_python_implementation != "PyPy" and python_version >= "3.11" and python_version < "4.0"
virtualenv==20.26.3 ; python_version >= "3.11" and python_version < "4.0"
watchfiles==0.23.0 ; python_version >= "3.11" and python_version < "4.0"
websockets==12.0 ; python_version >= "3.11" and python_version < "4.0"
wrapt==1.16.0 ; python_version >= "3.11" and python_version < "4.0"
yadisk==3.1.0 ; python_version >= "3.11" and python_version < "4.0"
70 changes: 0 additions & 70 deletions requirements/production.txt
Original file line number Diff line number Diff line change
@@ -1,100 +1,30 @@

amqp==5.2.0 ; python_version >= "3.11" and python_version < "4.0"
annotated-types==0.7.0 ; python_version >= "3.11" and python_version < "4.0"
anyio==4.4.0 ; python_version >= "3.11" and python_version < "4.0"
asgiref==3.8.1 ; python_version >= "3.11" and python_version < "4.0"
attrs==23.2.0 ; python_version >= "3.11" and python_version < "4.0"
billiard==4.2.0 ; python_version >= "3.11" and python_version < "4.0"
certifi==2024.6.2 ; python_version >= "3.11" and python_version < "4.0"
cfgv==3.4.0 ; python_version >= "3.11" and python_version < "4.0"
click-didyoumean==0.3.1 ; python_version >= "3.11" and python_version < "4.0"
click-plugins==1.1.1 ; python_version >= "3.11" and python_version < "4.0"
click-repl==0.3.0 ; 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" or sys_platform == "win32")
distlib==0.3.8 ; python_version >= "3.11" and python_version < "4.0"
django-debug-toolbar==4.4.2 ; python_version >= "3.11" and python_version < "4.0"
django-environ==0.11.2 ; python_version >= "3.11" and python_version < "4"
django-extensions==3.2.3 ; python_version >= "3.11" and python_version < "4.0"
django-phonenumber-field[phonenumbers]==7.3.0 ; python_version >= "3.11" and python_version < "4.0"
django==4.2.13 ; python_version >= "3.11" and python_version < "4.0"
djangorestframework==3.15.2 ; python_version >= "3.11" and python_version < "4.0"
dnspython==2.6.1 ; python_version >= "3.11" and python_version < "4.0"
drf-yasg==1.21.7 ; python_version >= "3.11" and python_version < "4.0"
email-validator==2.2.0 ; python_version >= "3.11" and python_version < "4.0"
et-xmlfile==1.1.0 ; python_version >= "3.11" and python_version < "4.0"
factory-boy==3.3.0 ; python_version >= "3.11" and python_version < "4.0"
faker==26.0.0 ; python_version >= "3.11" and python_version < "4.0"
fastapi-cli[standard]==0.0.5 ; python_version >= "3.11" and python_version < "4.0"
fastapi[standard]==0.112.0 ; python_version >= "3.11" and python_version < "4.0"
filelock==3.15.4 ; python_version >= "3.11" and python_version < "4.0"
gunicorn==21.2.0 ; python_version >= "3.11" and python_version < "4.0"
h11==0.14.0 ; python_version >= "3.11" and python_version < "4.0"
httpcore==1.0.5 ; python_version >= "3.11" and python_version < "4.0"
httptools==0.6.1 ; python_version >= "3.11" and python_version < "4.0"
httpx==0.27.0 ; python_version >= "3.11" and python_version < "4.0"
humanize==4.9.0 ; python_version >= "3.11" and python_version < "4.0"
identify==2.5.36 ; python_version >= "3.11" and python_version < "4.0"
idna==3.7 ; python_version >= "3.11" and python_version < "4.0"
inflection==0.5.1 ; python_version >= "3.11" and python_version < "4.0"
iniconfig==2.0.0 ; python_version >= "3.11" and python_version < "4.0"
jinja2==3.1.4 ; python_version >= "3.11" and python_version < "4.0"
kombu==5.3.7 ; python_version >= "3.11" and python_version < "4.0"
markdown-it-py==3.0.0 ; python_version >= "3.11" and python_version < "4.0"
markupsafe==2.1.5 ; python_version >= "3.11" and python_version < "4.0"
mdurl==0.1.2 ; 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.10.1 ; python_version >= "3.11" and python_version < "4.0"
nodeenv==1.9.1 ; python_version >= "3.11" and python_version < "4.0"
numpy==2.0.0 ; python_version >= "3.11" and python_version < "4.0"
opencv-python-headless==4.10.0.84 ; 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.5 ; python_version >= "3.11" and python_version < "4.0"
packaging==24.1 ; python_version >= "3.11" and python_version < "4.0"
phonenumbers==8.13.39 ; python_version >= "3.11" and python_version < "4.0"
pillow==10.3.0 ; python_version >= "3.11" and python_version < "4.0"
platformdirs==4.2.2 ; python_version >= "3.11" and python_version < "4.0"
pluggy==1.5.0 ; python_version >= "3.11" and python_version < "4.0"
pre-commit==3.5.0 ; python_version >= "3.11" and python_version < "4.0"
prometheus-client==0.20.0 ; python_version >= "3.11" and python_version < "4.0"
prompt-toolkit==3.0.47 ; python_version >= "3.11" and python_version < "4.0"
psycopg2-binary==2.9.9 ; python_version >= "3.11" and python_version < "4.0"
pydantic-core==2.20.1 ; python_version >= "3.11" and python_version < "4.0"
pydantic==2.8.2 ; python_version >= "3.11" and python_version < "4.0"
pygments==2.18.0 ; python_version >= "3.11" and python_version < "4.0"
pytest-django==4.8.0 ; python_version >= "3.11" and python_version < "4.0"
pytest-subtests==0.12.1 ; python_version >= "3.11" and python_version < "4.0"
pytest==8.2.2 ; python_version >= "3.11" and python_version < "4.0"
python-dateutil==2.9.0.post0 ; python_version >= "3.11" and python_version < "4.0"
python-dotenv==1.0.1 ; python_version >= "3.11" and python_version < "4.0"
python-multipart==0.0.9 ; python_version >= "3.11" and python_version < "4.0"
pytz==2024.1 ; python_version >= "3.11" and python_version < "4.0"
pyyaml==6.0.1 ; python_version >= "3.11" and python_version < "4.0"
rich==13.7.1 ; python_version >= "3.11" and python_version < "4.0"
requests==2.32.3 ; python_version >= "3.11" and python_version < "4.0"
ruff==0.4.10 ; python_version >= "3.11" and python_version < "4.0"
setuptools==70.1.1 ; python_version >= "3.11" and python_version < "4.0"
shellingham==1.5.4 ; python_version >= "3.11" and python_version < "4.0"
six==1.16.0 ; python_version >= "3.11" and python_version < "4.0"
sniffio==1.3.1 ; python_version >= "3.11" and python_version < "4.0"
pytz==2024.1 ; python_version >= "3.11" and python_version < "4.0"
pyyaml==6.0.1 ; python_version >= "3.11" and python_version < "4.0"
sqlparse==0.5.0 ; python_version >= "3.11" and python_version < "4.0"
starlette==0.37.2 ; python_version >= "3.11" and python_version < "4.0"
tornado==6.4.1 ; python_version >= "3.11" and python_version < "4.0"
typer==0.12.3 ; python_version >= "3.11" and python_version < "4.0"
types-openpyxl==3.1.4.20240626 ; python_version >= "3.11" and python_version < "4.0"
types-pillow==10.2.0.20240520 ; python_version >= "3.11" and python_version < "4.0"
types-python-dateutil==2.9.0.20240316 ; python_version >= "3.11" and python_version < "4.0"
typing-extensions==4.12.2 ; python_version >= "3.11" and python_version < "4.0"
tzdata==2024.1 ; python_version >= "3.11" and python_version < "4.0" and sys_platform == "win32"
uritemplate==4.1.1 ; python_version >= "3.11" and python_version < "4.0"
uvicorn[standard]==0.30.5 ; python_version >= "3.11" and python_version < "4.0"
uvloop==0.19.0 ; (sys_platform != "win32" and sys_platform != "cygwin") and platform_python_implementation != "PyPy" and python_version >= "3.11" and python_version < "4.0"
vine==5.1.0 ; python_version >= "3.11" and python_version < "4.0"
virtualenv==20.26.3 ; python_version >= "3.11" and python_version < "4.0"
watchfiles==0.23.0 ; python_version >= "3.11" and python_version < "4.0"
wcwidth==0.2.13 ; python_version >= "3.11" and python_version < "4.0"
websockets==12.0 ; python_version >= "3.11" and python_version < "4.0"
wrapt==1.16.0 ; python_version >= "3.11" and python_version < "4.0"
yadisk==3.1.0 ; python_version >= "3.11" and python_version < "4.0"

0 comments on commit a313d53

Please sign in to comment.