Remove support for 3.6

.github/workflows/test.yml

@@ -10,7 +10,7 @@ env:
   # Otherwise, set variable to the commit of your branch on
   # opentelemetry-python-contrib which is compatible with these Core repo
   # changes.
-  CONTRIB_REPO_SHA: 1e7ea92f2e4df1ee8cd4b24ce4fa1dcefa20347a
+  CONTRIB_REPO_SHA: 23bfe9fcadc1e205fbce1b6cf58fc3004eecace3
   # This is needed because we do not clone the core repo in contrib builds anymore.
   # When running contrib builds as part of core builds, we use actions/checkout@v2 which
   # does not set an environment variable (simply just runs tox), which is different when
@@ -23,7 +23,6 @@ jobs:
   build:
     env:
       # We use these variables to convert between tox and GHA version literals
-      py36: 3.6
       py37: 3.7
       py38: 3.8
       py39: 3.9
@@ -34,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
       matrix:
-        python-version: [ py36, py37, py38, py39, py310, pypy3 ]
+        python-version: [ py37, py38, py39, py310, pypy3 ]
         package: ["api", "sdk", "semantic", "getting", "shim", "exporter", "protobuf", "propagator"]
         os: [ ubuntu-20.04, windows-2019 ]
     steps:
@@ -55,11 +54,6 @@ jobs:
             .tox
             ~/.cache/pip
           key: v3-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
-      # tox fails on windows and Python3.6 when tox dir is reused between builds so we remove it
-      - name: fix for windows + py3.6
-        if: ${{ matrix.os == 'windows-2019' && matrix.python-version == 'py36' }} 
-        shell: pwsh
-        run: Remove-Item .\.tox\ -Force -Recurse -ErrorAction Ignore
       - name: Windows does not let git check out files with long names
         if: ${{ matrix.os == 'windows-2019'}} 
         run: git config --system core.longpaths true
@@ -117,17 +111,17 @@ jobs:
         run: tox -e ${{ matrix.tox-environment }}
 
   # Contrib unit test suite in order to ensure changes in core do not break anything in contrib.
-  # We only run contrib unit tests on the oldest supported Python version (3.6) as running the same tests
+  # We only run contrib unit tests on the oldest supported Python version (3.7) as running the same tests
   # on all versions is somewhat redundant. 
   contrib-build:
     env:
       # We use these variables to convert between tox and GHA version literals
-      py36: 3.6
+      py37: 3.7
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
       matrix:
-        python-version: [ py36 ]
+        python-version: [ py37 ]
         package: ["instrumentation", "exporter"]
         os: [ ubuntu-20.04]
     steps:

CHANGELOG.md

@@ -7,14 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Remove support for 3.6
+  ([#2763](https://github.com/open-telemetry/opentelemetry-python/pull/2763))
 - Update PeriodicExportingMetricReader to never call export() concurrently
   ([#2873](https://github.com/open-telemetry/opentelemetry-python/pull/2873))
 - Add param for `indent` size to `LogRecord.to_json()`
   ([#2870](https://github.com/open-telemetry/opentelemetry-python/pull/2870))
 - Fix: Remove `LogEmitter.flush()` to align with OTel Log spec
   ([#2863](https://github.com/open-telemetry/opentelemetry-python/pull/2863))
 
-## [1.12.0-0.33b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0-0.33b0) - 2022-08-08
+## [1.12.0-0.33b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0) - 2022-08-08
 
 - Add `force_flush` method to metrics exporter
   ([#2852](https://github.com/open-telemetry/opentelemetry-python/pull/2852))

README.md

@@ -40,7 +40,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.6 or higher. See CONTRIBUTING.md for additional instructions for building this project for development.
+Unless otherwise noted, all published artifacts support Python 3.7 or higher. See CONTRIBUTING.md for additional instructions for building this project for development.
 
 ## Getting started
 

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.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

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.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg

@@ -28,15 +28,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Typing :: Typed
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg

@@ -28,15 +28,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Typing :: Typed
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

exporter/opentelemetry-exporter-jaeger/setup.cfg

@@ -28,15 +28,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Typing :: Typed
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

exporter/opentelemetry-exporter-opencensus/setup.cfg

@@ -28,15 +28,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Typing :: Typed
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

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.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg

@@ -28,14 +28,13 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

exporter/opentelemetry-exporter-otlp/setup.cfg

@@ -28,15 +28,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Typing :: Typed
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

exporter/opentelemetry-exporter-prometheus/setup.cfg

@@ -28,14 +28,13 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

exporter/opentelemetry-exporter-zipkin-json/setup.cfg

@@ -28,15 +28,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Typing :: Typed
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

exporter/opentelemetry-exporter-zipkin-json/tests/encoder/common_tests.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import abc
-import json
-import sys
 import unittest
 from typing import Dict, List
 
@@ -478,28 +476,4 @@ def pop_and_sort(source_list, source_index, sort_key):
             return popped_item
 
         def assert_equal_encoded_spans(self, expected_spans, actual_spans):
-            if sys.version_info.major == 3 and sys.version_info.minor <= 5:
-                expected_spans = json.loads(expected_spans)
-                actual_spans = json.loads(actual_spans)
-                for expected_span, actual_span in zip(
-                    expected_spans, actual_spans
-                ):
-                    actual_annotations = self.pop_and_sort(
-                        actual_span, "annotations", "timestamp"
-                    )
-                    expected_annotations = self.pop_and_sort(
-                        expected_span, "annotations", "timestamp"
-                    )
-                    expected_binary_annotations = self.pop_and_sort(
-                        expected_span, "binaryAnnotations", "key"
-                    )
-                    actual_binary_annotations = self.pop_and_sort(
-                        actual_span, "binaryAnnotations", "key"
-                    )
-                    self.assertEqual(actual_span, expected_span)
-                    self.assertEqual(actual_annotations, expected_annotations)
-                    self.assertEqual(
-                        actual_binary_annotations, expected_binary_annotations
-                    )
-            else:
-                self.assertEqual(expected_spans, actual_spans)
+            self.assertEqual(expected_spans, actual_spans)

exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg

@@ -28,15 +28,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Typing :: Typed
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

exporter/opentelemetry-exporter-zipkin-proto-http/tests/encoder/common_tests.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import abc
-import json
-import sys
 import unittest
 from typing import Dict, List
 
@@ -478,28 +476,4 @@ def pop_and_sort(source_list, source_index, sort_key):
             return popped_item
 
         def assert_equal_encoded_spans(self, expected_spans, actual_spans):
-            if sys.version_info.major == 3 and sys.version_info.minor <= 5:
-                expected_spans = json.loads(expected_spans)
-                actual_spans = json.loads(actual_spans)
-                for expected_span, actual_span in zip(
-                    expected_spans, actual_spans
-                ):
-                    actual_annotations = self.pop_and_sort(
-                        actual_span, "annotations", "timestamp"
-                    )
-                    expected_annotations = self.pop_and_sort(
-                        expected_span, "annotations", "timestamp"
-                    )
-                    expected_binary_annotations = self.pop_and_sort(
-                        expected_span, "binaryAnnotations", "key"
-                    )
-                    actual_binary_annotations = self.pop_and_sort(
-                        actual_span, "binaryAnnotations", "key"
-                    )
-                    self.assertEqual(actual_span, expected_span)
-                    self.assertEqual(actual_annotations, expected_annotations)
-                    self.assertEqual(
-                        actual_binary_annotations, expected_binary_annotations
-                    )
-            else:
-                self.assertEqual(expected_spans, actual_spans)
+            self.assertEqual(expected_spans, actual_spans)

exporter/opentelemetry-exporter-zipkin/setup.cfg

@@ -28,15 +28,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Typing :: Typed
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace:

opentelemetry-api/setup.cfg

@@ -28,15 +28,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Typing :: Typed
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir=
     =src
 packages=find_namespace: