Refactor cohere absence handling

Treat absence of `cohere` the same way as absence of other dependencies.

[skip changelog]
This commit is contained in:
Roman Inflianskas 2024-07-16 15:43:52 +03:00
parent 44c6a5e84a
commit cb4a883f20
No known key found for this signature in database

View file

@ -9,6 +9,7 @@
# no_celery_redbeat: celery-redbeat not packaged yet
# no_chalice: chalice not packaged yet
# no_clickhouse_driver: clickhouse_driver not packaged yet
# no_cohere: cohere is not packaged
# no_gql: gql not packaged yet
# no_huey: huey not packaged yet
# no_huggingface_hub: huggingface_hub not packaged yet
@ -188,6 +189,7 @@ Summary: %{summary}
# bottle: werkzeug in Fedora 38 is too new, see: https://github.com/getsentry/sentry-python/issues/1398
# clickhouse_driver: no_clickhouse_driver
# flask: werkzeug in Fedora 38 is too new, see: https://github.com/getsentry/sentry-python/issues/1398
# cohere: no_cohere
# gcp: python 3.7 only
# gql: no_gql
# graphene: graphene is too old (min version: 3.3)
@ -211,6 +213,7 @@ Summary: %{summary}
%{toxenv}-boto3
%{toxenv}-bottle
%{toxenv}-clickhouse_driver
%{toxenv}-cohere
%{toxenv}-flask
%{toxenv}-gcp
%{toxenv}-gql
@ -253,10 +256,6 @@ sed -r -i 's/(anyio)<4\.0\.0/\1/' tox.ini
# newrelic is unpackaged yet, remove it
sed -r -i '/(newrelic)/d' tox.ini
# cohere is unpackaged yet, remote it (also requires unpackaged httpx-sse)
sed -r -i '/(cohere)/d' tox.ini
rm -rf tests/integrations/cohere
rm -f sentry_sdk/integrations/cohere.py
%generate_buildrequires
%pyproject_buildrequires -x %{extras_csv} -e %{toxenvs_csv}
@ -285,6 +284,7 @@ skip_import_check="${skip_import_check-} -e sentry_sdk.integrations.arq" # no_a
skip_import_check="${skip_import_check-} -e sentry_sdk.integrations.celery_redbeat" # no_celery_redbeat
skip_import_check="${skip_import_check-} -e sentry_sdk.integrations.chalice" # no_chalice
skip_import_check="${skip_import_check-} -e sentry_sdk.integrations.clickhouse_driver" # no_clickhouse_driver
skip_import_check="${skip_import_check-} -e sentry_sdk.integrations.cohere" # no_cohere
skip_import_check="${skip_import_check-} -e sentry_sdk.integrations.gql" # no_gql
skip_import_check="${skip_import_check-} -e sentry_sdk.integrations.huey" # no_huey
skip_import_check="${skip_import_check-} -e sentry_sdk.integrations.huggingface_hub" # no_huggingface_hub
@ -410,8 +410,6 @@ ignore="${ignore-} --ignore=tests/integrations/pyramid"
# newrelic is unpackaged yet
deselect="${deselect-} --deselect=tests/integrations/celery/test_celery.py::test_newrelic_interference"
# cohere is unpackaged yet
ignore="${ignore-} --ignore=tests/integrations/cohere"
# werkzeug in Fedora 38 is too new, see: https://github.com/getsentry/sentry-python/issues/1398
ignore="${ignore-} --ignore=tests/integrations/bottle"