remove python 3.5 support (#374)

This commit is contained in:
alrex
2021-03-18 08:15:35 -07:00
committed by GitHub
parent 2d9df10645
commit ef0f74ec64
39 changed files with 71 additions and 128 deletions

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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

View File

@ -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:

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -21,14 +21,9 @@ cov exporter/opentelemetry-exporter-datadog
cov instrumentation/opentelemetry-instrumentation-flask
cov instrumentation/opentelemetry-instrumentation-requests
cov instrumentation/opentelemetry-instrumentation-wsgi
# 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

View File

@ -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))
def extraargs_help(calledcmd):

View File

@ -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:

65
tox.ini
View File

@ -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

View File

@ -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: