Skip to content

Commit

Permalink
Merge pull request #1134 from ChildMindInstitute/release/v1.3.15-rc
Browse files Browse the repository at this point in the history
Release/v1.3.15
  • Loading branch information
Damirkhon authored Feb 29, 2024
2 parents 1731618 + 8d42fcc commit 53792f6
Show file tree
Hide file tree
Showing 73 changed files with 2,354 additions and 6,798 deletions.
1 change: 1 addition & 0 deletions .env.default
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ CDN__ACCESS_KEY=minioaccess
CDN__REGION=
CDN__BUCKET_ANSWER=media
CDN__BUCKET=media
CDN__BUCKET_OPERATIONS=media
CDN__STORAGE_ADDRESS=http://localhost:9000
CDN__LEGACY_REGION=
CDN__LEGACY_BUCKET=
Expand Down
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ a4d7fb277eba6b28bab7369ebd6593b801e09a20
280071c8b301392c2d109a0343800631957d1852
d823f6d17c4f926217ce08c01bcd189d74136267
9fb90623aaa41570588bba68091a276b38de6707
1e233235dccd9544b0228a22601f7fb4783f54b4
# end revert
2 changes: 1 addition & 1 deletion .github/workflows/code_quality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
- name: Install deps
run: pipenv sync --system --dev
- name: Check formatting
run: ruff check . && isort --check .
run: ruff check . && ruff format --check . && isort --check .
- name: Check types
run: mypy ./
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ repos:
types: [python]
pass_filenames: false

- id: ruff-format
name: ruff-format
entry: ruff format --check .
language: system
types: [python]
pass_filenames: false

- id: isort
name: isort
entry: isort --check-only .
Expand Down
4 changes: 2 additions & 2 deletions src/apps/activities/domain/activity_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from apps.shared.domain import InternalModel, PublicModel


class ActivityItemUpdate(BaseActivityItem, InternalModel):
class ActivityItemUpdate(BaseActivityItem, PublicModel):
id: uuid.UUID | None


Expand All @@ -23,7 +23,7 @@ class PreparedActivityItemUpdate(BaseActivityItem, InternalModel):
activity_id: uuid.UUID


class ActivityUpdate(ActivityBase, InternalModel):
class ActivityUpdate(ActivityBase, PublicModel):
id: uuid.UUID | None
key: uuid.UUID
items: list[ActivityItemUpdate]
Expand Down
155 changes: 0 additions & 155 deletions src/apps/activities/fixtures/activities.json

This file was deleted.

Loading

0 comments on commit 53792f6

Please sign in to comment.