Skip to content

Commit e0184fb

Browse files
committed
ASGI only runs under Python 3.5+, fixes to tox/coverage
Signed-off-by: Emil Madsen <sovende@gmail.com>
1 parent 749d32e commit e0184fb

3 files changed

Lines changed: 19 additions & 6 deletions

File tree

ext/opentelemetry-ext-asgi/setup.cfg

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ classifiers =
2828
License :: OSI Approved :: Apache Software License
2929
Programming Language :: Python
3030
Programming Language :: Python :: 3
31+
Programming Language :: Python :: 3.5
32+
Programming Language :: Python :: 3.6
3133
Programming Language :: Python :: 3.7
3234

3335
[options]
34-
python_requires = >=3.7
36+
python_requires = >=3.5
3537
package_dir=
3638
=src
3739
packages=find_namespace:

scripts/coverage.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ function cov {
1212
${1}
1313
}
1414

15+
PYTHON_VERSION=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))')
16+
PYTHON_VERSION_INFO=(${PYTHON_VERSION//./ })
1517

1618
coverage erase
1719

@@ -26,5 +28,10 @@ cov ext/opentelemetry-ext-wsgi
2628
cov ext/opentelemetry-ext-zipkin
2729
cov examples/opentelemetry-example-app
2830

29-
coverage report
31+
# ext-asgi is only supported on Python 3.5+.
32+
if [ ${PYTHON_VERSION_INFO[1]} -gt 4 ]; then
33+
cov ext/opentelemetry-ext-asgi
34+
fi
35+
36+
coverage report --show-missing
3037
coverage xml

tox.ini

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ skipsdist = True
33
skip_missing_interpreters = True
44
envlist =
55
py3{4,5,6,7,8}-test-{api,sdk,example-app,ext-wsgi,ext-flask,ext-http-requests,ext-jaeger,ext-dbapi,ext-mysql,ext-psycopg2,ext-pymongo,ext-zipkin,opentracing-shim}
6-
pypy3-test-{api,sdk,example-app,ext-wsgi,ext-flask,ext-http-requests,ext-jaeger,ext-dbapi,ext-mysql,ext-pymongo,ext-zipkin,opentracing-shim}
6+
py3{5,6,7,8}-test-{ext-asgi}
7+
pypy3-test-{api,sdk,example-app,ext-wsgi,ext-asgi,ext-flask,ext-http-requests,ext-jaeger,ext-dbapi,ext-mysql,ext-pymongo,ext-zipkin,opentracing-shim}
78
py3{4,5,6,7,8}-test-{api,sdk,example-app,example-basic-tracer,example-http,ext-wsgi,ext-flask,ext-http-requests,ext-jaeger,ext-dbapi,ext-mysql,ext-psycopg2,ext-pymongo,ext-zipkin,opentracing-shim}
8-
pypy3-test-{api,sdk,example-app,example-basic-tracer,example-http,ext-wsgi,ext-flask,ext-http-requests,ext-jaeger,ext-dbapi,ext-mysql,ext-pymongo,ext-zipkin,opentracing-shim}
9+
py3{5,6,7,8}-test-{ext-asgi}
10+
pypy3-test-{api,sdk,example-app,example-basic-tracer,example-http,ext-wsgi,ext-asgi,ext-flask,ext-http-requests,ext-jaeger,ext-dbapi,ext-mysql,ext-pymongo,ext-zipkin,opentracing-shim}
911
py3{4,5,6,7,8}-coverage
1012

1113
; Coverage is temporarily disabled for pypy3 due to the pytest bug.
@@ -41,6 +43,7 @@ changedir =
4143
test-ext-mysql: ext/opentelemetry-ext-mysql/tests
4244
test-ext-pymongo: ext/opentelemetry-ext-pymongo/tests
4345
test-ext-psycopg2: ext/opentelemetry-ext-psycopg2/tests
46+
test-ext-asgi: ext/opentelemetry-ext-asgi/tests
4447
test-ext-wsgi: ext/opentelemetry-ext-wsgi/tests
4548
test-ext-zipkin: ext/opentelemetry-ext-zipkin/tests
4649
test-ext-flask: ext/opentelemetry-ext-flask/tests
@@ -68,9 +71,10 @@ commands_pre =
6871
example-http: pip install -r {toxinidir}/examples/http/requirements.txt
6972

7073
ext: pip install {toxinidir}/opentelemetry-api
71-
wsgi,flask: pip install {toxinidir}/ext/opentelemetry-ext-testutil
74+
wsgi,flask,asgi: pip install {toxinidir}/ext/opentelemetry-ext-testutil
75+
wsgi,flask,asgi: pip install {toxinidir}/opentelemetry-sdk
7276
wsgi,flask: pip install {toxinidir}/ext/opentelemetry-ext-wsgi
73-
wsgi,flask: pip install {toxinidir}/opentelemetry-sdk
77+
asgi: pip install {toxinidir}/ext/opentelemetry-ext-asgi
7478
flask: pip install {toxinidir}/ext/opentelemetry-ext-flask[test]
7579
dbapi: pip install {toxinidir}/ext/opentelemetry-ext-dbapi
7680
mysql: pip install {toxinidir}/ext/opentelemetry-ext-dbapi

0 commit comments

Comments
 (0)