Remove opentelemetry_experimental conditional

The `opentelemetry_experimental` conditional was used to enable the
`opentelemetry-experimental` integration on Fedora 40 and later versions.
Since `rawhide` will not be merged to the `f39` branch anymore (the `f39`
branch has version 1.45.0, while `rawhide` has version 2.7.1, and version
2.0.0 has breaking changes), it is safe to drop this conditional.
This commit is contained in:
Roman Inflianskas 2024-07-16 21:12:19 +03:00
parent 85bb22dbc8
commit 4422182ee8
No known key found for this signature in database

View file

@ -26,9 +26,6 @@
# no_strawberry: strawberry not packaged yet
# no_trytond: trytond not packaged yet
# Conditionally excluded extras
# opentelemetry-experimental requires opentelemetry-contrib libraries of 0.40b0 version
%bcond opentelemetry_experimental %[%{?fedora} >= 40]
# no_py313_support_gevent: do not install gevent and test with gevent on Fedora >= 41 for now,
# since it is not fully compatible with Python 3.13:
# https://bugzilla.redhat.com/show_bug.cgi?id=2275488
@ -164,7 +161,7 @@ Summary: %{summary}
httpx
pymongo
rq
%{?with_opentelemetry_experimental:opentelemetry-experimental}
opentelemetry-experimental
%{nil}}
# List of names of extras excluded (if not present in components_excluded)
@ -176,7 +173,6 @@ Summary: %{summary}
celery-redbeat
clickhouse-driver
pyspark
%{!?with_opentelemetry_experimental:opentelemetry-experimental}
%{nil}}
%define toxenvs_by_components %{expand:%(echo %{components} | sed "s/^/%{toxenv}-/;s/ / %{toxenv}-/g")}
@ -335,8 +331,6 @@ skip_import_check="${skip_import_check-} -e sentry_sdk.integrations.starlette"
skip_import_check="${skip_import_check-} -e sentry_sdk.integrations.tornado"
%endif
%{!?with_opentelemetry_experimental:skip_import_check="${skip_import_check-} -e sentry_sdk.integrations.opentelemetry.integration"}
%pyproject_check_import ${skip_import_check}
%if %{with tests}
@ -426,8 +420,6 @@ ignore="${ignore-} --ignore=tests/integrations/bottle"
ignore="${ignore-} --ignore=tests/integrations/flask"
ignore="${ignore-} --ignore=tests/integrations/pyramid"
ignore="${ignore-} %{!?with_opentelemetry_experimental:--ignore=tests/integrations/opentelemetry/test_experimental.py}"
defined_toxenvs=$(echo "%toxenvs_excluded" "%toxenvs" | xargs -n1 | sort -u)
tox_ini_toxenvs=$(cat tox.ini | sed -r -n 's/[[:blank:]]*(.*):[[:blank:]]*TESTPATH=.*/%{default_toxenv}-\1/p' | xargs -n1 | sort -u)
diff <(echo "$defined_toxenvs") <(echo "$tox_ini_toxenvs")