Skip to content

Commit

Permalink
Add py3.11 to workflow (#2997)
Browse files Browse the repository at this point in the history
* Add py3.11 to workflow

* Update classifiers

* Spacing

* Add CHANGELOG entry

Co-authored-by: Leighton Chen <lechen@microsoft.com>
  • Loading branch information
srikanthccv and lzchen committed Oct 31, 2022
1 parent 370af5f commit 8beae7d
Show file tree
Hide file tree
Showing 23 changed files with 44 additions and 21 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ jobs:
py38: 3.8
py39: 3.9
py310: "3.10"
py311: "3.11"
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: [ py37, py38, py39, py310, pypy3 ]
python-version: [ py37, py38, py39, py310, py311, pypy3 ]
package: ["api", "sdk", "semantic", "getting", "shim", "exporter", "protobuf", "propagator"]
os: [ ubuntu-20.04, windows-2019 ]
steps:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#2976](https://github.com/open-telemetry/opentelemetry-python/pull/2976))
- [exporter/opentelemetry-exporter-otlp-proto-http] Add OTLPMetricExporter
([#2891](https://github.com/open-telemetry/opentelemetry-python/pull/2891))
- Add support for py3.11
([#2997](https://github.com/open-telemetry/opentelemetry-python/pull/2997))
- Fix a bug with exporter retries for with newer versions of the backoff library
([#2980](https://github.com/open-telemetry/opentelemetry-python/pull/2980))

Expand Down
1 change: 1 addition & 0 deletions docs/examples/error_handler/error_handler_0/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
dependencies = [
"opentelemetry-sdk ~= 1.3",
Expand Down
1 change: 1 addition & 0 deletions docs/examples/error_handler/error_handler_1/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
dependencies = [
"opentelemetry-sdk ~= 1.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-jaeger/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-opencensus/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
dependencies = [
"backoff >= 1.10.0, < 2.0.0; python_version<'3.7'",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
dependencies = [
"backoff >= 1.10.0, < 2.0.0; python_version<'3.7'",
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-otlp/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-prometheus/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
dependencies = [
"opentelemetry-api ~= 1.12",
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-zipkin-json/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-zipkin/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-api/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-proto/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
dependencies = [
"protobuf~=3.13",
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-sdk/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-semantic-conventions/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]

[project.optional-dependencies]
Expand Down
1 change: 1 addition & 0 deletions propagator/opentelemetry-propagator-b3/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions propagator/opentelemetry-propagator-jaeger/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions shim/opentelemetry-opentracing-shim/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Typing :: Typed",
]
dependencies = [
Expand Down
40 changes: 20 additions & 20 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,61 +5,61 @@ skip_missing_interpreters = True
envlist =
; Environments are organized by individual package, allowing
; for specifying supported Python versions per package.
py3{7,8,9,10}-opentelemetry-api
py3{7,8,9,10,11}-opentelemetry-api
pypy3-opentelemetry-api

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

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

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

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

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

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

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

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

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

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

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

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

py3{7,8,9,10}-opentelemetry-exporter-prometheus
py3{7,8,9,10,11}-opentelemetry-exporter-prometheus
pypy3-opentelemetry-exporter-prometheus

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

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

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

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

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

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

commands_pre =
; Install without -e to test the actual installation
py3{7,8,9,10}: python -m pip install -U pip setuptools wheel
py3{7,8,9,10,11}: 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/opentelemetry-test-utils
Expand Down

0 comments on commit 8beae7d

Please sign in to comment.