Skip to content

Commit 7a9cb56

Browse files
author
Buck Evan
authored
chore: import getsentry override reqs (#60034)
context: * #60009 ``` Anton Pirker [2 days ago](https://sentry.slack.com/archives/CUHS29QJ0/p1699876762219409) Can someone help me bump the Sentry Python SDK version in sentry and getsentry? I have a [PR for bumping the SDK in ](#59837 but it fails because there is an error in the getsentry tests: ERROR: Cannot install sentry-sdk 1.31.0 (from https://github.com/getsentry/sentry-python/archive/1b445c61d1e263ccd04d823307b3a03a6945dc8a.zip) and sentry-sdk==1.35.0 because these package versions have conflicting dependencies. The conflict is caused by: The user requested sentry-sdk 1.31.0 (from https://github.com/getsentry/sentry-python/archive/1b445c61d1e263ccd04d823307b3a03a6945dc8a.zip) The user requested sentry-sdk==1.35.0 So I created a [PR in ](https://github.com/getsentry/getsentry/pull/12056)getsentry to get rid of 1b445c61d1e263ccd04d823307b3a03a6945dc8a.zip (because the code is now in the new python sdk that is released publicly). I called bin/bump-sentry --no-skip fb0547a in getsentry (with the SHA being the one from my branch in sentry. But the PR has a conflict in the file sentry-version (where my SHA from bin/bump-sentry is). In what order do I need to do things so all the checks pass? Anthony Sottile [3 hours ago](https://sentry.slack.com/archives/CUHS29QJ0/p1700065627109659?thread_ts=1699876762.219409&cid=CUHS29QJ0) yeah I think that this isn't going to work without refactoring the dependency setup -- I think there was an unwritten assumption that forked packages in getsentry will always remain compatible and that just isn't true here due to metrics being a big feature added in the fork. (and undoing that isn't safe either because there's code depending on the metrics functionality in the fork being there implicitly) :S ```
1 parent c979bc1 commit 7a9cb56

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ repos:
5252
entry: python -m tools.lint_requirements
5353
language: python
5454
files: requirements-.*\.txt$
55+
# exclude the overrides file from this linter -- it doesn't apply at all
56+
exclude: ^requirements-getsentry-overrides\.txt$
5557
additional_dependencies: [packaging==21.3]
5658
- id: check-mypy-bypass
5759
name: do not bypass the type checker

requirements-getsentry-overrides.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# getsentry requirements overrides
2+
#
3+
# getsentry-specific dependencies now live in `sentry` in `requirements-getsentry.txt`
4+
#
5+
# this file is for listing in-development git archive overrides for sentry libraries
6+
#
7+
# the format is:
8+
# # comment explaining what you're doing
9+
# library-name @ https://github.com/getsentry/<repo>/archive/<40 char sha>.zip
10+
11+
12+
# This overrides our sentry-python version to use a version with
13+
# configurable gzip compression
14+
sentry-sdk @ https://github.com/getsentry/sentry-python/archive/1b445c61d1e263ccd04d823307b3a03a6945dc8a.zip

0 commit comments

Comments
 (0)