Merge branch 'master' into webb/asgi/double-mount-prefix

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,18 +1,9 @@
-pip
 pytest>=6.0.0
-tomli;python_version<"3.11"  # Only needed for pytest on Python < 3.11
 pytest-cov
+dataclasses; python_version < "3.7"
 pytest-forked
-pytest-localserver
-pytest-timeout
-pytest-watch
-jsonschema
 executing
 asttokens
 responses
-pysocks
-socksio
-httpcore[http2]
 setuptools
-Brotli
 docker

docs/_static/logo-light.svg

@@ -108,8 +108,8 @@
                 "djangorestframework",
                 "pytest-django",
                 "Werkzeug",
+                "channels[daphne]",
             ],
-            ">=2.0": ["channels[daphne]"],
             ">=2.2,<3.1": ["six"],
             ">=3.0": ["pytest-asyncio"],
             "<3.3": [

docs/conf.py

@@ -202,10 +202,13 @@ def fetch_package_dependencies(
     python_version: ThreadedVersion,
 ) -> dict:
     """Fetch package dependencies metadata from cache or, failing that, PyPI."""
+    target = TEST_SUITE_CONFIG[integration]["package"]
     constraints = _get_dependency_probe_constraints(
         integration, version, python_version
     )
-    constraints_hash = hashlib.md5("\n".join(constraints).encode("utf-8")).hexdigest()
+    constraints_hash = hashlib.md5(
+        "\n".join([target, *constraints]).encode("utf-8")
+    ).hexdigest()
     package_dependencies = _fetch_package_dependencies_from_cache(
         package, version, python_version, constraints_hash
     )
@@ -226,7 +229,7 @@ def fetch_package_dependencies(
         "-m",
         "pip",
         "install",
-        f"{package}=={version}",
+        f"{target}=={version}",
         "--only-binary",
         "grpcio-tools",  # Prevent source builds that hang CI. grpcio-tools is a build-time dependency pinned by apache-beam.
         "--dry-run",