diff --git a/poetry.lock b/poetry.lock index 2a71e9d4..28e474cb 100644 --- a/poetry.lock +++ b/poetry.lock @@ -408,13 +408,13 @@ doc = ["Sphinx", "sphinx-rtd-theme", "sphinxcontrib-spelling"] [[package]] name = "faker" -version = "19.3.1" +version = "19.3.0" description = "Faker is a Python package that generates fake data for you." optional = false python-versions = ">=3.8" files = [ - {file = "Faker-19.3.1-py3-none-any.whl", hash = "sha256:e2722fdf622cf24e974aaba15a3dee97a6f8b98d869bd827ff1af9c87695af46"}, - {file = "Faker-19.3.1.tar.gz", hash = "sha256:a6624d9574623bb27dfca33fff94581cd7b23b562901db8ad59acbde9a52543e"}, + {file = "Faker-19.3.0-py3-none-any.whl", hash = "sha256:bee54278d6e1289573317604ab6f4782acca724396bf261eaf1890de228e553d"}, + {file = "Faker-19.3.0.tar.gz", hash = "sha256:7d6ed00de3eef9bd57504500c67ee034cab959e4248f9c24aca33e08af82ca93"}, ] [package.dependencies] @@ -422,18 +422,18 @@ python-dateutil = ">=2.4" [[package]] name = "filelock" -version = "3.12.3" +version = "3.12.2" description = "A platform independent file lock." optional = false -python-versions = ">=3.8" +python-versions = ">=3.7" files = [ - {file = "filelock-3.12.3-py3-none-any.whl", hash = "sha256:f067e40ccc40f2b48395a80fcbd4728262fab54e232e090a4063ab804179efeb"}, - {file = "filelock-3.12.3.tar.gz", hash = "sha256:0ecc1dd2ec4672a10c8550a8182f1bd0c0a5088470ecd5a125e45f49472fac3d"}, + {file = "filelock-3.12.2-py3-none-any.whl", hash = "sha256:cbb791cdea2a72f23da6ac5b5269ab0a0d161e9ef0100e653b69049a7706d1ec"}, + {file = "filelock-3.12.2.tar.gz", hash = "sha256:002740518d8aa59a26b0c76e10fb8c6e15eae825d34b6fdf670333fd7b938d81"}, ] [package.extras] -docs = ["furo (>=2023.7.26)", "sphinx (>=7.1.2)", "sphinx-autodoc-typehints (>=1.24)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.3)", "diff-cover (>=7.7)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-timeout (>=2.1)"] +docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "diff-cover (>=7.5)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "pytest-timeout (>=2.1)"] [[package]] name = "flake8" @@ -649,13 +649,13 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-co [[package]] name = "pluggy" -version = "1.3.0" +version = "1.2.0" description = "plugin and hook calling mechanisms for python" optional = false -python-versions = ">=3.8" +python-versions = ">=3.7" files = [ - {file = "pluggy-1.3.0-py3-none-any.whl", hash = "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"}, - {file = "pluggy-1.3.0.tar.gz", hash = "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12"}, + {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"}, + {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"}, ] [package.extras] @@ -977,7 +977,6 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, - {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -985,15 +984,8 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, - {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, - {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, - {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, - {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, - {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, - {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, - {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -1010,7 +1002,6 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, - {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -1018,7 +1009,6 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, - {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -1285,13 +1275,13 @@ standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)", [[package]] name = "virtualenv" -version = "20.24.4" +version = "20.24.3" description = "Virtual Python Environment builder" optional = false python-versions = ">=3.7" files = [ - {file = "virtualenv-20.24.4-py3-none-any.whl", hash = "sha256:29c70bb9b88510f6414ac3e55c8b413a1f96239b6b789ca123437d5e892190cb"}, - {file = "virtualenv-20.24.4.tar.gz", hash = "sha256:772b05bfda7ed3b8ecd16021ca9716273ad9f4467c801f27e83ac73430246dca"}, + {file = "virtualenv-20.24.3-py3-none-any.whl", hash = "sha256:95a6e9398b4967fbcb5fef2acec5efaf9aa4972049d9ae41f95e0972a683fd02"}, + {file = "virtualenv-20.24.3.tar.gz", hash = "sha256:e5c3b4ce817b0b328af041506a2a299418c98747c4b1e68cb7527e74ced23efc"}, ] [package.dependencies] @@ -1300,10 +1290,10 @@ filelock = ">=3.12.2,<4" platformdirs = ">=3.9.1,<4" [package.extras] -docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] +docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"] [metadata] lock-version = "2.0" python-versions = "^3.11.1" -content-hash = "4acb280b9d68e1247102aa089d6a829ce185ba2f5206e6e6e04ee71af6092487" +content-hash = "03a56e6a6d84f459588eb5f27d47be1b795f02df1a398a5c91c707645e14b84a" diff --git a/requirements/develop.txt b/requirements/develop.txt index 99ca13d1..745fafde 100644 --- a/requirements/develop.txt +++ b/requirements/develop.txt @@ -18,8 +18,8 @@ django==4.2.4 ; python_full_version >= "3.11.1" and python_version < "4.0" dnspython==2.4.2 ; python_full_version >= "3.11.1" and python_version < "4.0" email-validator==2.0.0.post2 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" factory-boy==3.3.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" -faker==19.3.1 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" -filelock==3.12.3 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" +faker==19.3.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" +filelock==3.12.2 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" flake8-docstrings==1.7.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" flake8==6.1.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" h11==0.14.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" @@ -35,7 +35,7 @@ nodeenv==1.8.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0. packaging==23.1 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" pathspec==0.11.2 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" platformdirs==3.10.0 ; python_full_version >= "3.11.1" and python_version < "4.0" -pluggy==1.3.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" +pluggy==1.2.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" pre-commit==3.3.3 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" psycopg2-binary==2.9.7 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" pycodestyle==2.11.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" @@ -66,4 +66,4 @@ tzdata==2023.3 ; python_full_version >= "3.11.1" and python_version < "4.0" and url-normalize==1.4.3 ; python_full_version >= "3.11.1" and python_version < "4.0" urllib3==2.0.4 ; python_full_version >= "3.11.1" and python_version < "4.0" uvicorn==0.23.2 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" -virtualenv==20.24.4 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" +virtualenv==20.24.3 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" diff --git a/requirements/production.txt b/requirements/production.txt index 4e522614..9be3fe6e 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -24,7 +24,7 @@ iniconfig==2.0.0 ; python_full_version >= "3.11.1" and python_full_version < "4. mccabe==0.7.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" packaging==23.1 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" platformdirs==3.10.0 ; python_full_version >= "3.11.1" and python_version < "4.0" -pluggy==1.3.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" +pluggy==1.2.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" psycopg2-binary==2.9.7 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" pycodestyle==2.11.0 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" pydantic[email]==1.10.12 ; python_full_version >= "3.11.1" and python_full_version < "4.0.0" diff --git a/src/bot/admin.py b/src/bot/admin.py index bafd6ed1..63ec548f 100644 --- a/src/bot/admin.py +++ b/src/bot/admin.py @@ -41,7 +41,7 @@ def get_question(self, obj): """Display questions in admin panel.""" return obj.question[:100] - @admin.display(description="Текст на кнопке") + @admin.display(description="Короткое описание") def get_short_description(self, obj): """Display short_descriptions in admin panel.""" return obj.short_description[:100] @@ -95,7 +95,7 @@ def get_title(self, obj): """Display title in admin panel.""" return obj.title[:100] - @admin.display(description="Текст на кнопке ") + @admin.display(description="Короткое описание") def get_short_description(self, obj): """Display short_description in admin panel.""" return obj.short_description[:100] diff --git a/src/bot/migrations/0005_alter_fundprogram_short_description_and_more.py b/src/bot/migrations/0005_alter_fundprogram_short_description_and_more.py deleted file mode 100644 index 29c77032..00000000 --- a/src/bot/migrations/0005_alter_fundprogram_short_description_and_more.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 4.2.4 on 2023-08-31 07:33 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - """Migrations for bot.""" - - dependencies = [ - ("bot", "0004_alter_coordinator_options_coordinator_is_chief"), - ] - - operations = [ - migrations.AlterField( - model_name="fundprogram", - name="short_description", - field=models.CharField( - help_text="Введите название кнопки в боте для данной программы", - max_length=20, - verbose_name="Текст на кнопке", - ), - ), - migrations.AlterField( - model_name="question", - name="question_type", - field=models.CharField( - choices=[ - ("Юридическая помощь", "Юридическая помощь"), - ("Социальная помощь", "Социальная помощь"), - ("Психологическая помощь", "Психологическая помощь"), - ], - default="Юридическая помощь", - help_text="Выберите тип помощи для вопроса", - max_length=100, - verbose_name="Тип вопроса", - ), - ), - ] diff --git a/src/bot/models.py b/src/bot/models.py index 338cb0ef..338a2e5b 100644 --- a/src/bot/models.py +++ b/src/bot/models.py @@ -90,11 +90,12 @@ class Meta: # noqa class HelpTypes(models.TextChoices): """Supporting model to make choices field.""" - LEGAL_ASSISTANCE = "Юридическая помощь", _("Юридическая помощь") - SOCIAL_ASSISTANCE = "Социальная помощь", _("Социальная помощь") - PSYCHOLOGICAL_ASSISTANCE = "Психологическая помощь", _( + LEGAL_ASSISTANCE = "LEGAL_ASSISTANCE", _("Юридическая помощь") + SOCIAL_ASSISTANCE = "SOCIAL_ASSISTANCE", _("Социальная помощь") + PSYCHOLOGICAL_ASSISTANCE = "PSYCHOLOGICAL_ASSISTANCE", _( "Психологическая помощь" ) + COMMON_QUESTION = "COMMON_QUESTION", _("Общий вопрос") class Question(BaseModel): @@ -152,7 +153,7 @@ class FundProgram(BaseModel): ) short_description = models.CharField( max_length=20, - verbose_name="Текст на кнопке", + verbose_name="Короткое описание", help_text="Введите название кнопки в боте для данной программы", ) regions = models.ManyToManyField(