Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: adapt sentry tests to 24.8.0 #51

Merged
merged 1 commit into from
Sep 12, 2024
Merged

refactor: adapt sentry tests to 24.8.0 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ venv
.coverage
.vscode/
# Fetched from upstream
requirements-sentry.txt
tests/conftest.py
5 changes: 5 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 3 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions deps/sentry
Open in desktop
Submodule sentry added at 1d52e8
3 changes: 1 addition & 2 deletions oidc/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 []}
)


Expand Down
206 changes: 106 additions & 100 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]>",
Expand All @@ -19,6 +19,9 @@ packages = [
{ include = "oidc" }
]

[tool.black]
extend-exclude = "deps"

[tool.poetry.dependencies]
python = "^3.11"

Expand All @@ -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]
Expand All @@ -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"
Loading