Skip to content

Commit 96c03c9

Browse files
committed
Merge branch 'master' into potel-base
2 parents 4b9c432 + f8ec572 commit 96c03c9

13 files changed

+226
-126
lines changed

.flake8

Lines changed: 0 additions & 21 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## 2.24.0
4+
5+
### Various fixes & improvements
6+
7+
- fix(tracing): Fix `InvalidOperation` (#4179) by @szokeasaurusrex
8+
- Fix memory leak by not piling up breadcrumbs forever in Spark workers. (#4167) by @antonpirker
9+
- Update scripts sources (#4166) by @emmanuel-ferdman
10+
- Fixed flaky test (#4165) by @antonpirker
11+
- chore(profiler): Add deprecation warning for session functions (#4171) by @sentrivana
12+
- feat(profiling): reverse profile_session start/stop methods deprecation (#4162) by @viglia
13+
- Reset `DedupeIntegration`'s `last-seen` if `before_send` dropped the event (#4142) by @sentrivana
14+
- style(integrations): Fix captured typo (#4161) by @pimuzzo
15+
- Handle loguru msg levels that are not supported by Sentry (#4147) by @antonpirker
16+
- feat(tests): Update tox.ini (#4146) by @sentrivana
17+
- Support Starlette/FastAPI `app.host` (#4157) by @sentrivana
18+
319
## 2.23.1
420

521
### Various fixes & improvements

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
3434
author = "Sentry Team and Contributors"
3535

36-
release = "2.23.1"
36+
release = "2.24.0"
3737
version = ".".join(release.split(".")[:2]) # The short X.Y version.
3838

3939

mypy.ini

Lines changed: 0 additions & 84 deletions
This file was deleted.

pyproject.toml

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
# Tool: Black
3+
#
4+
15
[tool.black]
26
# 'extend-exclude' excludes files or directories in addition to the defaults
37
extend-exclude = '''
@@ -9,6 +13,11 @@ extend-exclude = '''
913
)
1014
'''
1115

16+
17+
#
18+
# Tool: Coverage
19+
#
20+
1221
[tool.coverage.run]
1322
branch = true
1423
omit = [
@@ -21,3 +30,183 @@ omit = [
2130
exclude_also = [
2231
"if TYPE_CHECKING:",
2332
]
33+
34+
#
35+
# Tool: Pytest
36+
#
37+
38+
[tool.pytest.ini_options]
39+
addopts = "-vvv -rfEs -s --durations=5 --cov=./sentry_sdk --cov-branch --cov-report= --tb=short --junitxml=.junitxml"
40+
asyncio_mode = "strict"
41+
asyncio_default_fixture_loop_scope = "function"
42+
markers = [
43+
"tests_internal_exceptions: Handle internal exceptions just as the SDK does, to test it. (Otherwise internal exceptions are recorded and reraised.)",
44+
]
45+
46+
[tool.pytest-watch]
47+
verbose = true
48+
nobeep = true
49+
50+
#
51+
# Tool: Mypy
52+
#
53+
54+
[tool.mypy]
55+
allow_redefinition = true
56+
check_untyped_defs = true
57+
disallow_any_generics = true
58+
disallow_incomplete_defs = true
59+
disallow_subclassing_any = true
60+
disallow_untyped_decorators = true
61+
disallow_untyped_defs = true
62+
no_implicit_optional = true
63+
python_version = "3.11"
64+
strict_equality = true
65+
strict_optional = true
66+
warn_redundant_casts = true
67+
warn_unused_configs = true
68+
warn_unused_ignores = true
69+
70+
# Relaxations for code written before mypy was introduced
71+
# Do not use wildcards in module paths, otherwise added modules will
72+
# automatically have the same set of relaxed rules as the rest
73+
[[tool.mypy.overrides]]
74+
module = "cohere.*"
75+
ignore_missing_imports = true
76+
77+
[[tool.mypy.overrides]]
78+
module = "django.*"
79+
ignore_missing_imports = true
80+
81+
[[tool.mypy.overrides]]
82+
module = "pyramid.*"
83+
ignore_missing_imports = true
84+
85+
[[tool.mypy.overrides]]
86+
module = "psycopg2.*"
87+
ignore_missing_imports = true
88+
89+
[[tool.mypy.overrides]]
90+
module = "pytest.*"
91+
ignore_missing_imports = true
92+
93+
[[tool.mypy.overrides]]
94+
module = "aiohttp.*"
95+
ignore_missing_imports = true
96+
97+
[[tool.mypy.overrides]]
98+
module = "anthropic.*"
99+
ignore_missing_imports = true
100+
101+
[[tool.mypy.overrides]]
102+
module = "sanic.*"
103+
ignore_missing_imports = true
104+
105+
[[tool.mypy.overrides]]
106+
module = "tornado.*"
107+
ignore_missing_imports = true
108+
109+
[[tool.mypy.overrides]]
110+
module = "fakeredis.*"
111+
ignore_missing_imports = true
112+
113+
[[tool.mypy.overrides]]
114+
module = "rq.*"
115+
ignore_missing_imports = true
116+
117+
[[tool.mypy.overrides]]
118+
module = "pyspark.*"
119+
ignore_missing_imports = true
120+
121+
[[tool.mypy.overrides]]
122+
module = "asgiref.*"
123+
ignore_missing_imports = true
124+
125+
[[tool.mypy.overrides]]
126+
module = "langchain_core.*"
127+
ignore_missing_imports = true
128+
129+
[[tool.mypy.overrides]]
130+
module = "executing.*"
131+
ignore_missing_imports = true
132+
133+
[[tool.mypy.overrides]]
134+
module = "asttokens.*"
135+
ignore_missing_imports = true
136+
137+
[[tool.mypy.overrides]]
138+
module = "pure_eval.*"
139+
ignore_missing_imports = true
140+
141+
[[tool.mypy.overrides]]
142+
module = "blinker.*"
143+
ignore_missing_imports = true
144+
145+
[[tool.mypy.overrides]]
146+
module = "sentry_sdk._queue"
147+
ignore_missing_imports = true
148+
disallow_untyped_defs = false
149+
150+
[[tool.mypy.overrides]]
151+
module = "sentry_sdk._lru_cache"
152+
disallow_untyped_defs = false
153+
154+
[[tool.mypy.overrides]]
155+
module = "celery.app.trace"
156+
ignore_missing_imports = true
157+
158+
[[tool.mypy.overrides]]
159+
module = "flask.signals"
160+
ignore_missing_imports = true
161+
162+
[[tool.mypy.overrides]]
163+
module = "huey.*"
164+
ignore_missing_imports = true
165+
166+
[[tool.mypy.overrides]]
167+
module = "openai.*"
168+
ignore_missing_imports = true
169+
170+
[[tool.mypy.overrides]]
171+
module = "openfeature.*"
172+
ignore_missing_imports = true
173+
174+
[[tool.mypy.overrides]]
175+
module = "huggingface_hub.*"
176+
ignore_missing_imports = true
177+
178+
[[tool.mypy.overrides]]
179+
module = "arq.*"
180+
ignore_missing_imports = true
181+
182+
[[tool.mypy.overrides]]
183+
module = "grpc.*"
184+
ignore_missing_imports = true
185+
186+
#
187+
# Tool: Flake8
188+
#
189+
190+
[tool.flake8]
191+
extend-ignore = [
192+
# Handled by black (Whitespace before ':' -- handled by black)
193+
"E203",
194+
# Handled by black (Line too long)
195+
"E501",
196+
# Sometimes not possible due to execution order (Module level import is not at top of file)
197+
"E402",
198+
# I don't care (Do not assign a lambda expression, use a def)
199+
"E731",
200+
# does not apply to Python 2 (redundant exception types by flake8-bugbear)
201+
"B014",
202+
# I don't care (Lowercase imported as non-lowercase by pep8-naming)
203+
"N812",
204+
# is a worse version of and conflicts with B902 (first argument of a classmethod should be named cls)
205+
"N804",
206+
]
207+
extend-exclude = ["checkouts", "lol*"]
208+
exclude = [
209+
# gRCP generated files
210+
"grpc_test_service_pb2.py",
211+
"grpc_test_service_pb2_grpc.py",
212+
]

pytest.ini

Lines changed: 0 additions & 12 deletions
This file was deleted.

requirements-devenv.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
-r requirements-linting.txt
22
-r requirements-testing.txt
33
mockupdb # required by `pymongo` tests that are enabled by `pymongo` from linter requirements
4-
pytest
4+
pytest>=6.0.0
5+
tomli;python_version<"3.11" # Only needed for pytest on Python < 3.11
56
pytest-asyncio

requirements-linting.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
mypy
22
black
3-
flake8==5.0.4 # flake8 depends on pyflakes>=3.0.0 and this dropped support for Python 2 "# type:" comments
3+
flake8==5.0.4
4+
flake8-pyproject # Flake8 plugin to support configuration in pyproject.toml
5+
flake8-bugbear # Flake8 plugin
6+
pep8-naming # Flake8 plugin
47
types-certifi
58
types-protobuf
69
types-gevent
@@ -11,8 +14,6 @@ types-webob
1114
opentelemetry-distro
1215
pymongo # There is no separate types module.
1316
loguru # There is no separate types module.
14-
flake8-bugbear
15-
pep8-naming
1617
pre-commit # local linting
1718
httpcore
1819
launchdarkly-server-sdk

requirements-testing.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
pip
2-
pytest
2+
pytest>=6.0.0
3+
tomli;python_version<"3.11" # Only needed for pytest on Python < 3.11
34
pytest-cov
45
pytest-forked
56
pytest-localserver

sentry_sdk/consts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,4 +947,4 @@ def _get_default_options():
947947
del _get_default_options
948948

949949

950-
VERSION = "2.23.1"
950+
VERSION = "2.24.0"

0 commit comments

Comments
 (0)