From e61b9caca22481c80591c7205af2b0f9272c8733 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Wed, 9 Dec 2020 11:07:50 +0100 Subject: [PATCH 1/5] fix: Bump sentry-sdk to git sha --- requirements-base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-base.txt b/requirements-base.txt index 7ced01c4a65e39..d8c74c5d528cf0 100644 --- a/requirements-base.txt +++ b/requirements-base.txt @@ -52,7 +52,7 @@ rfc3339-validator==0.1.2 rfc3986-validator==0.1.1 # [end] jsonschema format validators sentry-relay>=0.8.1,<0.9.0 -sentry-sdk>=0.17.7,<0.18.0 +git+https://github.com/getsentry/sentry-python@c277ed5#egg=sentry-sdk simplejson>=3.11.0,<3.12.0 six>=1.11.0,<1.12.0 sqlparse>=0.2.0,<0.3.0 From faef7ed7556b6d06be683ab16e0acb27b7d40561 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Wed, 9 Dec 2020 11:08:39 +0100 Subject: [PATCH 2/5] revert auto_enabling_integrations --- src/sentry/utils/sdk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sentry/utils/sdk.py b/src/sentry/utils/sdk.py index 68e4da380c097b..15dbd708a7c77d 100644 --- a/src/sentry/utils/sdk.py +++ b/src/sentry/utils/sdk.py @@ -179,6 +179,7 @@ def _capture_anything(self, method_name, *args, **kwargs): sentry_sdk.init( transport=MultiplexingTransport(), + auto_enabling_integrations=False, integrations=[ DjangoIntegration(), CeleryIntegration(), From f558939ef95e91362745f68b14ff5429bdea084e Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Wed, 9 Dec 2020 11:18:08 +0100 Subject: [PATCH 3/5] fix requirements --- requirements-base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-base.txt b/requirements-base.txt index d8c74c5d528cf0..d6a086e4caca56 100644 --- a/requirements-base.txt +++ b/requirements-base.txt @@ -52,7 +52,7 @@ rfc3339-validator==0.1.2 rfc3986-validator==0.1.1 # [end] jsonschema format validators sentry-relay>=0.8.1,<0.9.0 -git+https://github.com/getsentry/sentry-python@c277ed5#egg=sentry-sdk +sentry-sdk @ git+https://github.com/getsentry/sentry-python@c277ed5#egg=sentry-sdk simplejson>=3.11.0,<3.12.0 six>=1.11.0,<1.12.0 sqlparse>=0.2.0,<0.3.0 From 0943fe29c711c5d7f195169301d4fa7ac1b5a200 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Wed, 9 Dec 2020 13:21:43 +0100 Subject: [PATCH 4/5] try to add git to build deps --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index ac8d2d2ccfd94c..57ef43e3ffcf79 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,6 +20,7 @@ RUN set -x \ dirmngr \ gnupg \ wget \ + git \ " \ && apt-get update && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ From c393526a05eee367692761fb168fd0084055e66e Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Wed, 9 Dec 2020 14:20:39 +0100 Subject: [PATCH 5/5] add to right stage --- docker/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 57ef43e3ffcf79..b0d44565e645a7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,7 +20,6 @@ RUN set -x \ dirmngr \ gnupg \ wget \ - git \ " \ && apt-get update && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ @@ -63,6 +62,10 @@ ENV PIP_NO_CACHE_DIR=off \ COPY /dist/requirements.txt /tmp/dist/requirements.txt RUN set -x \ && buildDeps="" \ + # ability to install git dependencies + && buildDeps="$buildDeps \ + git \ + " \ # uwsgi && buildDeps="$buildDeps \ gcc \