Skip to content

Commit d596fe0

Browse files
xrmxxrmx
authored
Merge branch 'main' into dependabot/pip/docs/examples/fork-process-model/flask-uwsgi/jinja2-3.1.6
2 parents bfb921a + 829fcc5 commit d596fe0

File tree

93 files changed

+1923
-436
lines changed

Some content is hidden

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

93 files changed

+1923
-436
lines changed

‎.github/workflows/lint_0.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ jobs:
8888
- name: Run tests
8989
run: tox -e mypyinstalled
9090

91-
pyright:
92-
name: pyright
91+
typecheck:
92+
name: typecheck
9393
runs-on: ubuntu-latest
9494
steps:
9595
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -104,7 +104,7 @@ jobs:
104104
run: pip install tox
105105

106106
- name: Run tests
107-
run: tox -e pyright
107+
run: tox -e typecheck
108108

109109
docs:
110110
name: docs
@@ -236,8 +236,8 @@ jobs:
236236
- name: Check github workflows are up to date
237237
run: git diff --exit-code || (echo 'Generated workflows are out of date, run "tox -e generate-workflows" and commit the changes in this PR.' && exit 1)
238238

239-
ruff:
240-
name: ruff
239+
precommit:
240+
name: precommit
241241
runs-on: ubuntu-latest
242242
steps:
243243
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -252,4 +252,4 @@ jobs:
252252
run: pip install tox
253253

254254
- name: Run tests
255-
run: tox -e ruff
255+
run: tox -e precommit

‎.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

‎.pre-commit-config.yaml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
repos:
2-
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
# Ruff version.
4-
rev: v0.6.9
5-
hooks:
6-
# Run the linter.
7-
- id: ruff
8-
args: ["--fix", "--show-fixes"]
9-
# Run the formatter.
10-
- id: ruff-format
2+
- repo: https://github.com/astral-sh/ruff-pre-commit
3+
# Ruff version.
4+
rev: v0.6.9
5+
hooks:
6+
# Run the linter.
7+
- id: ruff
8+
args: ["--fix", "--show-fixes"]
9+
# Run the formatter.
10+
- id: ruff-format
11+
- repo: https://github.com/astral-sh/uv-pre-commit
12+
# uv version.
13+
rev: 0.6.0
14+
hooks:
15+
- id: uv-lock

‎.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: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
- Fix user agent in OTLP HTTP metrics exporter
11+
([#4475](https://github.com/open-telemetry/opentelemetry-python/pull/4475))
12+
- Improve performance of baggage operations
13+
([#4466](https://github.com/open-telemetry/opentelemetry-python/pull/4466))
14+
- sdk: remove duplicated constant definitions for `environment_variables`
15+
([#4491](https://github.com/open-telemetry/opentelemetry-python/pull/4491))
16+
- api: Revert record `BaseException` change in `trace_api.use_span()`
17+
([#4494](https://github.com/open-telemetry/opentelemetry-python/pull/4494))
18+
19+
## Version 1.31.0/0.52b0 (2025-03-12)
20+
21+
- semantic-conventions: Bump to 1.31.0
22+
([#4471](https://github.com/open-telemetry/opentelemetry-python/pull/4471))
1023
- Add type annotations to context's attach & detach
1124
([#4346](https://github.com/open-telemetry/opentelemetry-python/pull/4346))
1225
- Fix OTLP encoders missing instrumentation scope schema url and attributes
13-
([#4359](https://github.com/open-telemetry/opentelemetry-python/pull/4359))
26+
([#4359](https://github.com/open-telemetry/opentelemetry-python/pull/4359))
1427
- prometheus-exporter: fix labels out of place for data points with different
1528
attribute sets
1629
([#4413](https://github.com/open-telemetry/opentelemetry-python/pull/4413))
@@ -32,6 +45,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3245
([#4406](https://github.com/open-telemetry/opentelemetry-python/pull/4406))
3346
- Fix env var error message for TraceLimits/SpanLimits
3447
([#4458](https://github.com/open-telemetry/opentelemetry-python/pull/4458))
48+
- pylint-ci updated python version to 3.13
49+
([#4450](https://github.com/open-telemetry/opentelemetry-python/pull/4450))
3550

3651
## Version 1.30.0/0.51b0 (2025-02-03)
3752

0 commit comments

Comments
 (0)