merge master

Author: alexander-alderman-webb

docs/_static/.gitkeep

@@ -95,6 +95,8 @@
 # documentation.
 #
 html_theme_options = {
+    "light_logo": "_static/logo-light.svg",
+    "dark_logo": "_static/logo-dark.svg",
     "github_url": "https://github.com/getsentry/sentry-python",
 }
 

docs/_static/logo-dark.svg

@@ -1,17 +1,16 @@
-pip
 pytest>=6.0.0
-tomli;python_version<"3.11"  # Only needed for pytest on Python < 3.11
 pytest-cov
 pytest-forked
+<<<<<<< HEAD
 pytest-localserver
 pytest-watch
 jsonschema
+=======
+pytest-timeout
+>>>>>>> master
 executing
 asttokens
 responses
-pysocks
-socksio
 httpcore[http2]
 setuptools
-Brotli
 docker

docs/_static/logo-light.svg

@@ -433,7 +433,7 @@
         "deps": {
             "*": ["websockets<11.0", "aiohttp"],
             ">=22": ["sanic-testing"],
-            "py3.6": ["aiocontextvars==0.2.1"],
+            "py3.6": ["aiocontextvars==0.2.1", "dataclasses"],
             "py3.8": ["tracerite<1.1.2"],
         },
         "num_versions": 4,