Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding CI testing for python 3.10 #2207

Merged
merged 6 commits into from
Oct 25, 2021
Merged

adding CI testing for python 3.10 #2207

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d8b98e
adding CI testing for python 3.10
Oct 14, 2021
7fc0a29
update changelog
Oct 14, 2021
81235c0
yaml disregards the trailing 0
Oct 14, 2021
999dd11
update tox
Oct 14, 2021
2d1fb9b
fix double import of model_pb2 causing issues
Oct 22, 2021
65cdabf
Merge branch 'main' into codeboten/add-py3.10
Oct 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ jobs:
py37: 3.7
py38: 3.8
py39: 3.9
py310: "3.10"
pypy3: pypy-3.7
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
python-version: [ py36, py37, py38, py39, pypy3 ]
python-version: [ py36, py37, py38, py39, py310, pypy3 ]
package: ["api", "sdk", "semantic", "getting", "shim", "exporter", "protobuf", "propagator"]
os: [ ubuntu-20.04, windows-2019 ]
steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.6.0-0.25b0...HEAD)

- Add support for Python 3.10
([#2207](https://github.com/open-telemetry/opentelemetry-python/pull/2207))

## [1.6.0-0.25b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.0-0.25b0) - 2021-10-13


Expand Down
1 change: 1 addition & 0 deletions docs/examples/error_handler/error_handler_0/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ classifiers =
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
Expand Down
1 change: 1 addition & 0 deletions docs/examples/error_handler/error_handler_1/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ classifiers =
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
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-jaeger/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-opencensus/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
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
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
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
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-otlp/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-zipkin-json/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-zipkin/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-api/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
62 changes: 62 additions & 0 deletions opentelemetry-distro/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Copyright The OpenTelemetry Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
[metadata]
name = opentelemetry-distro
description = OpenTelemetry Python Distro
long_description = file: README.rst
long_description_content_type = text/x-rst
author = OpenTelemetry Authors
author_email = [email protected]
url = https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-distro
platforms = any
license = Apache-2.0
classifiers =
Development Status :: 4 - Beta
Intended Audience :: Developers
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
package_dir=
=src
packages=find_namespace:
zip_safe = False
include_package_data = True
install_requires =
opentelemetry-api ~= 1.3
opentelemetry-instrumentation == 0.24b0
opentelemetry-sdk == 1.5.0

[options.packages.find]
where = src

[options.entry_points]
opentelemetry_distro =
distro = opentelemetry.distro:OpenTelemetryDistro
opentelemetry_configurator =
configurator = opentelemetry.distro:OpenTelemetryConfigurator

[options.extras_require]
test =
otlp =
opentelemetry-exporter-otlp == 1.5.0
1 change: 1 addition & 0 deletions opentelemetry-proto/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
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
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-sdk/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-semantic-conventions/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
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
Expand Down
1 change: 1 addition & 0 deletions propagator/opentelemetry-propagator-b3/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions propagator/opentelemetry-propagator-jaeger/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions shim/opentelemetry-opentracing-shim/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Typing :: Typed

[options]
Expand Down
1 change: 1 addition & 0 deletions tests/util/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ classifiers =
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
Expand Down
38 changes: 19 additions & 19 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,58 @@ skip_missing_interpreters = True
envlist =
; Environments are organized by individual package, allowing
; for specifying supported Python versions per package.
py3{6,7,8,9}-opentelemetry-api
py3{6,7,8,9,10}-opentelemetry-api
pypy3-opentelemetry-api

py3{6,7,8,9}-opentelemetry-protobuf
py3{6,7,8,9,10}-opentelemetry-protobuf
pypy3-opentelemetry-protobuf

py3{6,7,8,9}-opentelemetry-sdk
py3{6,7,8,9,10}-opentelemetry-sdk
pypy3-opentelemetry-sdk

py3{6,7,8,9}-opentelemetry-semantic-conventions
py3{6,7,8,9,10}-opentelemetry-semantic-conventions
pypy3-opentelemetry-semantic-conventions

; docs/getting-started
py3{6,7,8,9}-opentelemetry-getting-started
py3{6,7,8,9,10}-opentelemetry-getting-started
pypy3-opentelemetry-getting-started

py3{6,7,8,9}-opentelemetry-opentracing-shim
py3{6,7,8,9,10}-opentelemetry-opentracing-shim
pypy3-opentelemetry-opentracing-shim

py3{6,7,8,9}-opentelemetry-exporter-jaeger-combined
py3{6,7,8,9,10}-opentelemetry-exporter-jaeger-combined

py3{6,7,8,9}-opentelemetry-exporter-jaeger-proto-grpc
py3{6,7,8,9,10}-opentelemetry-exporter-jaeger-proto-grpc

py3{6,7,8,9}-opentelemetry-exporter-jaeger-thrift
py3{6,7,8,9,10}-opentelemetry-exporter-jaeger-thrift

py3{6,7,8,9}-opentelemetry-exporter-opencensus
py3{6,7,8,9,10}-opentelemetry-exporter-opencensus
; exporter-opencensus intentionally excluded from pypy3

; opentelemetry-exporter-otlp
py3{6,7,8,9}-opentelemetry-exporter-otlp-combined
py3{6,7,8,9,10}-opentelemetry-exporter-otlp-combined
; intentionally excluded from pypy3

py3{6,7,8,9}-opentelemetry-exporter-otlp-proto-grpc
py3{6,7,8,9,10}-opentelemetry-exporter-otlp-proto-grpc
; intentionally excluded from pypy3

py3{6,7,8,9}-opentelemetry-exporter-otlp-proto-http
py3{6,7,8,9,10}-opentelemetry-exporter-otlp-proto-http
pypy3-opentelemetry-exporter-otlp-proto-http

; opentelemetry-exporter-zipkin
py3{6,7,8,9}-opentelemetry-exporter-zipkin-combined
py3{6,7,8,9,10}-opentelemetry-exporter-zipkin-combined
pypy3-opentelemetry-exporter-zipkin-combined

py3{6,7,8,9}-opentelemetry-exporter-zipkin-proto-http
py3{6,7,8,9,10}-opentelemetry-exporter-zipkin-proto-http
pypy3-opentelemetry-exporter-zipkin-proto-http

py3{6,7,8,9}-opentelemetry-exporter-zipkin-json
py3{6,7,8,9,10}-opentelemetry-exporter-zipkin-json
pypy3-opentelemetry-exporter-zipkin-json

py3{6,7,8,9}-opentelemetry-propagator-b3
py3{6,7,8,9,10}-opentelemetry-propagator-b3
pypy3-opentelemetry-propagator-b3

py3{6,7,8,9}-opentelemetry-propagator-jaeger
py3{6,7,8,9,10}-opentelemetry-propagator-jaeger
pypy3-opentelemetry-propagator-jaeger

lint
Expand Down Expand Up @@ -105,7 +105,7 @@ changedir =

commands_pre =
; Install without -e to test the actual installation
py3{6,7,8,9}: python -m pip install -U pip setuptools wheel
py3{6,7,8,9,10}: 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.
opentelemetry: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-semantic-conventions {toxinidir}/opentelemetry-sdk {toxinidir}/tests/util
Expand Down