diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 84cbecace..515fdf433 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,6 @@ jobs: build: env: # We use these variables to convert between tox and GHA version literals - py34: 3.4 py35: 3.5 py36: 3.6 py37: 3.7 @@ -16,7 +15,7 @@ jobs: strategy: fail-fast: false # ensures the entire test matrix is run, even if one permutation fails matrix: - python-version: [ py34, py35, py36, py37, py38, pypy3 ] + python-version: [ py35, py36, py37, py38, pypy3 ] package: ["instrumentation", "core", "exporter"] os: [ ubuntu-latest ] include: diff --git a/tox.ini b/tox.ini index 0fbaabce8..057562907 100644 --- a/tox.ini +++ b/tox.ini @@ -5,15 +5,15 @@ envlist = ; Environments are organized by individual package, allowing ; for specifying supported Python versions per package. ; opentelemetry-api - py3{4,5,6,7,8}-test-core-api + py3{5,6,7,8}-test-core-api pypy3-test-core-api ; opentelemetry-proto - py3{4,5,6,7,8}-test-core-proto + py3{5,6,7,8}-test-core-proto pypy3-test-core-proto ; opentelemetry-sdk - py3{4,5,6,7,8}-test-core-sdk + py3{5,6,7,8}-test-core-sdk pypy3-test-core-sdk ; opentelemetry-instrumentation @@ -21,11 +21,11 @@ envlist = pypy3-test-core-instrumentation ; docs/getting-started - py3{4,5,6,7,8}-test-core-getting-started + py3{5,6,7,8}-test-core-getting-started pypy3-test-core-getting-started ; opentelemetry-example-app - py3{4,5,6,7,8}-test-instrumentation-example-app + py3{5,6,7,8}-test-instrumentation-example-app pypy3-test-instrumentation-example-app ; opentelemetry-instrumentation-aiohttp-client @@ -41,11 +41,11 @@ envlist = pypy3-test-instrumentation-botocore ; opentelemetry-instrumentation-django - py3{4,5,6,7,8}-test-instrumentation-django + py3{5,6,7,8}-test-instrumentation-django pypy3-test-instrumentation-django ; opentelemetry-instrumentation-dbapi - py3{4,5,6,7,8}-test-instrumentation-dbapi + py3{5,6,7,8}-test-instrumentation-dbapi pypy3-test-instrumentation-dbapi ; opentelemetry-instrumentation-boto @@ -53,7 +53,7 @@ envlist = pypy3-test-instrumentation-boto ; opentelemetry-instrumentation-elasticsearch - py3{4,5,6,7,8}-test-instrumentation-elasticsearch{2,5,6,7} + py3{5,6,7,8}-test-instrumentation-elasticsearch{2,5,6,7} pypy3-test-instrumentation-elasticsearch{2,5,6,7} ; opentelemetry-instrumentation-fastapi @@ -62,11 +62,11 @@ envlist = pypy3-test-instrumentation-fastapi ; opentelemetry-instrumentation-flask - py3{4,5,6,7,8}-test-instrumentation-flask + py3{5,6,7,8}-test-instrumentation-flask pypy3-test-instrumentation-flask ; opentelemetry-instrumentation-requests - py3{4,5,6,7,8}-test-instrumentation-requests + py3{5,6,7,8}-test-instrumentation-requests pypy3-test-instrumentation-requests ; opentelemetry-instrumentation-starlette. @@ -75,22 +75,22 @@ envlist = pypy3-test-instrumentation-starlette ; opentelemetry-instrumentation-jinja2 - py3{4,5,6,7,8}-test-instrumentation-jinja2 + py3{5,6,7,8}-test-instrumentation-jinja2 pypy3-test-instrumentation-jinja2 ; opentelemetry-exporter-jaeger - py3{4,5,6,7,8}-test-exporter-jaeger + py3{5,6,7,8}-test-exporter-jaeger pypy3-test-exporter-jaeger ; opentelemetry-exporter-datadog py3{5,6,7,8}-test-exporter-datadog ; opentelemetry-instrumentation-mysql - py3{4,5,6,7,8}-test-instrumentation-mysql + py3{5,6,7,8}-test-instrumentation-mysql pypy3-test-instrumentation-mysql ; opentelemetry-exporter-opencensus - py3{4,5,6,7,8}-test-exporter-opencensus + py3{5,6,7,8}-test-exporter-opencensus ; exporter-opencensus intentionally excluded from pypy3 ; opentelemetry-exporter-otlp @@ -98,27 +98,27 @@ envlist = ; exporter-otlp intentionally excluded from pypy3 ; opentelemetry-exporter-prometheus - py3{4,5,6,7,8}-test-exporter-prometheus + py3{5,6,7,8}-test-exporter-prometheus pypy3-test-exporter-prometheus ; opentelemetry-instrumentation-psycopg2 - py3{4,5,6,7,8}-test-instrumentation-psycopg2 + py3{5,6,7,8}-test-instrumentation-psycopg2 ; ext-psycopg2 intentionally excluded from pypy3 ; opentelemetry-instrumentation-pymemcache - py3{4,5,6,7,8}-test-instrumentation-pymemcache + py3{5,6,7,8}-test-instrumentation-pymemcache pypy3-test-instrumentation-pymemcache ; opentelemetry-instrumentation-pymongo - py3{4,5,6,7,8}-test-instrumentation-pymongo + py3{5,6,7,8}-test-instrumentation-pymongo pypy3-test-instrumentation-pymongo ; opentelemetry-instrumentation-pymysql - py3{4,5,6,7,8}-test-instrumentation-pymysql + py3{5,6,7,8}-test-instrumentation-pymysql pypy3-test-instrumentation-pymysql ; opentelemetry-instrumentation-pyramid - py3{4,5,6,7,8}-test-instrumentation-pyramid + py3{5,6,7,8}-test-instrumentation-pyramid pypy3-test-instrumentation-pyramid ; opentelemetry-instrumentation-asgi @@ -130,30 +130,30 @@ envlist = ; ext-asyncpg intentionally excluded from pypy3 ; opentelemetry-instrumentation-sqlite3 - py3{4,5,6,7,8}-test-instrumentation-sqlite3 + py3{5,6,7,8}-test-instrumentation-sqlite3 pypy3-test-instrumentation-sqlite3 ; opentelemetry-instrumentation-wsgi - py3{4,5,6,7,8}-test-instrumentation-wsgi + py3{5,6,7,8}-test-instrumentation-wsgi pypy3-test-instrumentation-wsgi ; opentelemetry-exporter-zipkin - py3{4,5,6,7,8}-test-exporter-zipkin + py3{5,6,7,8}-test-exporter-zipkin pypy3-test-exporter-zipkin ; opentelemetry-opentracing-shim - py3{4,5,6,7,8}-test-core-opentracing-shim + py3{5,6,7,8}-test-core-opentracing-shim pypy3-test-core-opentracing-shim ; opentelemetry-instrumentation-grpc py3{5,6,7,8}-test-instrumentation-grpc ; opentelemetry-instrumentation-sqlalchemy - py3{4,5,6,7,8}-test-instrumentation-sqlalchemy + py3{5,6,7,8}-test-instrumentation-sqlalchemy pypy3-test-instrumentation-sqlalchemy ; opentelemetry-instrumentation-redis - py3{4,5,6,7,8}-test-instrumentation-redis + py3{5,6,7,8}-test-instrumentation-redis pypy3-test-instrumentation-redis ; opentelemetry-instrumentation-celery @@ -161,7 +161,7 @@ envlist = pypy3-test-instrumentation-celery ; opentelemetry-instrumentation-system-metrics - py3{4,5,6,7,8}-test-instrumentation-system-metrics + py3{5,6,7,8}-test-instrumentation-system-metrics ; instrumentation-system-metrics intentionally excluded from pypy3 ; known limitation: gc.get_count won't work under pypy @@ -235,7 +235,7 @@ changedir = commands_pre = ; Install without -e to test the actual installation - py3{4,5,6,7,8}: python -m pip install -U pip setuptools wheel + py3{5,6,7,8}: python -m pip install -U pip setuptools wheel ; Install common packages for all the tests. These are not needed in all the ; cases but it saves a lot of boilerplate in this file. test: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-sdk {toxinidir}/tests/util @@ -337,10 +337,6 @@ commands = ; implicit Any due to unfollowed import would result). mypyinstalled: mypy --namespace-packages opentelemetry-api/tests/mypysmoke.py --strict -[testenv:py34-test-core-opentracing-shim] -commands = - pytest --ignore-glob='*[asyncio].py' - [testenv:lint] basepython: python3.8 recreate = True