From 9b74ec9ac8f416f91d6e7aa07ff275184a4b5210 Mon Sep 17 00:00:00 2001 From: Michael Manganiello Date: Mon, 25 Oct 2021 11:51:24 -0300 Subject: [PATCH] `falcon`: Drop support for Python 3.4 Remove unwanted support for Python versions <3.6. This integration mistakenly lists Python 3.4 support, because it was merged in https://github.com/open-telemetry/opentelemetry-python/pull/1039, after the merge of https://github.com/open-telemetry/opentelemetry-python/pull/1099, so the latter didn't consider `falcon`. Python 3.4 is broken nevertheless, as this integration already includes f-strings and other `opentelemetry` dependencies, which require Python 3.6. Fixes #772. --- .../opentelemetry-instrumentation-falcon/setup.cfg | 3 +-- tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg index c6f40319c5..e39c8d3dc2 100644 --- a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg @@ -28,14 +28,13 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 [options] -python_requires = >=3.4 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/tox.ini b/tox.ini index 9533aeb7e3..20dacc834c 100644 --- a/tox.ini +++ b/tox.ini @@ -46,7 +46,7 @@ envlist = pypy3-test-instrumentation-elasticsearch{2,5,6} ; opentelemetry-instrumentation-falcon - py3{4,5,6,7,8,9}-test-instrumentation-falcon{2,3} + py3{6,7,8,9}-test-instrumentation-falcon{2,3} pypy3-test-instrumentation-falcon{2,3} ; opentelemetry-instrumentation-fastapi @@ -258,7 +258,7 @@ commands_pre = test: pip install "opentelemetry-semantic-conventions[test] @ {env:CORE_REPO}#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions" test: pip install "opentelemetry-sdk[test] @ {env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk" test: pip install "opentelemetry-test[test] @ {env:CORE_REPO}#egg=opentelemetry-test&subdirectory=tests/util" - test: pip install {toxinidir}/opentelemetry-instrumentation + test: pip install {toxinidir}/opentelemetry-instrumentation distro: pip install {toxinidir}/opentelemetry-distro