Skip to content

Commit 9acc6f5

Browse files
authored
Update Sentry SDK to support Falcon 3
Signed-off-by: Bradley Reynolds <[email protected]>
1 parent 671f8d5 commit 9acc6f5

File tree

6 files changed

+34
-49
lines changed

6 files changed

+34
-49
lines changed

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@ dynamic = ["version"]
2525

2626
requires-python = ">=3.11"
2727
dependencies = [
28-
# Sentry's Falcon integration relies on api_helpers (falconry/falcon#1902).
2928
"falcon>=3.0.1",
3029
"jsonschema>=4.0",
3130
"protobuf>=3.19",
3231
]
3332

3433
[project.optional-dependencies]
3534
gunicorn = ["gunicorn>=20.1"] # Lowest which supports wsgi_app in config.
36-
sentry = ["sentry-sdk[falcon]>=1.5.4"]
35+
sentry = ["sentry-sdk[falcon]>=1.16.0"] # Minimum of 1.16.0 required for Falcon 3.0 support (getsentry/sentry-python#1733)
3736

3837
[project.urls]
3938
source = "https://github.com/python-discord/snekbox"

requirements/coverage.pip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.11
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
44
#
55
# pip-compile --output-file=requirements/coverage.pip requirements/coverage.in
66
#
7-
coverage[toml]==6.5.0
7+
coverage[toml]==7.2.1
88
# via -r requirements/coverage.in

requirements/lint.pip

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.11
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
44
#
55
# pip-compile --output-file=requirements/lint.pip requirements/lint.in
66
#
77
cfgv==3.3.1
88
# via pre-commit
99
distlib==0.3.6
1010
# via virtualenv
11-
filelock==3.8.0
11+
filelock==3.9.0
1212
# via virtualenv
13-
identify==2.5.8
13+
identify==2.5.20
1414
# via pre-commit
1515
nodeenv==1.7.0
1616
# via pre-commit
17-
platformdirs==2.5.2
17+
platformdirs==3.1.1
1818
# via virtualenv
19-
pre-commit==2.20.0
19+
pre-commit==3.1.1
2020
# via -r requirements/lint.in
2121
pyyaml==6.0
2222
# via pre-commit
23-
toml==0.10.2
24-
# via pre-commit
25-
virtualenv==20.16.6
23+
virtualenv==20.21.0
2624
# via pre-commit
2725

2826
# The following packages are considered to be unsafe in a requirements file:

requirements/pip-tools.pip

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.11
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
44
#
55
# pip-compile --output-file=requirements/pip-tools.pip requirements/pip-tools.in
66
#
7-
build==0.9.0
7+
build==0.10.0
88
# via pip-tools
99
click==8.1.3
1010
# via pip-tools
11-
colorama==0.4.6
12-
# via
13-
# build
14-
# click
15-
packaging==21.3
11+
packaging==23.0
1612
# via build
17-
pep517==0.13.0
18-
# via build
19-
pip-tools==6.9.0
13+
pip-tools==6.12.3
2014
# via -r requirements/pip-tools.in
21-
pyparsing==3.0.9
22-
# via packaging
23-
wheel==0.37.1
15+
pyproject-hooks==1.0.0
16+
# via build
17+
wheel==0.38.4
2418
# via pip-tools
2519

2620
# The following packages are considered to be unsafe in a requirements file:

requirements/requirements.pip

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.11
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
44
#
55
# pip-compile --extra=gunicorn --extra=sentry --output-file=requirements/requirements.pip pyproject.toml
66
#
7-
attrs==22.1.0
7+
attrs==22.2.0
88
# via jsonschema
9-
certifi==2022.9.24
9+
certifi==2022.12.7
1010
# via sentry-sdk
11-
falcon==3.1.0
11+
falcon==3.1.1
1212
# via
1313
# sentry-sdk
1414
# snekbox (pyproject.toml)
1515
gunicorn==20.1.0
1616
# via snekbox (pyproject.toml)
17-
jsonschema==4.16.0
17+
jsonschema==4.17.3
1818
# via snekbox (pyproject.toml)
19-
protobuf==4.21.9
19+
protobuf==4.22.1
2020
# via snekbox (pyproject.toml)
21-
pyrsistent==0.19.1
21+
pyrsistent==0.19.3
2222
# via jsonschema
23-
sentry-sdk[falcon]==1.10.1
23+
sentry-sdk[falcon]==1.16.0
2424
# via snekbox (pyproject.toml)
25-
urllib3==1.26.12
25+
urllib3==1.26.15
2626
# via sentry-sdk
2727

2828
# The following packages are considered to be unsafe in a requirements file:

snekbox/utils/logging.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import logging
22
import os
33
import sys
4-
import warnings
5-
6-
from falcon.util.deprecation import DeprecatedWarning
74

85
__all__ = ("FORMAT", "init_logger", "init_sentry")
96

@@ -24,14 +21,11 @@ def init_logger(debug: bool) -> None:
2421

2522
def init_sentry(version: str) -> None:
2623
"""Initialise the Sentry SDK if it's installed."""
27-
with warnings.catch_warnings():
28-
warnings.filterwarnings("ignore", message=r".*\bapi_helpers\b", category=DeprecatedWarning)
29-
30-
try:
31-
import sentry_sdk
32-
from sentry_sdk.integrations.falcon import FalconIntegration
33-
except ImportError:
34-
return
24+
try:
25+
import sentry_sdk
26+
from sentry_sdk.integrations.falcon import FalconIntegration
27+
except ImportError:
28+
return
3529

3630
sentry_sdk.init(
3731
dsn=os.environ.get("SNEKBOX_SENTRY_DSN", ""),

0 commit comments

Comments
 (0)