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

Add 3.12 to tox #3616

Merged
merged 6 commits into from
Jun 7, 2024
Merged

Add 3.12 to tox #3616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
85de479
Add 3.12 to tox
jeremydvoss Jan 5, 2024
069458b
Add 3.12 to tox
jeremydvoss Jan 5, 2024
865044f
changelog
jeremydvoss Jan 5, 2024
2301f62
Add missing references for 3.12
ocelotl May 15, 2024
e919fdb
Merge branch 'main' into 3_12
lzchen Jun 7, 2024
dbcc5c7
Merge branch 'main' into 3_12
lzchen Jun 7, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ on:
jobs:
sdk-benchmarks:
env:
py311: "3.11"
py312: "3.12"
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-sdk-${{ matrix.os }}
runs-on: self-hosted
strategy:
# Ensures the entire test matrix is run, even if one permutation fails
fail-fast: false
matrix:
python-version: [py311]
python-version: [py312]
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
os: [ubuntu-20.04, windows-2019]
steps:
- name: Checkout Core Repo @ SHA - ${{ github.sha }}
Expand Down
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 @@ -31,14 +31,15 @@ jobs:
py39: 3.9
py310: "3.10"
py311: "3.11"
py312: "3.12"
pypy3: pypy-3.8
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: [py38, py39, py310, py311, pypy3]
python-version: [py38, py39, py310, py311, py312, pypy3]
package:
- "api"
- "sdk"
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ repos:
rev: 24.3.0
hooks:
- id: black
language_version: python3.11
language_version: python3.12
- repo: https://github.com/pycqa/isort
rev: 5.12.0
hooks:
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 @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

- Add Python 3.12 to tox
([#3616](https://github.com/open-telemetry/opentelemetry-python/pull/3616))

## Version 1.25.0/0.46b0 (2024-05-30)

- Fix class BoundedAttributes to have RLock rather than Lock
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ You can run `tox` with the following arguments:
under multiple Python versions
- `tox -e docs` to regenerate the API docs
- `tox -e opentelemetry-api` and `tox -e opentelemetry-sdk` to run the API and SDK unit tests
- `tox -e py311-opentelemetry-api` to e.g. run the API unit tests under a specific
- `tox -e py312-opentelemetry-api` to e.g. run the API unit tests under a specific
Python version
- `tox -e spellcheck` to run a spellcheck on all the code
- `tox -e lint` to run lint checks on all code
Expand Down
1 change: 1 addition & 0 deletions docs/examples/error_handler/error_handler_0/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"opentelemetry-sdk ~= 1.3",
Expand Down
1 change: 1 addition & 0 deletions docs/examples/error_handler/error_handler_1/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"opentelemetry-sdk ~= 1.3",
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-opencensus/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"opentelemetry-proto == 1.26.0.dev",
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"Deprecated >= 1.2.6",
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"Deprecated >= 1.2.6",
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-otlp/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-prometheus/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"opentelemetry-api ~= 1.12",
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-zipkin-json/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-zipkin/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-api/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-proto/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"protobuf>=3.19, < 5.0",
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-sdk/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-semantic-conventions/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]

dependencies = [
Expand Down
1 change: 1 addition & 0 deletions propagator/opentelemetry-propagator-b3/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions propagator/opentelemetry-propagator-jaeger/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions shim/opentelemetry-opencensus-shim/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions shim/opentelemetry-opentracing-shim/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
dependencies = [
Expand Down
2 changes: 2 additions & 0 deletions tests/opentelemetry-test-utils/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"asgiref ~= 3.0",
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 @@ -5,80 +5,80 @@ skip_missing_interpreters = True
envlist =
; Environments are organized by individual package, allowing
; for specifying supported Python versions per package.
py3{8,9,10,11}-opentelemetry-api
py3{8,9,10,11,12}-opentelemetry-api
pypy3-opentelemetry-api

; The numbers at the end of the environment names
; below mean these dependencies are being used:
; 0: protobuf==3.20.3
; 1: protobuf==4.25.3
py3{8,9,10,11}-opentelemetry-protobuf-{0,1}
py3{8,9,10,11,12}-opentelemetry-protobuf-{0,1}
pypy3-opentelemetry-protobuf-{0,1}

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

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

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

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

py3{8,9,10,11}-opentelemetry-opencensus-shim
py3{8,9,10,11,12}-opentelemetry-opencensus-shim
; opencensus-shim intentionally excluded from pypy3 (grpcio install fails)

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

; The numbers at the end of the environment names
; below mean these dependencies are being used:
; 0: protobuf==3.20.3
; 1: protobuf==4.25.3
py3{8,9,10,11}-opentelemetry-exporter-otlp-proto-common-{0,1}
py3{8,9,10,11,12}-opentelemetry-exporter-otlp-proto-common-{0,1}
pypy3-opentelemetry-exporter-otlp-proto-common-{0,1}

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

; The numbers at the end of the environment names
; below mean these dependencies are being used:
; 0: protobuf==3.20.3
; 1: protobuf==4.25.3
py3{8,9,10,11}-opentelemetry-exporter-otlp-proto-grpc-{0,1}
py3{8,9,10,11,12}-opentelemetry-exporter-otlp-proto-grpc-{0,1}
; intentionally excluded from pypy3

; The numbers at the end of the environment names
; below mean these dependencies are being used:
; 0: protobuf==3.20.3
; 1: protobuf==4.25.3
py3{8,9,10,11}-opentelemetry-exporter-otlp-proto-http-{0,1}
py3{8,9,10,11,12}-opentelemetry-exporter-otlp-proto-http-{0,1}
pypy3-opentelemetry-exporter-otlp-proto-http-{0,1}

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

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

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

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

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

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

py3{8,9,10,11}-opentelemetry-test-utils
py3{8,9,10,11,12}-opentelemetry-test-utils
pypy3-opentelemetry-test-utils

lint
Expand Down