From 98565fb1a05b1ab9214db374497402ab53f405be Mon Sep 17 00:00:00 2001 From: Andrey Snytin Date: Tue, 14 Nov 2023 19:39:08 +0100 Subject: [PATCH 1/2] fixed sentry deps --- app/dl_control_api/pyproject.toml | 2 -- lib/dl_api_commons/pyproject.toml | 3 +- lib/dl_api_lib/pyproject.toml | 1 - lib/dl_core/pyproject.toml | 2 -- lib/dl_file_uploader_api_lib/pyproject.toml | 1 - metapkg/poetry.lock | 37 +++------------------ metapkg/pyproject.toml | 2 -- 7 files changed, 5 insertions(+), 43 deletions(-) diff --git a/app/dl_control_api/pyproject.toml b/app/dl_control_api/pyproject.toml index 8810e4097..abf1601c9 100644 --- a/app/dl_control_api/pyproject.toml +++ b/app/dl_control_api/pyproject.toml @@ -11,8 +11,6 @@ readme = "README.md" [tool.poetry.dependencies] python = ">=3.10, <3.12" Flask = ">=2.2.5" -blinker = ">=1.5" -raven = ">=6.10.0" datalens-version = {path = "../../lib/dl_version"} datalens-sqlalchemy-postgres = {path = "../../lib/dl_sqlalchemy_postgres"} datalens-utils = {path = "../../lib/dl_utils"} diff --git a/lib/dl_api_commons/pyproject.toml b/lib/dl_api_commons/pyproject.toml index 9f8c2b308..9e9faa0fa 100644 --- a/lib/dl_api_commons/pyproject.toml +++ b/lib/dl_api_commons/pyproject.toml @@ -18,8 +18,7 @@ marshmallow = ">=3.19.0" multidict = ">=4.0" opentracing = ">=2.4.0" python = ">=3.10, <3.12" -raven = ">=6.10.0" -sentry-sdk = ">=1.15.0" +sentry-sdk = {extras = ["flask"], version = ">=1.15.0"} typing-extensions = ">=4.5.0" datalens-utils = {path = "../dl_utils"} datalens-constants = {path = "../dl_constants"} diff --git a/lib/dl_api_lib/pyproject.toml b/lib/dl_api_lib/pyproject.toml index 85b6ef834..e4ad498c9 100644 --- a/lib/dl_api_lib/pyproject.toml +++ b/lib/dl_api_lib/pyproject.toml @@ -19,7 +19,6 @@ marshmallow-oneofschema = ">=3.0.1" more-itertools = ">=9.1.0" pandas = ">=1.5.3" python = ">=3.10, <3.12" -sentry-sdk = ">=1.15.0" werkzeug = ">=2.2.3" statcommons = {path = "../statcommons"} datalens-api-commons = {path = "../dl_api_commons"} diff --git a/lib/dl_core/pyproject.toml b/lib/dl_core/pyproject.toml index 0f9b51964..0bf5f6067 100644 --- a/lib/dl_core/pyproject.toml +++ b/lib/dl_core/pyproject.toml @@ -34,7 +34,6 @@ python = ">=3.10, <3.12" python-dateutil = ">=2.8.2" pytz = ">=2022.7.1" pyyaml = ">=6.0.1" -raven = ">=6.10.0" redis = ">=4.5.4" requests = ">=2.28.2" shortuuid = ">=1.0.11" @@ -98,7 +97,6 @@ module = [ "anyascii.*", "lz4.*", "marshmallow_oneofschema.*", - "raven.*", "types_aiobotocore_s3.*", "mypy_boto3_s3.*" ] diff --git a/lib/dl_file_uploader_api_lib/pyproject.toml b/lib/dl_file_uploader_api_lib/pyproject.toml index 94f124267..311ff9c16 100644 --- a/lib/dl_file_uploader_api_lib/pyproject.toml +++ b/lib/dl_file_uploader_api_lib/pyproject.toml @@ -19,7 +19,6 @@ marshmallow = ">=3.19.0" marshmallow-oneofschema = ">=3.0.1" python = ">=3.10, <3.12" redis = ">=4.5.4" -sentry-sdk = ">=1.15.0" datalens-file-uploader-task-interface = {path = "../dl_file_uploader_task_interface"} datalens-api-commons = {path = "../dl_api_commons"} datalens-file-uploader-lib = {path = "../dl_file_uploader_lib"} diff --git a/metapkg/poetry.lock b/metapkg/poetry.lock index bb874cfb1..e50e252ae 100644 --- a/metapkg/poetry.lock +++ b/metapkg/poetry.lock @@ -1043,8 +1043,7 @@ ipdb = ">=0.13.13" marshmallow = ">=3.19.0" multidict = ">=4.0" opentracing = ">=2.4.0" -raven = ">=6.10.0" -sentry-sdk = ">=1.15.0" +sentry-sdk = {version = ">=1.15.0", extras = ["flask"]} typing-extensions = ">=4.5.0" [package.source] @@ -1110,7 +1109,6 @@ marshmallow = ">=3.19.0" marshmallow-oneofschema = ">=3.0.1" more-itertools = ">=9.1.0" pandas = ">=1.5.3" -sentry-sdk = ">=1.15.0" statcommons = {path = "../statcommons"} werkzeug = ">=2.2.3" @@ -1665,7 +1663,6 @@ files = [] develop = false [package.dependencies] -blinker = ">=1.5" datalens-api-lib = {path = "../../lib/dl_api_lib"} datalens-app-tools = {path = "../../lib/dl_app_tools"} datalens-connector-chyt = {path = "../../lib/dl_connector_chyt"} @@ -1679,7 +1676,6 @@ datalens-sqlalchemy-postgres = {path = "../../lib/dl_sqlalchemy_postgres"} datalens-utils = {path = "../../lib/dl_utils"} datalens-version = {path = "../../lib/dl_version"} Flask = ">=2.2.5" -raven = ">=6.10.0" [package.source] type = "directory" @@ -1726,7 +1722,6 @@ opentracing = ">=2.4.0" python-dateutil = ">=2.8.2" pytz = ">=2022.7.1" pyyaml = ">=6.0.1" -raven = ">=6.10.0" redis = ">=4.5.4" redis_cache_lock = {path = "../redis-cache-lock"} requests = ">=2.28.2" @@ -1868,7 +1863,6 @@ gunicorn = ">=20.1.0" marshmallow = ">=3.19.0" marshmallow-oneofschema = ">=3.0.1" redis = ">=4.5.4" -sentry-sdk = ">=1.15.0" [package.source] type = "directory" @@ -4906,7 +4900,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"}, @@ -4914,15 +4907,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"}, @@ -4939,7 +4925,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"}, @@ -4947,7 +4932,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"}, @@ -5057,21 +5041,6 @@ files = [ [package.extras] full = ["numpy"] -[[package]] -name = "raven" -version = "6.10.0" -description = "Raven is a client for Sentry (https://getsentry.com)" -optional = false -python-versions = "*" -files = [ - {file = "raven-6.10.0-py2.py3-none-any.whl", hash = "sha256:44a13f87670836e153951af9a3c80405d36b43097db869a36e92809673692ce4"}, - {file = "raven-6.10.0.tar.gz", hash = "sha256:3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54"}, -] - -[package.extras] -flask = ["Flask (>=0.8)", "blinker (>=1.1)"] -tests = ["Flask (>=0.8)", "Flask-Login (>=0.2.0)", "ZConfig", "aiohttp", "anyjson", "blinker (>=1.1)", "blinker (>=1.1)", "bottle", "celery (>=2.5)", "coverage (<4)", "exam (>=0.5.2)", "flake8 (==3.5.0)", "logbook", "mock", "nose", "pytest (>=3.2.0,<3.3.0)", "pytest-cov (==2.5.1)", "pytest-flake8 (==1.0.0)", "pytest-pythonpath (==0.7.2)", "pytest-timeout (==1.2.1)", "pytest-xdist (==1.18.2)", "pytz", "requests", "sanic (>=0.7.0)", "tornado (>=4.1,<5.0)", "tox", "webob", "webtest", "wheel"] - [[package]] name = "redis" version = "4.5.4" @@ -5368,7 +5337,9 @@ files = [ ] [package.dependencies] +blinker = {version = ">=1.1", optional = true, markers = "extra == \"flask\""} certifi = "*" +flask = {version = ">=0.11", optional = true, markers = "extra == \"flask\""} urllib3 = {version = ">=1.26.11", markers = "python_version >= \"3.6\""} [package.extras] @@ -6364,4 +6335,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.10, <3.12" -content-hash = "08be0db497c668327c51002dc3d5bdbe0c4405cab9d833018c70f16c6c59b6fd" +content-hash = "5072dacb98bd69cb90cf3d061072aeb1a8920ca749f1aa8eca98996b61aa8ed7" diff --git a/metapkg/pyproject.toml b/metapkg/pyproject.toml index 45849c60c..770054f39 100644 --- a/metapkg/pyproject.toml +++ b/metapkg/pyproject.toml @@ -36,7 +36,6 @@ marshmallow-oneofschema = "==3.0.1" pandas = "==1.5.3" pyopenssl = "==23.2.0" python-dateutil = "==2.8.2" -raven = "==6.10.0" requests = "==2.28.2" tabulate = "==0.9.0" async-timeout = "==4.0.2" @@ -260,7 +259,6 @@ pyodbc = {ignore = true} pytest = {ignore = true} pytest-asyncio = {ignore = true} pyyaml = {ignore = true} -raven = {ignore = true} responses = {ignore = true} ruff = {ignore = true} sentry-sdk = {ignore = true} From dd546a72ffe0ff922312197521ce312f54e55102 Mon Sep 17 00:00:00 2001 From: Andrey Snytin Date: Tue, 14 Nov 2023 19:55:21 +0100 Subject: [PATCH 2/2] fix --- lib/dl_api_commons/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dl_api_commons/pyproject.toml b/lib/dl_api_commons/pyproject.toml index 9e9faa0fa..e3ead9c64 100644 --- a/lib/dl_api_commons/pyproject.toml +++ b/lib/dl_api_commons/pyproject.toml @@ -18,7 +18,7 @@ marshmallow = ">=3.19.0" multidict = ">=4.0" opentracing = ">=2.4.0" python = ">=3.10, <3.12" -sentry-sdk = {extras = ["flask"], version = ">=1.15.0"} +sentry-sdk = {version = ">=1.15.0", extras = ["flask"]} typing-extensions = ">=4.5.0" datalens-utils = {path = "../dl_utils"} datalens-constants = {path = "../dl_constants"}