Skip to content

Commit 654946e

Browse files
gruebelgruebel
authored
Merge branch 'main' into improve-baggage
2 parents 853b9fd + dd00ddc commit 654946e

File tree

41 files changed

+91
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+91
-88
lines changed

‎.github/workflows/contrib.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
uses: open-telemetry/opentelemetry-python-contrib/.github/workflows/core_contrib_test_0.yml@main
1212
with:
1313
CORE_REPO_SHA: ${{ github.sha }}
14-
CONTRIB_REPO_SHA: main
14+
CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.32.0.dev-0.53b0.dev

‎.github/workflows/lint_0.yml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
env:
1313
CORE_REPO_SHA: main
14-
CONTRIB_REPO_SHA: main
14+
CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.32.0.dev-0.53b0.dev
1515
PIP_EXISTS_ACTION: w
1616

1717
jobs:
@@ -23,10 +23,10 @@ jobs:
2323
- name: Checkout repo @ SHA - ${{ github.sha }}
2424
uses: actions/checkout@v4
2525

26-
- name: Set up Python 3.12
26+
- name: Set up Python 3.13
2727
uses: actions/setup-python@v5
2828
with:
29-
python-version: "3.12"
29+
python-version: "3.13"
3030

3131
- name: Install tox
3232
run: pip install tox
@@ -41,10 +41,10 @@ jobs:
4141
- name: Checkout repo @ SHA - ${{ github.sha }}
4242
uses: actions/checkout@v4
4343

44-
- name: Set up Python 3.12
44+
- name: Set up Python 3.13
4545
uses: actions/setup-python@v5
4646
with:
47-
python-version: "3.12"
47+
python-version: "3.13"
4848

4949
- name: Install tox
5050
run: pip install tox
@@ -59,10 +59,10 @@ jobs:
5959
- name: Checkout repo @ SHA - ${{ github.sha }}
6060
uses: actions/checkout@v4
6161

62-
- name: Set up Python 3.12
62+
- name: Set up Python 3.13
6363
uses: actions/setup-python@v5
6464
with:
65-
python-version: "3.12"
65+
python-version: "3.13"
6666

6767
- name: Install tox
6868
run: pip install tox
@@ -77,10 +77,10 @@ jobs:
7777
- name: Checkout repo @ SHA - ${{ github.sha }}
7878
uses: actions/checkout@v4
7979

80-
- name: Set up Python 3.12
80+
- name: Set up Python 3.13
8181
uses: actions/setup-python@v5
8282
with:
83-
python-version: "3.12"
83+
python-version: "3.13"
8484

8585
- name: Install tox
8686
run: pip install tox
@@ -95,10 +95,10 @@ jobs:
9595
- name: Checkout repo @ SHA - ${{ github.sha }}
9696
uses: actions/checkout@v4
9797

98-
- name: Set up Python 3.12
98+
- name: Set up Python 3.13
9999
uses: actions/setup-python@v5
100100
with:
101-
python-version: "3.12"
101+
python-version: "3.13"
102102

103103
- name: Install tox
104104
run: pip install tox
@@ -113,10 +113,10 @@ jobs:
113113
- name: Checkout repo @ SHA - ${{ github.sha }}
114114
uses: actions/checkout@v4
115115

116-
- name: Set up Python 3.12
116+
- name: Set up Python 3.13
117117
uses: actions/setup-python@v5
118118
with:
119-
python-version: "3.12"
119+
python-version: "3.13"
120120

121121
- name: Install tox
122122
run: pip install tox
@@ -131,10 +131,10 @@ jobs:
131131
- name: Checkout repo @ SHA - ${{ github.sha }}
132132
uses: actions/checkout@v4
133133

134-
- name: Set up Python 3.12
134+
- name: Set up Python 3.13
135135
uses: actions/setup-python@v5
136136
with:
137-
python-version: "3.12"
137+
python-version: "3.13"
138138

139139
- name: Install tox
140140
run: pip install tox
@@ -149,10 +149,10 @@ jobs:
149149
- name: Checkout repo @ SHA - ${{ github.sha }}
150150
uses: actions/checkout@v4
151151

152-
- name: Set up Python 3.12
152+
- name: Set up Python 3.13
153153
uses: actions/setup-python@v5
154154
with:
155-
python-version: "3.12"
155+
python-version: "3.13"
156156

157157
- name: Install tox
158158
run: pip install tox
@@ -167,10 +167,10 @@ jobs:
167167
- name: Checkout repo @ SHA - ${{ github.sha }}
168168
uses: actions/checkout@v4
169169

170-
- name: Set up Python 3.12
170+
- name: Set up Python 3.13
171171
uses: actions/setup-python@v5
172172
with:
173-
python-version: "3.12"
173+
python-version: "3.13"
174174

175175
- name: Install tox
176176
run: pip install tox
@@ -185,10 +185,10 @@ jobs:
185185
- name: Checkout repo @ SHA - ${{ github.sha }}
186186
uses: actions/checkout@v4
187187

188-
- name: Set up Python 3.12
188+
- name: Set up Python 3.13
189189
uses: actions/setup-python@v5
190190
with:
191-
python-version: "3.12"
191+
python-version: "3.13"
192192

193193
- name: Install tox
194194
run: pip install tox
@@ -203,10 +203,10 @@ jobs:
203203
- name: Checkout repo @ SHA - ${{ github.sha }}
204204
uses: actions/checkout@v4
205205

206-
- name: Set up Python 3.12
206+
- name: Set up Python 3.13
207207
uses: actions/setup-python@v5
208208
with:
209-
python-version: "3.12"
209+
python-version: "3.13"
210210

211211
- name: Install tox
212212
run: pip install tox
@@ -221,10 +221,10 @@ jobs:
221221
- name: Checkout repo @ SHA - ${{ github.sha }}
222222
uses: actions/checkout@v4
223223

224-
- name: Set up Python 3.12
224+
- name: Set up Python 3.13
225225
uses: actions/setup-python@v5
226226
with:
227-
python-version: "3.12"
227+
python-version: "3.13"
228228

229229
- name: Install tox
230230
run: pip install tox
@@ -239,10 +239,10 @@ jobs:
239239
- name: Checkout repo @ SHA - ${{ github.sha }}
240240
uses: actions/checkout@v4
241241

242-
- name: Set up Python 3.12
242+
- name: Set up Python 3.13
243243
uses: actions/setup-python@v5
244244
with:
245-
python-version: "3.12"
245+
python-version: "3.13"
246246

247247
- name: Install tox
248248
run: pip install tox
@@ -257,10 +257,10 @@ jobs:
257257
- name: Checkout repo @ SHA - ${{ github.sha }}
258258
uses: actions/checkout@v4
259259

260-
- name: Set up Python 3.12
260+
- name: Set up Python 3.13
261261
uses: actions/setup-python@v5
262262
with:
263-
python-version: "3.12"
263+
python-version: "3.13"
264264

265265
- name: Install tox
266266
run: pip install tox
@@ -275,10 +275,10 @@ jobs:
275275
- name: Checkout repo @ SHA - ${{ github.sha }}
276276
uses: actions/checkout@v4
277277

278-
- name: Set up Python 3.12
278+
- name: Set up Python 3.13
279279
uses: actions/setup-python@v5
280280
with:
281-
python-version: "3.12"
281+
python-version: "3.13"
282282

283283
- name: Install tox
284284
run: pip install tox
@@ -293,10 +293,10 @@ jobs:
293293
- name: Checkout repo @ SHA - ${{ github.sha }}
294294
uses: actions/checkout@v4
295295

296-
- name: Set up Python 3.12
296+
- name: Set up Python 3.13
297297
uses: actions/setup-python@v5
298298
with:
299-
python-version: "3.12"
299+
python-version: "3.13"
300300

301301
- name: Install tox
302302
run: pip install tox
@@ -311,10 +311,10 @@ jobs:
311311
- name: Checkout repo @ SHA - ${{ github.sha }}
312312
uses: actions/checkout@v4
313313

314-
- name: Set up Python 3.12
314+
- name: Set up Python 3.13
315315
uses: actions/setup-python@v5
316316
with:
317-
python-version: "3.12"
317+
python-version: "3.13"
318318

319319
- name: Install tox
320320
run: pip install tox
@@ -329,10 +329,10 @@ jobs:
329329
- name: Checkout repo @ SHA - ${{ github.sha }}
330330
uses: actions/checkout@v4
331331

332-
- name: Set up Python 3.12
332+
- name: Set up Python 3.13
333333
uses: actions/setup-python@v5
334334
with:
335-
python-version: "3.12"
335+
python-version: "3.13"
336336

337337
- name: Install tox
338338
run: pip install tox
@@ -347,10 +347,10 @@ jobs:
347347
- name: Checkout repo @ SHA - ${{ github.sha }}
348348
uses: actions/checkout@v4
349349

350-
- name: Set up Python 3.12
350+
- name: Set up Python 3.13
351351
uses: actions/setup-python@v5
352352
with:
353-
python-version: "3.12"
353+
python-version: "3.13"
354354

355355
- name: Install tox
356356
run: pip install tox

‎.github/workflows/misc_0.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
env:
1313
CORE_REPO_SHA: main
14-
CONTRIB_REPO_SHA: main
14+
CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.32.0.dev-0.53b0.dev
1515
PIP_EXISTS_ACTION: w
1616

1717
jobs:

‎.github/workflows/templates/lint.yml.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
- name: Checkout repo @ SHA - ${% raw %}{{ github.sha }}{% endraw %}
2525
uses: actions/checkout@v4
2626

27-
- name: Set up Python 3.12
27+
- name: Set up Python 3.13
2828
uses: actions/setup-python@v5
2929
with:
30-
python-version: "3.12"
30+
python-version: "3.13"
3131

3232
- name: Install tox
3333
run: pip install tox

‎.github/workflows/test_0.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
env:
1313
CORE_REPO_SHA: main
14-
CONTRIB_REPO_SHA: main
14+
CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.32.0.dev-0.53b0.dev
1515
PIP_EXISTS_ACTION: w
1616

1717
jobs:

‎.github/workflows/test_1.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
env:
1313
CORE_REPO_SHA: main
14-
CONTRIB_REPO_SHA: main
14+
CONTRIB_REPO_SHA: opentelemetrybot/update-version-to-1.32.0.dev-0.53b0.dev
1515
PIP_EXISTS_ACTION: w
1616

1717
jobs:

‎.pylintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ disable=missing-docstring,
6868
too-few-public-methods, # Might be good to re-enable this later.
6969
too-many-instance-attributes,
7070
too-many-arguments,
71+
too-many-positional-arguments,
7172
duplicate-code,
7273
ungrouped-imports, # Leave this up to isort
7374
wrong-import-order, # Leave this up to isort

‎CHANGELOG.md‎

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

88
## Unreleased
99

10+
## Version 1.31.0/0.52b0 (2025-03-12)
11+
1012
- semantic-conventions: Bump to 1.31.0
1113
([#4471](https://github.com/open-telemetry/opentelemetry-python/pull/4471))
1214
- Add type annotations to context's attach & detach
@@ -34,6 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3436
([#4406](https://github.com/open-telemetry/opentelemetry-python/pull/4406))
3537
- Fix env var error message for TraceLimits/SpanLimits
3638
([#4458](https://github.com/open-telemetry/opentelemetry-python/pull/4458))
39+
- pylint-ci updated python version to 3.13
40+
([#4450](https://github.com/open-telemetry/opentelemetry-python/pull/4450))
3741
- Improve performance of baggage operations
3842
([#4466](https://github.com/open-telemetry/opentelemetry-python/pull/4466))
3943

‎dev-requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pylint==3.2.1
1+
pylint==3.3.4
22
httpretty==1.1.4
33
pyright==1.1.396
44
mypy==1.9.0

‎eachdist.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sortfirst=
1111
exporter/*
1212

1313
[stable]
14-
version=1.31.0.dev
14+
version=1.32.0.dev
1515

1616
packages=
1717
opentelemetry-sdk
@@ -27,7 +27,7 @@ packages=
2727
opentelemetry-api
2828

2929
[prerelease]
30-
version=0.52b0.dev
30+
version=0.53b0.dev
3131

3232
packages=
3333
opentelemetry-opentracing-shim

0 commit comments

Comments
 (0)