From 1eed2bb17de742de4af8e77732de990f19faae4c Mon Sep 17 00:00:00 2001 From: Nejc Habjan Date: Thu, 12 Sep 2024 15:49:51 +0200 Subject: [PATCH] chore(deps): ensure all sentry sources locally --- .gitignore | 1 - .gitmodules | 3 +++ Makefile | 6 +++--- deps/sentry | 1 + poetry.lock | 17 +---------------- pyproject.toml | 1 - 6 files changed, 8 insertions(+), 21 deletions(-) create mode 100644 .gitmodules create mode 160000 deps/sentry diff --git a/.gitignore b/.gitignore index d631ac9..b72117e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,4 @@ venv .coverage .vscode/ # Fetched from upstream -requirements-sentry.txt tests/conftest.py diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..21b12c1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "deps/sentry"] + path = deps/sentry + url = https://github.com/getsentry/sentry.git # 24.8.0 diff --git a/Makefile b/Makefile index f76d770..784e81c 100644 --- a/Makefile +++ b/Makefile @@ -9,9 +9,9 @@ SENTRY_VERSION := 24.8.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 diff --git a/deps/sentry b/deps/sentry new file mode 160000 index 0000000..1d52e8e --- /dev/null +++ b/deps/sentry @@ -0,0 +1 @@ +Subproject commit 1d52e8e0ad95615ba5d7e8c020ad6f65dd03763d diff --git a/poetry.lock b/poetry.lock index de6c551..614e6ad 100644 --- a/poetry.lock +++ b/poetry.lock @@ -487,21 +487,6 @@ urllib3 = ">=1.21.1,<3" socks = ["PySocks (>=1.5.6,!=1.5.7)"] use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] -[[package]] -name = "sentry" -version = "24.8.0" -description = "A realtime logging and aggregation server." -optional = false -python-versions = ">=3.11" -files = [] -develop = false - -[package.source] -type = "git" -url = "https://github.com/getsentry/sentry.git" -reference = "24.8.0" -resolved_reference = "1d52e8e0ad95615ba5d7e8c020ad6f65dd03763d" - [[package]] name = "urllib3" version = "2.2.3" @@ -522,4 +507,4 @@ zstd = ["zstandard (>=0.18.0)"] [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "82a2f19dc3706a39e89582b807de485a3ecb9d1ddbdccd649218dcd9380e6d8c" +content-hash = "20397b28793bdfa3e2f5cb7cb596aaf022b3dfb39ce83f3840aaa13ce4de8a85" diff --git a/pyproject.toml b/pyproject.toml index f4265cf..e663fbc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,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.8.0"} fixtures = "^4.1.0" [tool.isort]