Merge pull request #51 from siemens/feat/adapt-sentry-24.8.0

refactor: adapt sentry tests to 24.8.0

Author: max-wittig

.gitignore

@@ -8,5 +8,4 @@ venv
 .coverage
 .vscode/
 # Fetched from upstream
-requirements-sentry.txt
 tests/conftest.py

.gitmodules

@@ -0,0 +1,5 @@
+[submodule "deps/sentry"]
+	path = deps/sentry
+	url = https://github.com/getsentry/sentry.git
+	# This is here for renovate
+	branch = 24.8.0

Makefile

@@ -1,5 +1,3 @@
-SENTRY_VERSION := 24.2.0
-
 .PHONY: clean deps
 
 # Upstream no longer tracks its own dependencies in the package as dev extras,
@@ -9,9 +7,9 @@ SENTRY_VERSION := 24.2.0
 # use outside their own tests, but we need their fixtures. We fetch them into
 # our own namespace here.
 deps:
-	curl -L -o requirements-sentry.txt https://github.com/getsentry/sentry/raw/$(SENTRY_VERSION)/requirements-dev-frozen.txt
-	curl -L -o tests/conftest.py https://github.com/getsentry/sentry/raw/$(SENTRY_VERSION)/tests/conftest.py
-	poetry run pip install -r requirements-sentry.txt
+	git submodule update --init
+	poetry run pip install -r deps/sentry/requirements-dev-frozen.txt -e deps/sentry
+	cp -f deps/sentry/tests/conftest.py tests/conftest.py
 
 clean:
 	rm -rf *.egg-info src/*.egg-info

deps/sentry

@@ -70,8 +70,7 @@ def oidc_configure_view(
     else:
         domains = config.get("domains")
     return DeferredResponse(
-        "oidc/configure.html",
-        {"provider_name": ISSUER or "", "domains": domains or []}
+        "oidc/configure.html", {"provider_name": ISSUER or "", "domains": domains or []}
     )
 
 

oidc/views.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sentry-auth-oidc"
-version = "8.1.0"
+version = "9.0.0"
 description = "OpenID Connect authentication provider for Sentry"
 authors = [
     "Max Wittig <[email protected]>",
@@ -19,6 +19,9 @@ packages = [
     { include = "oidc" }
 ]
 
+[tool.black]
+extend-exclude = "deps"
+
 [tool.poetry.dependencies]
 python = "^3.11"
 
@@ -30,7 +33,6 @@ flake8 = "^3.8.4"
 [tool.poetry.group.test.dependencies]
 codecov = "^2.1.12"
 pytest = "^7.1.3"
-sentry = {git = "https://github.com/getsentry/sentry.git", rev = "24.2.0"}
 fixtures = "^4.1.0"
 
 [tool.isort]
@@ -39,6 +41,9 @@ profile = "black"
 [tool.poetry.plugins."sentry.apps"]
 "oidc" = "oidc.apps.Config"
 
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"