diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index caf99113d..2576d07fe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,6 @@ jobs: build: env: # We use these variables to convert between tox and GHA version literals - py35: 3.5 py36: 3.6 py37: 3.7 py38: 3.8 @@ -22,18 +21,9 @@ jobs: strategy: fail-fast: false # ensures the entire test matrix is run, even if one permutation fails matrix: - python-version: [ py35, py36, py37, py38, pypy3 ] + python-version: [ py36, py37, py38, pypy3 ] package: ["instrumentation", "exporter", "sdkextension", "propagator"] os: [ ubuntu-latest ] - include: - # py35-instrumentation segfaults on 18.04 so we instead run on 20.04 - - python-version: py35 - package: instrumentation - os: ubuntu-20.04 - exclude: - - os: ubuntu-latest - python-version: py35 - package: instrumentation steps: - name: Checkout Contrib Repo @ SHA - ${{ github.sha }} uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 538ee3269..4102c1f8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `opentelemetry-exporter-datadog` Fix warning when DatadogFormat encounters a request with no DD_ORIGIN headers ([#368](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/368)). +### Removed +- Removing support for Python 3.5 + ([#374](https://github.com/open-telemetry/opentelemetry-python/pull/374)) + ## [0.18b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.18b0) - 2021-02-16 ### Added diff --git a/_template/setup.cfg b/_template/setup.cfg index f93c60bf3..3b68910af 100644 --- a/_template/setup.cfg +++ b/_template/setup.cfg @@ -34,13 +34,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/exporter/opentelemetry-exporter-datadog/setup.cfg b/exporter/opentelemetry-exporter-datadog/setup.cfg index 3b8b0da32..149ecdef1 100644 --- a/exporter/opentelemetry-exporter-datadog/setup.cfg +++ b/exporter/opentelemetry-exporter-datadog/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg index bd0f7b9b4..9fc3a3f86 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5.3 +python_requires = >=3.6.3 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg index b33e411d8..dd2f2205e 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg index e3e4ff206..5829e65c5 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg index 6e44db439..7276fafbd 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg index 4d83fc0d8..9dee78ec0 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg index 63216fde1..078d0ca83 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg index 844223775..6278dcc64 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg index 4c1281106..89c50cce8 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-django/setup.cfg b/instrumentation/opentelemetry-instrumentation-django/setup.cfg index 86143dfe7..a919cf925 100644 --- a/instrumentation/opentelemetry-instrumentation-django/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-django/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg index 9ef7a4452..03c2b20b3 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg index 9553cdac5..3194d43b6 100644 --- a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg @@ -29,7 +29,6 @@ classifiers = Programming Language :: Python Programming Language :: Python :: 3 Programming Language :: Python :: 3.4 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 diff --git a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg index 97d69dfca..363e93a7e 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg index ca5a11f44..7a6e37d56 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg index 0b231341c..0dc1f385c 100644 --- a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg @@ -28,7 +28,6 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 diff --git a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg index d89f24178..620b8adb5 100644 --- a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg @@ -28,7 +28,6 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 diff --git a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg index 7945389b9..19af5b40c 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg index fe055dfed..31a6a61b8 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg index b0270f4d5..9b8ff3772 100644 --- a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg index 102bf7255..2b923739b 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg index f85343529..997b10336 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg index faeab9091..c15b19ff2 100644 --- a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg index 4396e3dcb..e3734e635 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg index 9afb95c68..9f0119b2a 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg index 08c37fce2..439e1f578 100644 --- a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg index 91d54982e..9f8ef5aa1 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg index 9e957d4e9..42a045e01 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg index ed964476d..d559b72c3 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg @@ -27,13 +27,12 @@ classifiers = Intended Audience :: Developers License :: OSI Approved :: Apache Software License Programming Language :: Python - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg index d87f032c3..f542307cf 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg index 48cedab9a..ee192c043 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/propagator/opentelemetry-propagator-ot-trace/setup.cfg b/propagator/opentelemetry-propagator-ot-trace/setup.cfg index f71c61f2b..cb67eda71 100644 --- a/propagator/opentelemetry-propagator-ot-trace/setup.cfg +++ b/propagator/opentelemetry-propagator-ot-trace/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/scripts/coverage.sh b/scripts/coverage.sh index 8055adb0d..9ec7104df 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -21,14 +21,9 @@ cov exporter/opentelemetry-exporter-datadog cov instrumentation/opentelemetry-instrumentation-flask cov instrumentation/opentelemetry-instrumentation-requests cov instrumentation/opentelemetry-instrumentation-wsgi +cov instrumentation/opentelemetry-instrumentation-aiohttp-client +cov instrumentation/opentelemetry-instrumentation-asgi -# aiohttp is only supported on Python 3.5+. -if [ ${PYTHON_VERSION_INFO[1]} -gt 4 ]; then - cov instrumentation/opentelemetry-instrumentation-aiohttp-client -# ext-asgi is only supported on Python 3.5+. -if [ ${PYTHON_VERSION_INFO[1]} -gt 4 ]; then - cov instrumentation/opentelemetry-instrumentation-asgi -fi coverage report --show-missing coverage xml diff --git a/scripts/eachdist.py b/scripts/eachdist.py index 4bf1f3337..2d6a25409 100755 --- a/scripts/eachdist.py +++ b/scripts/eachdist.py @@ -7,7 +7,6 @@ import shlex import shutil import subprocess import sys -from collections import namedtuple from configparser import ConfigParser from datetime import datetime from inspect import cleandoc @@ -26,17 +25,7 @@ def unique(elems): seen.add(elem) -try: - subprocess_run = subprocess.run -except AttributeError: # Py < 3.5 compat - CompletedProcess = namedtuple("CompletedProcess", "returncode") - - def subprocess_run(*args, **kwargs): - check = kwargs.pop("check", False) - if check: - subprocess.check_call(*args, **kwargs) - return CompletedProcess(returncode=0) - return CompletedProcess(returncode=subprocess.call(*args, **kwargs)) +subprocess_run = subprocess.run def extraargs_help(calledcmd): diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg index 26ea9aeee..6346b548c 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg +++ b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: diff --git a/tox.ini b/tox.ini index e0358cfb5..329a0f664 100644 --- a/tox.ini +++ b/tox.ini @@ -6,15 +6,15 @@ envlist = ; for specifying supported Python versions per package. ; opentelemetry-sdk-extension-aws - py3{5,6,7,8}-test-sdkextension-aws + py3{6,7,8}-test-sdkextension-aws pypy3-test-sdkextension-aws ; opentelemetry-instrumentation-aiohttp-client - py3{5,6,7,8}-test-instrumentation-aiohttp-client + py3{6,7,8}-test-instrumentation-aiohttp-client pypy3-test-instrumentation-aiohttp-client ; opentelemetry-instrumentation-aiopg - py3{5,6,7,8}-test-instrumentation-aiopg + py3{6,7,8}-test-instrumentation-aiopg ; instrumentation-aiopg intentionally excluded from pypy3 ; opentelemetry-instrumentation-botocore @@ -22,19 +22,19 @@ envlist = pypy3-test-instrumentation-botocore ; opentelemetry-instrumentation-django - py3{5,6,7,8}-test-instrumentation-django + py3{6,7,8}-test-instrumentation-django pypy3-test-instrumentation-django ; opentelemetry-instrumentation-dbapi - py3{5,6,7,8}-test-instrumentation-dbapi + py3{6,7,8}-test-instrumentation-dbapi pypy3-test-instrumentation-dbapi ; opentelemetry-instrumentation-boto - py3{5,6,7,8}-test-instrumentation-boto + py3{6,7,8}-test-instrumentation-boto pypy3-test-instrumentation-boto ; opentelemetry-instrumentation-elasticsearch - py3{5,6,7,8}-test-instrumentation-elasticsearch{2,5,6,7} + py3{6,7,8}-test-instrumentation-elasticsearch{2,5,6,7} pypy3-test-instrumentation-elasticsearch{2,5,6,7} ; opentelemetry-instrumentation-falcon @@ -47,15 +47,15 @@ envlist = pypy3-test-instrumentation-fastapi ; opentelemetry-instrumentation-flask - py3{5,6,7,8}-test-instrumentation-flask + py3{6,7,8}-test-instrumentation-flask pypy3-test-instrumentation-flask ; opentelemetry-instrumentation-urllib - py3{5,6,7,8}-test-instrumentation-urllib + py3{6,7,8}-test-instrumentation-urllib pypy3-test-instrumentation-urllib ; opentelemetry-instrumentation-requests - py3{5,6,7,8}-test-instrumentation-requests + py3{6,7,8}-test-instrumentation-requests pypy3-test-instrumentation-requests ; opentelemetry-instrumentation-starlette. @@ -64,85 +64,84 @@ envlist = pypy3-test-instrumentation-starlette ; opentelemetry-instrumentation-jinja2 - py3{5,6,7,8}-test-instrumentation-jinja2 + py3{6,7,8}-test-instrumentation-jinja2 pypy3-test-instrumentation-jinja2 ; opentelemetry-instrumentation-logging - py3{5,6,7,8}-test-instrumentation-logging + py3{6,7,8}-test-instrumentation-logging pypy3-test-instrumentation-logging ; opentelemetry-exporter-datadog - py3{5,6,7,8}-test-exporter-datadog + py3{6,7,8}-test-exporter-datadog ; opentelemetry-instrumentation-mysql - py3{5,6,7,8}-test-instrumentation-mysql + py3{6,7,8}-test-instrumentation-mysql pypy3-test-instrumentation-mysql ; opentelemetry-instrumentation-psycopg2 - py3{5,6,7,8}-test-instrumentation-psycopg2 + py3{6,7,8}-test-instrumentation-psycopg2 ; ext-psycopg2 intentionally excluded from pypy3 ; opentelemetry-instrumentation-pymemcache - py3{5,6,7,8}-test-instrumentation-pymemcache + py3{6,7,8}-test-instrumentation-pymemcache pypy3-test-instrumentation-pymemcache ; opentelemetry-instrumentation-pymongo - py3{5,6,7,8}-test-instrumentation-pymongo + py3{6,7,8}-test-instrumentation-pymongo pypy3-test-instrumentation-pymongo ; opentelemetry-instrumentation-pymysql - py3{5,6,7,8}-test-instrumentation-pymysql + py3{6,7,8}-test-instrumentation-pymysql pypy3-test-instrumentation-pymysql ; opentelemetry-instrumentation-pyramid - py3{5,6,7,8}-test-instrumentation-pyramid + py3{6,7,8}-test-instrumentation-pyramid pypy3-test-instrumentation-pyramid ; opentelemetry-instrumentation-asgi - py3{5,6,7,8}-test-instrumentation-asgi + py3{6,7,8}-test-instrumentation-asgi pypy3-test-instrumentation-asgi ; opentelemetry-instrumentation-asyncpg - py3{5,6,7,8}-test-instrumentation-asyncpg + py3{6,7,8}-test-instrumentation-asyncpg ; ext-asyncpg intentionally excluded from pypy3 ; opentelemetry-instrumentation-sqlite3 - py3{5,6,7,8}-test-instrumentation-sqlite3 + py3{6,7,8}-test-instrumentation-sqlite3 pypy3-test-instrumentation-sqlite3 ; opentelemetry-instrumentation-wsgi - py3{5,6,7,8}-test-instrumentation-wsgi + py3{6,7,8}-test-instrumentation-wsgi pypy3-test-instrumentation-wsgi ; opentelemetry-instrumentation-grpc - py3{5,6,7,8}-test-instrumentation-grpc + py3{6,7,8}-test-instrumentation-grpc ; opentelemetry-instrumentation-sqlalchemy - py3{5,6,7,8}-test-instrumentation-sqlalchemy + py3{6,7,8}-test-instrumentation-sqlalchemy pypy3-test-instrumentation-sqlalchemy ; opentelemetry-instrumentation-redis - py3{5,6,7,8}-test-instrumentation-redis + py3{6,7,8}-test-instrumentation-redis pypy3-test-instrumentation-redis ; opentelemetry-instrumentation-celery - py3{5,6,7,8}-test-instrumentation-celery + py3{6,7,8}-test-instrumentation-celery pypy3-test-instrumentation-celery ; opentelemetry-instrumentation-sklearn - py3{5,6,7,8}-test-instrumentation-sklearn + py3{6,7,8}-test-instrumentation-sklearn ; opentelemetry-instrumentation-tornado - ; instrumentation supports >=6 on Py 3.5 and above. - py3{5,6,7,8}-test-instrumentation-tornado + py3{6,7,8}-test-instrumentation-tornado pypy3-test-instrumentation-tornado ; opentelemetry-util-http - py3{5,6,7,8}-test-util-http + py3{6,7,8}-test-util-http pypy3-test-util-http ; opentelemetry-propagator-ot-trace - py3{5,6,7,8}-test-propagator-ot-trace + py3{6,7,8}-test-propagator-ot-trace pypy3-test-propagator-ot-trace lint @@ -208,7 +207,7 @@ changedir = commands_pre = ; Install without -e to test the actual installation - py3{5,6,7,8}: python -m pip install -U pip setuptools wheel + py3{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-python-core/opentelemetry-api diff --git a/util/opentelemetry-util-http/setup.cfg b/util/opentelemetry-util-http/setup.cfg index cd736a99c..c5de11fc1 100644 --- a/util/opentelemetry-util-http/setup.cfg +++ b/util/opentelemetry-util-http/setup.cfg @@ -28,13 +28,12 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 [options] -python_requires = >=3.5 +python_requires = >=3.6 package_dir= =src packages=find_namespace: