diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index eeea8b5..f83d6d4 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -62,7 +62,9 @@ jobs: - uses: isort/isort-action@master with: requirementsFiles: "requirements.txt requirements.dev.txt" - - uses: psf/black@23.11.0 + - uses: psf/black@stable + with: + options: "--check --diff" - name: Comment if linting failed if: ${{ failure() }} uses: thollander/actions-comment-pull-request@v2 diff --git a/.github/workflows/review_code.py b/.github/workflows/review_code.py index 6f5b47c..8f65fda 100644 --- a/.github/workflows/review_code.py +++ b/.github/workflows/review_code.py @@ -7,7 +7,6 @@ import requests from mistralai.client import MistralClient - client = MistralClient(api_key=os.environ.get("MISTRAL_API_KEY")) pr_number = os.environ.get("PR_NUMBER") diff --git a/migrations/env.py b/migrations/env.py index 60528da..90e99b1 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -6,7 +6,6 @@ from rating_api.models import BaseDbModel from rating_api.settings import get_settings - # this is the Alembic Config object, which provides # access to the values within the .ini file in use. config = context.config diff --git a/migrations/versions/0fbda260a023_add_user_id.py b/migrations/versions/0fbda260a023_add_user_id.py index fda0582..209f9b8 100644 --- a/migrations/versions/0fbda260a023_add_user_id.py +++ b/migrations/versions/0fbda260a023_add_user_id.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = '0fbda260a023' down_revision = '5659e13277b6' diff --git a/migrations/versions/1c001709fc55_advanced_sort.py b/migrations/versions/1c001709fc55_advanced_sort.py index 8238980..41e6c69 100644 --- a/migrations/versions/1c001709fc55_advanced_sort.py +++ b/migrations/versions/1c001709fc55_advanced_sort.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = '1c001709fc55' down_revision = 'dd44854aa12a' branch_labels = None diff --git a/migrations/versions/20181e0d6aab_make_nullable_timetable_id.py b/migrations/versions/20181e0d6aab_make_nullable_timetable_id.py index efdfd17..43f9081 100644 --- a/migrations/versions/20181e0d6aab_make_nullable_timetable_id.py +++ b/migrations/versions/20181e0d6aab_make_nullable_timetable_id.py @@ -8,7 +8,6 @@ from alembic import op - # revision identifiers, used by Alembic. revision = '20181e0d6aab' down_revision = 'edcc1a448ffb' diff --git a/migrations/versions/5659e13277b6_delete_subject_from_lecturer.py b/migrations/versions/5659e13277b6_delete_subject_from_lecturer.py index 8348edd..6b50ea3 100644 --- a/migrations/versions/5659e13277b6_delete_subject_from_lecturer.py +++ b/migrations/versions/5659e13277b6_delete_subject_from_lecturer.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = '5659e13277b6' down_revision = '656228b2d6e0' branch_labels = None diff --git a/migrations/versions/5cf69f1026d9_fixing_comments_pk.py b/migrations/versions/5cf69f1026d9_fixing_comments_pk.py index bbd16da..6eb781e 100644 --- a/migrations/versions/5cf69f1026d9_fixing_comments_pk.py +++ b/migrations/versions/5cf69f1026d9_fixing_comments_pk.py @@ -8,7 +8,6 @@ from alembic import op - # revision identifiers, used by Alembic. revision = '5cf69f1026d9' down_revision = '933db669e7ef' diff --git a/migrations/versions/656228b2d6e0_delete_id_from_comment.py b/migrations/versions/656228b2d6e0_delete_id_from_comment.py index 0eebe9f..ab94567 100644 --- a/migrations/versions/656228b2d6e0_delete_id_from_comment.py +++ b/migrations/versions/656228b2d6e0_delete_id_from_comment.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = '656228b2d6e0' down_revision = '7354951f8e4c' branch_labels = None diff --git a/migrations/versions/7354951f8e4c_add_uuid_to_comment.py b/migrations/versions/7354951f8e4c_add_uuid_to_comment.py index d9ea6a9..1630938 100644 --- a/migrations/versions/7354951f8e4c_add_uuid_to_comment.py +++ b/migrations/versions/7354951f8e4c_add_uuid_to_comment.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = '7354951f8e4c' down_revision = 'dbe6ca79a40d' branch_labels = None diff --git a/migrations/versions/7388a2c219d2_add_user_id_to_lecturer_user.py b/migrations/versions/7388a2c219d2_add_user_id_to_lecturer_user.py index 1194342..2853dc5 100644 --- a/migrations/versions/7388a2c219d2_add_user_id_to_lecturer_user.py +++ b/migrations/versions/7388a2c219d2_add_user_id_to_lecturer_user.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = '7388a2c219d2' down_revision = 'fee34ac4fcab' branch_labels = None diff --git a/migrations/versions/933db669e7ef_make_subject_in_comment_nullable.py b/migrations/versions/933db669e7ef_make_subject_in_comment_nullable.py index 924a186..d92a254 100644 --- a/migrations/versions/933db669e7ef_make_subject_in_comment_nullable.py +++ b/migrations/versions/933db669e7ef_make_subject_in_comment_nullable.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = '933db669e7ef' down_revision = '20181e0d6aab' diff --git a/migrations/versions/beb11fd89531_lecturer_rating.py b/migrations/versions/beb11fd89531_lecturer_rating.py index 075f8e6..1b10969 100644 --- a/migrations/versions/beb11fd89531_lecturer_rating.py +++ b/migrations/versions/beb11fd89531_lecturer_rating.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = 'beb11fd89531' down_revision = 'fc7cb93684e0' diff --git a/migrations/versions/d322e8331f91_add_user_full_name_to_comment_table.py b/migrations/versions/d322e8331f91_add_user_full_name_to_comment_table.py index d7b089e..2255b29 100644 --- a/migrations/versions/d322e8331f91_add_user_full_name_to_comment_table.py +++ b/migrations/versions/d322e8331f91_add_user_full_name_to_comment_table.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = 'd322e8331f91' down_revision = 'beb11fd89531' diff --git a/migrations/versions/dbe6ca79a40d_init.py b/migrations/versions/dbe6ca79a40d_init.py index 3b399c5..f8c5e96 100644 --- a/migrations/versions/dbe6ca79a40d_init.py +++ b/migrations/versions/dbe6ca79a40d_init.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'dbe6ca79a40d' down_revision = None branch_labels = None diff --git a/migrations/versions/dd44854aa12a_approved_by.py b/migrations/versions/dd44854aa12a_approved_by.py index c48d3e1..210e740 100644 --- a/migrations/versions/dd44854aa12a_approved_by.py +++ b/migrations/versions/dd44854aa12a_approved_by.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'dd44854aa12a' down_revision = '5cf69f1026d9' branch_labels = None diff --git a/migrations/versions/edcc1a448ffb_soft_deletes.py b/migrations/versions/edcc1a448ffb_soft_deletes.py index 627d5bd..9e75fea 100644 --- a/migrations/versions/edcc1a448ffb_soft_deletes.py +++ b/migrations/versions/edcc1a448ffb_soft_deletes.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = 'edcc1a448ffb' down_revision = '7388a2c219d2' diff --git a/migrations/versions/fc7cb93684e0_likes.py b/migrations/versions/fc7cb93684e0_likes.py index 224829e..e904fbc 100644 --- a/migrations/versions/fc7cb93684e0_likes.py +++ b/migrations/versions/fc7cb93684e0_likes.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = 'fc7cb93684e0' down_revision = '1c001709fc55' diff --git a/migrations/versions/fee34ac4fcab_delete_user_id_from_lectureruser.py b/migrations/versions/fee34ac4fcab_delete_user_id_from_lectureruser.py index 5619568..6ce87c5 100644 --- a/migrations/versions/fee34ac4fcab_delete_user_id_from_lectureruser.py +++ b/migrations/versions/fee34ac4fcab_delete_user_id_from_lectureruser.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - revision = 'fee34ac4fcab' down_revision = '0fbda260a023' branch_labels = None diff --git a/pyproject.toml b/pyproject.toml index bf2a06d..7be5d91 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,6 @@ skip-string-normalization = true line_length = 120 multi_line_output = 3 profile = "black" -lines_after_imports = 2 include_trailing_comma = true [tool.pytest.ini_options] diff --git a/rating_api/__init__.py b/rating_api/__init__.py index fa9c098..ebcaeac 100644 --- a/rating_api/__init__.py +++ b/rating_api/__init__.py @@ -1,4 +1,3 @@ import os - __version__ = os.getenv('APP_VERSION', 'dev') diff --git a/rating_api/__main__.py b/rating_api/__main__.py index f2d345b..315f958 100644 --- a/rating_api/__main__.py +++ b/rating_api/__main__.py @@ -2,6 +2,5 @@ from rating_api.routes.base import app - if __name__ == '__main__': uvicorn.run(app) diff --git a/rating_api/models/__init__.py b/rating_api/models/__init__.py index 58d469c..4a29aa4 100644 --- a/rating_api/models/__init__.py +++ b/rating_api/models/__init__.py @@ -1,5 +1,4 @@ from .base import Base, BaseDbModel from .db import * - __all__ = ["Base", "BaseDbModel", "Lecturer", "LecturerUserComment", "Comment"] diff --git a/rating_api/models/db.py b/rating_api/models/db.py index 1cdc664..a46a0bf 100644 --- a/rating_api/models/db.py +++ b/rating_api/models/db.py @@ -32,7 +32,6 @@ from .base import BaseDbModel - logger = logging.getLogger(__name__) diff --git a/rating_api/routes/__init__.py b/rating_api/routes/__init__.py index 5e4fcb1..e53b88c 100644 --- a/rating_api/routes/__init__.py +++ b/rating_api/routes/__init__.py @@ -1,5 +1,4 @@ from . import exc_handlers from .base import app - __all__ = ["app", "exc_handlers"] diff --git a/rating_api/routes/base.py b/rating_api/routes/base.py index 9efd5ec..2426de6 100644 --- a/rating_api/routes/base.py +++ b/rating_api/routes/base.py @@ -8,7 +8,6 @@ from rating_api.routes.lecturer import lecturer from rating_api.settings import Settings, get_settings - settings: Settings = get_settings() app = FastAPI( title='Рейтинг преподавателей', diff --git a/rating_api/routes/comment.py b/rating_api/routes/comment.py index 0648f19..95ee771 100644 --- a/rating_api/routes/comment.py +++ b/rating_api/routes/comment.py @@ -31,7 +31,6 @@ ) from rating_api.settings import Settings, get_settings - settings: Settings = get_settings() comment = APIRouter(prefix="/comment", tags=["Comment"]) diff --git a/rating_api/routes/lecturer.py b/rating_api/routes/lecturer.py index 8200b6d..f36af3b 100644 --- a/rating_api/routes/lecturer.py +++ b/rating_api/routes/lecturer.py @@ -22,7 +22,6 @@ LecturerWithRank, ) - lecturer = APIRouter(prefix="/lecturer", tags=["Lecturer"]) diff --git a/rating_api/utils/mark.py b/rating_api/utils/mark.py index bb8de9b..2cc8e6c 100644 --- a/rating_api/utils/mark.py +++ b/rating_api/utils/mark.py @@ -4,7 +4,6 @@ from rating_api.settings import get_settings - settings = get_settings() diff --git a/requirements.dev.txt b/requirements.dev.txt index 336b8df..e51c72c 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,5 +1,5 @@ autoflake -black==23.11.0 +black httpx isort pytest diff --git a/tests/test_routes/test_comment.py b/tests/test_routes/test_comment.py index 95ef37e..ba563bb 100644 --- a/tests/test_routes/test_comment.py +++ b/tests/test_routes/test_comment.py @@ -8,7 +8,6 @@ from rating_api.models import Comment, CommentReaction, LecturerUserComment, Reaction, ReviewStatus from rating_api.settings import get_settings - logger = logging.getLogger(__name__) url: str = '/comment' diff --git a/tests/test_routes/test_lecturer.py b/tests/test_routes/test_lecturer.py index 6d598cc..45d545c 100644 --- a/tests/test_routes/test_lecturer.py +++ b/tests/test_routes/test_lecturer.py @@ -8,7 +8,6 @@ from rating_api.models import Comment, Lecturer, ReviewStatus from rating_api.settings import get_settings - logger = logging.getLogger(__name__) url: str = '/lecturer'