Skip to content

Commit de50b27

Browse files
merge master
2 parents 837fbe9 + 2b9c7c1 commit de50b27

26 files changed

Lines changed: 2389 additions & 2996 deletions

docs/_static/.gitkeep

Whitespace-only changes.

docs/_static/logo-dark.svg

Lines changed: 42 additions & 0 deletions
Loading

docs/_static/logo-light.svg

Lines changed: 41 additions & 0 deletions
Loading

docs/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@
9595
# documentation.
9696
#
9797
html_theme_options = {
98+
"light_logo": "_static/logo-light.svg",
99+
"dark_logo": "_static/logo-dark.svg",
98100
"github_url": "https://github.com/getsentry/sentry-python",
99101
}
100102

requirements-testing.txt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
1-
pip
21
pytest>=6.0.0
3-
tomli;python_version<"3.11" # Only needed for pytest on Python < 3.11
42
pytest-cov
3+
dataclasses; python_version < "3.7"
54
pytest-forked
6-
pytest-localserver
7-
pytest-timeout
8-
pytest-watch
9-
jsonschema
105
executing
116
asttokens
127
responses
13-
pysocks
14-
socksio
15-
httpcore[http2]
168
setuptools
17-
Brotli

scripts/populate_tox/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@
108108
"djangorestframework",
109109
"pytest-django",
110110
"Werkzeug",
111+
"channels[daphne]",
111112
],
112-
">=2.0": ["channels[daphne]"],
113113
">=2.2,<3.1": ["six"],
114114
">=3.0": ["pytest-asyncio"],
115115
"<3.3": [

scripts/populate_tox/package_dependencies.jsonl

Lines changed: 46 additions & 87 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)