remove python 3.5 support (#1706)

open-telemetry · Mar 18, 2021 · d21793d · d21793d
1 parent 724c792
commit d21793d
Show file tree

Hide file tree

Showing 25 changed files with 45 additions and 96 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,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
@@ -27,18 +26,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, py39, pypy3 ]
+        python-version: [ py36, py37, py38, py39, pypy3 ]
         package: ["instrumentation", "core", "exporter", "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 Core Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v2
@@ -118,7 +108,6 @@ jobs:
   contrib-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
@@ -128,18 +117,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, py39, pypy3 ]
+        python-version: [ py36, py37, py38, py39, pypy3 ]
         package: ["instrumentation", "exporter"]
         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 - ${{ env.CONTRIB_REPO_SHA }}
         uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -74,6 +74,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1675](https://github.com/open-telemetry/opentelemetry-python/pull/1675))
 - Remove `OTEL_EXPORTER_*_ INSECURE` env var
   ([#1682](https://github.com/open-telemetry/opentelemetry-python/pull/1682))
+- Removing support for Python 3.5
+  ([#1706](https://github.com/open-telemetry/opentelemetry-python/pull/1706))
 
 ## [0.18b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.18b0) - 2021-02-16
 

diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@
 This page describes the Python [OpenTelemetry](https://opentelemetry.io/) implementation. OpenTelemetry is an observability framework for cloud-native software.
 
 ## Requirements
-Unless otherwise noted, all published artifacts support Python 3.5 or higher. See CONTRIBUTING.md for additional instructions for building this project for development.
+Unless otherwise noted, all published artifacts support Python 3.6 or higher. See CONTRIBUTING.md for additional instructions for building this project for development.
 
 ## Getting started
 

diff --git a/docs/examples/error_handler/error_handler_0/setup.cfg b/docs/examples/error_handler/error_handler_0/setup.cfg
@@ -25,14 +25,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/docs/examples/error_handler/error_handler_1/setup.cfg b/docs/examples/error_handler/error_handler_1/setup.cfg
@@ -25,14 +25,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/docs/index.rst b/docs/index.rst
@@ -16,7 +16,7 @@ generally be used in production environments.
 
 Requirement
 -----------
-OpenTelemetry-Python supports Python 3.5 and higher.
+OpenTelemetry-Python supports Python 3.6 and higher.
 
 Installation
 ------------

diff --git a/exporter/opentelemetry-exporter-jaeger-proto/setup.cfg b/exporter/opentelemetry-exporter-jaeger-proto/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg b/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/exporter/opentelemetry-exporter-jaeger/setup.cfg b/exporter/opentelemetry-exporter-jaeger/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 
 packages=find_namespace:
 install_requires =

diff --git a/exporter/opentelemetry-exporter-opencensus/setup.cfg b/exporter/opentelemetry-exporter-opencensus/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/exporter/opentelemetry-exporter-otlp/setup.cfg b/exporter/opentelemetry-exporter-otlp/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 packages=find_namespace:
 install_requires =
     opentelemetry-exporter-otlp-proto-grpc == 1.0.0.dev0
diff --git a/exporter/opentelemetry-exporter-zipkin/setup.cfg b/exporter/opentelemetry-exporter-zipkin/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/opentelemetry-api/setup.cfg b/opentelemetry-api/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/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/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/opentelemetry-proto/setup.cfg b/opentelemetry-proto/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/opentelemetry-sdk/setup.cfg b/opentelemetry-sdk/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/propagator/opentelemetry-propagator-b3/setup.cfg b/propagator/opentelemetry-propagator-b3/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:

diff --git a/propagator/opentelemetry-propagator-jaeger/setup.cfg b/propagator/opentelemetry-propagator-jaeger/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [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
@@ -40,13 +40,9 @@ cov instrumentation/opentelemetry-instrumentation-opentracing-shim
 cov util/opentelemetry-util-http
 cov exporter/opentelemetry-exporter-zipkin
 
-# 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
+
+cov instrumentation/opentelemetry-instrumentation-aiohttp-client
+cov instrumentation/opentelemetry-instrumentation-asgi
 
 coverage report --show-missing
 coverage xml
diff --git a/scripts/eachdist.py b/scripts/eachdist.py
@@ -7,7 +7,6 @@
 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/shim/opentelemetry-opentracing-shim/setup.cfg b/shim/opentelemetry-opentracing-shim/setup.cfg
@@ -28,14 +28,13 @@ 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
     Programming Language :: Python :: 3.9
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace: