Skip to content

Commit 492f104

Browse files
committed
Add support for Python 3.12
Fixes #2548
1 parent da75015 commit 492f104

File tree

6 files changed

+73
-69
lines changed

6 files changed

+73
-69
lines changed

.github/workflows/instrumentations_0.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ jobs:
1616
py39: 3.9
1717
py310: "3.10"
1818
py311: "3.11"
19+
py311: "3.12"
1920
pypy3: pypy-3.8
2021
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
2122
runs-on: ${{ matrix.os }}
2223
strategy:
2324
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
2425
matrix:
25-
python-version: [py38, py39, py310, py311, pypy3]
26+
python-version: [py38, py39, py310, py311, py312, pypy3]
2627
package:
2728
# Do not add more instrumentations here, add them in instrumentations_1.yml.
2829
# The reason for this separation of instrumentations into more than one YAML file is

.github/workflows/instrumentations_1.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ jobs:
1616
py39: 3.9
1717
py310: "3.10"
1818
py311: "3.11"
19+
py312: "3.12"
1920
pypy3: pypy-3.8
2021
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
2122
runs-on: ${{ matrix.os }}
2223
strategy:
2324
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
2425
matrix:
25-
python-version: [py38, py39, py310, py311, pypy3]
26+
python-version: [py38, py39, py310, py311, py312, pypy3]
2627
package:
2728
- "urllib"
2829
- "urllib3"

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
1010

1111
jobs:
12-
lint-3_11:
12+
lint-3_12:
1313
strategy:
1414
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
1515
matrix:
@@ -75,10 +75,10 @@ jobs:
7575
steps:
7676
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
7777
uses: actions/checkout@v4
78-
- name: Set up Python 3.11
78+
- name: Set up Python 3.12
7979
uses: actions/setup-python@v5
8080
with:
81-
python-version: 3.11
81+
python-version: 3.12
8282
- name: Install tox
8383
run: pip install tox
8484
- name: Cache tox environment

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2222

2323
### Added
2424

25+
- Add support for Python 3.12
26+
([#2425](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2425))
2527
- `opentelemetry-sdk-extension-aws` Register AWS resource detectors under the
2628
`opentelemetry_resource_detector` entry point
2729
([#2382](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2382))

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ You can run `tox` with the following arguments:
5959
- `tox` to run all existing tox commands, including unit tests for all packages
6060
under multiple Python versions
6161
- `tox -e docs` to regenerate the API docs
62-
- `tox -e py311-test-instrumentation-aiopg` to e.g. run the aiopg instrumentation unit tests under a specific
62+
- `tox -e py312-test-instrumentation-aiopg` to e.g. run the aiopg instrumentation unit tests under a specific
6363
Python version
6464
- `tox -e spellcheck` to run a spellcheck on all the code
6565
- `tox -e lint-some-package` to run lint checks on `some-package`

0 commit comments

Comments
 (0)