From 6368669aa501460de8b06f1289e69c25b2a98bb5 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 15 Aug 2016 12:28:49 -0700 Subject: [PATCH 01/31] try sentry-auth-google --- requirements.in | 1 + requirements.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/requirements.in b/requirements.in index 0a6ac6d..983cb39 100644 --- a/requirements.in +++ b/requirements.in @@ -6,4 +6,5 @@ django-storages ndg-httpsclient # required by requests psycopg2 sentry +sentry-auth-google sentry-github diff --git a/requirements.txt b/requirements.txt index 456a2e5..62e7fb4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -71,6 +71,7 @@ redis==2.10.5 # via rb, sentry requests[security]==2.10.0 # via sentry selenium==2.53.6 # via sentry sentry-github==0.1.2 +sentry-auth-google==0.1.0 sentry==8.6.0 setproctitle==1.1.10 # via sentry simplejson==3.8.2 # via sentry From e266202e0ff70d510d9cc2d98f3be1ca8ea52c2d Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 15 Aug 2016 12:34:35 -0700 Subject: [PATCH 02/31] try integrating with github too --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 62e7fb4..1826741 100644 --- a/requirements.txt +++ b/requirements.txt @@ -72,6 +72,7 @@ requests[security]==2.10.0 # via sentry selenium==2.53.6 # via sentry sentry-github==0.1.2 sentry-auth-google==0.1.0 +sentry-auth-github==0.1.0 sentry==8.6.0 setproctitle==1.1.10 # via sentry simplejson==3.8.2 # via sentry From 831a55a199a30cde233cda4eab77e05fc767a7e0 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 15 Aug 2016 12:39:06 -0700 Subject: [PATCH 03/31] remove sentry-auth-github --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1826741..62e7fb4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -72,7 +72,6 @@ requests[security]==2.10.0 # via sentry selenium==2.53.6 # via sentry sentry-github==0.1.2 sentry-auth-google==0.1.0 -sentry-auth-github==0.1.0 sentry==8.6.0 setproctitle==1.1.10 # via sentry simplejson==3.8.2 # via sentry From 9435a62fc5d7a8be2391b885e88d573ca3817cf8 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 15 Aug 2016 12:44:36 -0700 Subject: [PATCH 04/31] try setting the constant this way --- sentry.conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sentry.conf.py b/sentry.conf.py index 0de01a2..cc9fca8 100644 --- a/sentry.conf.py +++ b/sentry.conf.py @@ -246,8 +246,8 @@ FACEBOOK_APP_ID = os.environ.get('FACEBOOK_APP_ID') FACEBOOK_API_SECRET = os.environ.get('FACEBOOK_API_SECRET') -GOOGLE_OAUTH2_CLIENT_ID = os.environ.get('GOOGLE_OAUTH2_CLIENT_ID') -GOOGLE_OAUTH2_CLIENT_SECRET = os.environ.get('GOOGLE_OAUTH2_CLIENT_SECRET') +GOOGLE_CLIENT_ID = os.environ.get('GOOGLE_OAUTH2_CLIENT_ID') +GOOGLE_CLIENT_SECRET = os.environ.get('GOOGLE_OAUTH2_CLIENT_SECRET') GITHUB_APP_ID = os.environ.get('GITHUB_APP_ID') GITHUB_API_SECRET = os.environ.get('GITHUB_API_SECRET') From bd84cc2991b3bcf7c3ea0111c4447c53fcbf87ee Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 15 Aug 2016 13:52:03 -0700 Subject: [PATCH 05/31] use the right env vars --- sentry.conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sentry.conf.py b/sentry.conf.py index cc9fca8..9d6f2a2 100644 --- a/sentry.conf.py +++ b/sentry.conf.py @@ -246,8 +246,8 @@ FACEBOOK_APP_ID = os.environ.get('FACEBOOK_APP_ID') FACEBOOK_API_SECRET = os.environ.get('FACEBOOK_API_SECRET') -GOOGLE_CLIENT_ID = os.environ.get('GOOGLE_OAUTH2_CLIENT_ID') -GOOGLE_CLIENT_SECRET = os.environ.get('GOOGLE_OAUTH2_CLIENT_SECRET') +GOOGLE_CLIENT_ID = os.environ.get('GOOGLE_CLIENT_ID') +GOOGLE_CLIENT_SECRET = os.environ.get('GOOGLE_CLIENT_SECRET') GITHUB_APP_ID = os.environ.get('GITHUB_APP_ID') GITHUB_API_SECRET = os.environ.get('GITHUB_API_SECRET') From f794f556d13bb70b2be8caa6915124fde55035a1 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 15 Aug 2016 14:53:13 -0700 Subject: [PATCH 06/31] try updating to 8.7.0 --- requirements.in | 2 +- requirements.txt | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/requirements.in b/requirements.in index 983cb39..74677bc 100644 --- a/requirements.in +++ b/requirements.in @@ -5,6 +5,6 @@ django-secure django-storages ndg-httpsclient # required by requests psycopg2 -sentry +sentry==8.7.0 sentry-auth-google sentry-github diff --git a/requirements.txt b/requirements.txt index 62e7fb4..9038021 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ # # pip-compile --output-file requirements.txt requirements.in # - amqp==1.4.9 # via kombu anyjson==0.3.3 # via kombu BeautifulSoup==3.2.1 # via sentry @@ -29,7 +28,7 @@ django-recaptcha==1.0.5 # via sentry django-secure==1.0.1 django-social-auth==0.7.28 # via sentry django-storages==1.4.1 -django-sudo==2.0.1 # via sentry +django-sudo==2.1.0 # via sentry django-templatetag-sugar==1.0 # via django-paging, sentry Django==1.6.11 # via django-bitfield, django-debug-toolbar, django-recaptcha, django-secure, django-social-auth, sentry djangorestframework==2.3.14 # via sentry @@ -57,7 +56,8 @@ pyasn1==0.1.9 # via cryptography, requests pycparser==2.14 # via cffi PyOpenSSL==16.0.0 # via ndg-httpsclient, requests pytest-django==2.9.1 # via sentry -pytest==2.6.4 # via pytest-django, sentry +pytest-html==1.9.0 # via sentry +pytest==2.6.4 # via pytest-django, pytest-html, sentry python-dateutil==2.5.3 # via sentry python-memcached==1.58 # via sentry python-openid==2.2.5 # via django-social-auth @@ -70,9 +70,9 @@ rb==1.5 # via sentry redis==2.10.5 # via rb, sentry requests[security]==2.10.0 # via sentry selenium==2.53.6 # via sentry -sentry-github==0.1.2 sentry-auth-google==0.1.0 -sentry==8.6.0 +sentry-github==0.1.2 +sentry==8.7.0 setproctitle==1.1.10 # via sentry simplejson==3.8.2 # via sentry six==1.10.0 # via cryptography, django-bitfield, pyopenssl, python-dateutil, python-memcached, qrcode, sentry, structlog @@ -85,6 +85,5 @@ ua-parser==0.7.1 # via sentry urllib3==1.16 # via sentry uwsgi==2.0.13.1 # via sentry -# The following packages are commented out because they are -# considered to be unsafe in a requirements file: +# The following packages are considered to be unsafe in a requirements file: # setuptools # via cryptography From c1c9af7ee8fe678638273ef3a56ee9bf3448cd78 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 15 Aug 2016 16:51:50 -0700 Subject: [PATCH 07/31] console logging implies this is what i should be doing now --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index e9551f9..338233b 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,3 @@ web: uwsgi --ini=uwsgi.ini --http=0.0.0.0:$PORT worker: sentry --config=sentry.conf.py celery worker --loglevel=INFO -beat: sentry --config=sentry.conf.py celery beat --loglevel=INFO +beat: sentry --config=sentry.conf.py run cron --loglevel=INFO From c3474c6c7ccd6b1c25693b662debe6ec8f7605bf Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 15 Aug 2016 16:54:39 -0700 Subject: [PATCH 08/31] more updated behavior the logs taught me --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 338233b..171ae71 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,3 @@ web: uwsgi --ini=uwsgi.ini --http=0.0.0.0:$PORT -worker: sentry --config=sentry.conf.py celery worker --loglevel=INFO +worker: sentry --config=sentry.conf.py run worker --loglevel=INFO beat: sentry --config=sentry.conf.py run cron --loglevel=INFO From 360f5acd20005406c67f4d70906e8cbd42ab380b Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 22 Aug 2016 20:56:05 -0700 Subject: [PATCH 09/31] add a travis yaml file --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..496bbdd --- /dev/null +++ b/.travis.yml @@ -0,0 +1,2 @@ +sudo: false +script: python -m py_compile sentry.conf.py From 5fd1699b03fa3100ff7473419dfb4c8b4ef8f15a Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 22 Aug 2016 21:01:22 -0700 Subject: [PATCH 10/31] run pip install --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 496bbdd..f175de8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,3 @@ sudo: false +install: "pip install -r requirements.txt" script: python -m py_compile sentry.conf.py From 9b817d38eb703668c2e6e44a296804b9431e23e9 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 22 Aug 2016 21:06:14 -0700 Subject: [PATCH 11/31] see if i can install with sudo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f175de8..0b2c892 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ -sudo: false +sudo: true install: "pip install -r requirements.txt" script: python -m py_compile sentry.conf.py From 637d906ae217c6a873fb7458d6b3f46a12ef5995 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 22 Aug 2016 21:11:15 -0700 Subject: [PATCH 12/31] try installing to the travis users directory --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b2c892..fff3414 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ -sudo: true -install: "pip install -r requirements.txt" +sudo: false +install: "pip install -r requirements.txt --user travis" script: python -m py_compile sentry.conf.py From 5f0725bb5f1f3b2828ba92cd187f0b8608adfacc Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 5 Dec 2016 20:33:26 -0800 Subject: [PATCH 13/31] add update script from inside the dyno --- bin/update | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 bin/update diff --git a/bin/update b/bin/update new file mode 100755 index 0000000..7bce282 --- /dev/null +++ b/bin/update @@ -0,0 +1,8 @@ +#!/bin/sh -e + +version="$1" + +pip install --upgrade pip +pip install pip-tools +sed 's/8.7.0/$1/g' requirements.in +pip-compile --output-file requirements.txt requirements.in From ecff539cd804c3efcfdc7c2592292aa9719c675b Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 5 Dec 2016 20:34:47 -0800 Subject: [PATCH 14/31] maybe? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fff3414..b7e6914 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ sudo: false -install: "pip install -r requirements.txt --user travis" +install: "pip install --upgrade pip; pip install -r requirements.txt --user travis" script: python -m py_compile sentry.conf.py From 2c08f4c4e655643c4b7dbcc33c24b0d95e1443f2 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 5 Dec 2016 20:37:22 -0800 Subject: [PATCH 15/31] try separate lines --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b7e6914..110fe6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ sudo: false -install: "pip install --upgrade pip; pip install -r requirements.txt --user travis" script: python -m py_compile sentry.conf.py +install: + - pip install --upgrade pip + - pip install -r requirements.txt --user travis From 896c41ca544760b892e4390027a961e262bdab05 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 5 Dec 2016 20:38:25 -0800 Subject: [PATCH 16/31] try specifying languages --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 110fe6e..ef446d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +language: python +python: "2.7" sudo: false script: python -m py_compile sentry.conf.py install: From 0c3913f32a1aacd5d1821b2f5e33b4383d24fed3 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 5 Dec 2016 20:40:37 -0800 Subject: [PATCH 17/31] don't specify a user --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ef446d6..944fd27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ sudo: false script: python -m py_compile sentry.conf.py install: - pip install --upgrade pip - - pip install -r requirements.txt --user travis + - pip install -r requirements.txt From 131ed41931b0bcf1d9ab1b3deffb66ee39c32f5d Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 5 Dec 2016 20:55:34 -0800 Subject: [PATCH 18/31] try packaging again --- bin/update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/update b/bin/update index 7bce282..8959c06 100755 --- a/bin/update +++ b/bin/update @@ -4,5 +4,5 @@ version="$1" pip install --upgrade pip pip install pip-tools -sed 's/8.7.0/$1/g' requirements.in +sed -i 's/8.7.0/$1/g' requirements.in pip-compile --output-file requirements.txt requirements.in From 3c108397e10e21ac4fa29b380e0ed214a1b4acc2 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 5 Dec 2016 20:58:26 -0800 Subject: [PATCH 19/31] disable email notifications --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 944fd27..113e7ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,5 @@ script: python -m py_compile sentry.conf.py install: - pip install --upgrade pip - pip install -r requirements.txt +notifications: + email: false From f86fe96c18c73cb90969840a10f16f15bf54e73e Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 5 Dec 2016 21:07:36 -0800 Subject: [PATCH 20/31] i can't sed apparently --- bin/update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/update b/bin/update index 8959c06..cc7f8eb 100755 --- a/bin/update +++ b/bin/update @@ -4,5 +4,5 @@ version="$1" pip install --upgrade pip pip install pip-tools -sed -i 's/8.7.0/$1/g' requirements.in +sed -i 's/8.7.0/8.11.0/g' requirements.in pip-compile --output-file requirements.txt requirements.in From 1280b64f0efdf42967f4b08c6348a02faaebcd29 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 5 Dec 2016 21:17:11 -0800 Subject: [PATCH 21/31] update versions of sentry too --- requirements.in | 2 +- requirements.txt | 51 ++++++++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/requirements.in b/requirements.in index 74677bc..e99a986 100644 --- a/requirements.in +++ b/requirements.in @@ -5,6 +5,6 @@ django-secure django-storages ndg-httpsclient # required by requests psycopg2 -sentry==8.7.0 +sentry==8.11.0 sentry-auth-google sentry-github diff --git a/requirements.txt b/requirements.txt index 9038021..02356bb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,11 +6,12 @@ # amqp==1.4.9 # via kombu anyjson==0.3.3 # via kombu -BeautifulSoup==3.2.1 # via sentry billiard==3.3.0.23 # via celery +boto3==1.4.2 # via sentry boto==2.42.0 +botocore==1.4.82 # via boto3, s3transfer celery==3.1.18 # via sentry -cffi==1.7.0 # via cryptography +cffi==1.7.0 # via cryptography, libsourcemap, symsynd click==6.6 # via sentry contextlib2==0.5.3 # via raven cryptography==1.4 # via pyopenssl, python-u2flib-server @@ -22,65 +23,69 @@ django-bitfield==1.7.1 # via sentry django-crispy-forms==1.4.0 # via sentry django-debug-toolbar==1.3.2 # via sentry django-jsonfield==0.9.13 # via sentry -django-paging==0.2.5 # via sentry django-picklefield==0.3.2 # via sentry -django-recaptcha==1.0.5 # via sentry django-secure==1.0.1 -django-social-auth==0.7.28 # via sentry django-storages==1.4.1 django-sudo==2.1.0 # via sentry -django-templatetag-sugar==1.0 # via django-paging, sentry -Django==1.6.11 # via django-bitfield, django-debug-toolbar, django-recaptcha, django-secure, django-social-auth, sentry +django-templatetag-sugar==1.0 # via sentry +django==1.6.11 # via django-bitfield, django-debug-toolbar, django-secure, sentry djangorestframework==2.3.14 # via sentry +docutils==0.12 # via botocore email-reply-parser==0.2.0 # via sentry enum34==1.1.6 # via cryptography, python-u2flib-server, sentry exam==0.10.6 # via sentry +futures==3.0.5 # via s3transfer hiredis==0.1.6 # via sentry honcho==0.7.1 # via sentry httplib2==0.9.2 # via oauth2 idna==2.1 # via cryptography -ipaddr==2.1.11 # via sentry -ipaddress==1.0.16 # via cryptography +ipaddress==1.0.16 # via cryptography, sentry +jmespath==0.9.0 # via boto3, botocore kombu==3.0.35 # via celery, sentry +libsourcemap==0.5.0 # via sentry lxml==3.6.1 # via sentry, toronado mock==1.0.1 # via exam, sentry ndg-httpsclient==0.4.2 -oauth2==1.9.0.post1 # via django-social-auth +oauth2==1.9.0.post1 # via sentry +percy==0.4.1 # via sentry petname==1.7 # via sentry -Pillow==3.2.0 # via sentry -progressbar==2.3 # via sentry +pillow==3.2.0 # via sentry +progressbar2==3.10.1 # via sentry psycopg2==2.6.2 py-bcrypt==0.4 # via django-bcrypt py==1.4.31 # via pytest pyasn1==0.1.9 # via cryptography, requests pycparser==2.14 # via cffi -PyOpenSSL==16.0.0 # via ndg-httpsclient, requests +pyopenssl==16.0.0 # via ndg-httpsclient, requests pytest-django==2.9.1 # via sentry pytest-html==1.9.0 # via sentry pytest==2.6.4 # via pytest-django, pytest-html, sentry -python-dateutil==2.5.3 # via sentry +python-dateutil==2.5.3 # via botocore, sentry python-memcached==1.58 # via sentry -python-openid==2.2.5 # via django-social-auth +python-openid==2.2.5 # via sentry python-u2flib-server==4.0.1 # via sentry +python-utils==2.0.0 # via progressbar2 pytz==2016.6.1 # via celery -PyYAML==3.11 # via sentry +pyyaml==3.11 # via sentry qrcode==5.3 # via sentry -raven==5.23.0 # via sentry -rb==1.5 # via sentry +raven==5.32.0 # via sentry +rb==1.6 # via sentry redis==2.10.5 # via rb, sentry -requests[security]==2.10.0 # via sentry -selenium==2.53.6 # via sentry +requests[security]==2.10.0 # via percy, sentry +s3transfer==0.1.9 # via boto3 +selenium==3.0.0b3 # via sentry sentry-auth-google==0.1.0 sentry-github==0.1.2 -sentry==8.7.0 +sentry==8.11.0 setproctitle==1.1.10 # via sentry simplejson==3.8.2 # via sentry -six==1.10.0 # via cryptography, django-bitfield, pyopenssl, python-dateutil, python-memcached, qrcode, sentry, structlog +six==1.10.0 # via cryptography, django-bitfield, pyopenssl, python-dateutil, python-memcached, python-utils, qrcode, sentry, structlog South==1.0.1 # via sentry sqlparse==0.2.0 # via django-debug-toolbar statsd==3.1 # via sentry structlog==16.1.0 # via sentry -toronado==0.0.10 # via sentry +symsynd==1.3.0 # via sentry +toronado==0.0.11 # via sentry ua-parser==0.7.1 # via sentry urllib3==1.16 # via sentry uwsgi==2.0.13.1 # via sentry From c189340ed9cd03e7fd7e77cc3ba794ac949e55ac Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 5 Dec 2016 22:09:13 -0800 Subject: [PATCH 22/31] try adding it back explicitly --- requirements.in | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.in b/requirements.in index e99a986..4c2cbcf 100644 --- a/requirements.in +++ b/requirements.in @@ -2,6 +2,7 @@ boto dj-database-url django-bcrypt django-secure +django-social-auth django-storages ndg-httpsclient # required by requests psycopg2 From 6e3e48b0713d724d95197f3a6a5f266ca2c1e4ac Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Mon, 5 Dec 2016 22:17:00 -0800 Subject: [PATCH 23/31] see if adding back old deps fixes things --- requirements.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 02356bb..6828985 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,10 +25,11 @@ django-debug-toolbar==1.3.2 # via sentry django-jsonfield==0.9.13 # via sentry django-picklefield==0.3.2 # via sentry django-secure==1.0.1 +django-social-auth==0.7.28 django-storages==1.4.1 django-sudo==2.1.0 # via sentry django-templatetag-sugar==1.0 # via sentry -django==1.6.11 # via django-bitfield, django-debug-toolbar, django-secure, sentry +django==1.6.11 # via django-bitfield, django-debug-toolbar, django-secure, django-social-auth, sentry djangorestframework==2.3.14 # via sentry docutils==0.12 # via botocore email-reply-parser==0.2.0 # via sentry @@ -46,7 +47,7 @@ libsourcemap==0.5.0 # via sentry lxml==3.6.1 # via sentry, toronado mock==1.0.1 # via exam, sentry ndg-httpsclient==0.4.2 -oauth2==1.9.0.post1 # via sentry +oauth2==1.9.0.post1 # via django-social-auth, sentry percy==0.4.1 # via sentry petname==1.7 # via sentry pillow==3.2.0 # via sentry @@ -62,7 +63,7 @@ pytest-html==1.9.0 # via sentry pytest==2.6.4 # via pytest-django, pytest-html, sentry python-dateutil==2.5.3 # via botocore, sentry python-memcached==1.58 # via sentry -python-openid==2.2.5 # via sentry +python-openid==2.2.5 # via django-social-auth, sentry python-u2flib-server==4.0.1 # via sentry python-utils==2.0.0 # via progressbar2 pytz==2016.6.1 # via celery From 597130be81dcc29e46b23d15e115ca38c234dfe8 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Tue, 6 Dec 2016 11:15:08 -0800 Subject: [PATCH 24/31] remove the sed call --- bin/update | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/update b/bin/update index cc7f8eb..cbe9bf1 100755 --- a/bin/update +++ b/bin/update @@ -4,5 +4,4 @@ version="$1" pip install --upgrade pip pip install pip-tools -sed -i 's/8.7.0/8.11.0/g' requirements.in pip-compile --output-file requirements.txt requirements.in From 197fad1a6db67336a5335d72cf5832087dc5a00e Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Wed, 8 Feb 2017 13:58:33 +0100 Subject: [PATCH 25/31] Update to 8.13.0 --- requirements.in | 2 +- requirements.txt | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index 4c2cbcf..bf3c1fd 100644 --- a/requirements.in +++ b/requirements.in @@ -6,6 +6,6 @@ django-social-auth django-storages ndg-httpsclient # required by requests psycopg2 -sentry==8.11.0 +sentry==8.13.0 sentry-auth-google sentry-github diff --git a/requirements.txt b/requirements.txt index 6828985..428a1b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ # amqp==1.4.9 # via kombu anyjson==0.3.3 # via kombu +appdirs==1.4.0 # via setuptools billiard==3.3.0.23 # via celery boto3==1.4.2 # via sentry boto==2.42.0 @@ -48,6 +49,7 @@ lxml==3.6.1 # via sentry, toronado mock==1.0.1 # via exam, sentry ndg-httpsclient==0.4.2 oauth2==1.9.0.post1 # via django-social-auth, sentry +packaging==16.8 # via setuptools percy==0.4.1 # via sentry petname==1.7 # via sentry pillow==3.2.0 # via sentry @@ -58,6 +60,7 @@ py==1.4.31 # via pytest pyasn1==0.1.9 # via cryptography, requests pycparser==2.14 # via cffi pyopenssl==16.0.0 # via ndg-httpsclient, requests +pyparsing==2.1.10 # via packaging pytest-django==2.9.1 # via sentry pytest-html==1.9.0 # via sentry pytest==2.6.4 # via pytest-django, pytest-html, sentry @@ -77,10 +80,10 @@ s3transfer==0.1.9 # via boto3 selenium==3.0.0b3 # via sentry sentry-auth-google==0.1.0 sentry-github==0.1.2 -sentry==8.11.0 +sentry==8.13.0 setproctitle==1.1.10 # via sentry simplejson==3.8.2 # via sentry -six==1.10.0 # via cryptography, django-bitfield, pyopenssl, python-dateutil, python-memcached, python-utils, qrcode, sentry, structlog +six==1.10.0 # via cryptography, django-bitfield, packaging, pyopenssl, python-dateutil, python-memcached, python-utils, qrcode, sentry, setuptools, structlog South==1.0.1 # via sentry sqlparse==0.2.0 # via django-debug-toolbar statsd==3.1 # via sentry From 8cebdb0a83ceb1df00ea1d495ee4840482980be7 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Wed, 8 Feb 2017 14:29:16 +0100 Subject: [PATCH 26/31] Update urlparse --- sentry.conf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sentry.conf.py b/sentry.conf.py index 9d6f2a2..83bdfd5 100644 --- a/sentry.conf.py +++ b/sentry.conf.py @@ -4,6 +4,7 @@ import dj_database_url from sentry.conf.server import * +from urlparse import urlparse CONF_ROOT = os.path.dirname(__file__) @@ -40,7 +41,7 @@ # Generic Redis configuration used as defaults for various things including: # Buffers, Quotas, TSDB -redis_url = urlparse.urlparse(os.environ['REDIS_URL']) +redis_url = urlparse(os.environ['REDIS_URL']) SENTRY_OPTIONS['redis.clusters'] = { 'default': { 'hosts': { From fc70b3499ec4084d75c90c8401f15e716092a3c9 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Wed, 8 Feb 2017 14:30:09 +0100 Subject: [PATCH 27/31] Add release phase --- Procfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Procfile b/Procfile index 171ae71..7011798 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,4 @@ web: uwsgi --ini=uwsgi.ini --http=0.0.0.0:$PORT worker: sentry --config=sentry.conf.py run worker --loglevel=INFO beat: sentry --config=sentry.conf.py run cron --loglevel=INFO +release: sentry --config=sentry.conf.py upgrade From ba909ecf940d07570babd3d75aa9acc85fd86a9e Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Wed, 8 Feb 2017 14:36:21 +0100 Subject: [PATCH 28/31] No prompt on upgrade --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 7011798..7774bc5 100644 --- a/Procfile +++ b/Procfile @@ -1,4 +1,4 @@ web: uwsgi --ini=uwsgi.ini --http=0.0.0.0:$PORT worker: sentry --config=sentry.conf.py run worker --loglevel=INFO beat: sentry --config=sentry.conf.py run cron --loglevel=INFO -release: sentry --config=sentry.conf.py upgrade +release: sentry --config=sentry.conf.py upgrade --noinput From 5d868a5b6e7e90f70b5724e788f3f9536e575d2f Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Wed, 8 Feb 2017 14:51:53 +0100 Subject: [PATCH 29/31] Remove release phase --- Procfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Procfile b/Procfile index 7774bc5..171ae71 100644 --- a/Procfile +++ b/Procfile @@ -1,4 +1,3 @@ web: uwsgi --ini=uwsgi.ini --http=0.0.0.0:$PORT worker: sentry --config=sentry.conf.py run worker --loglevel=INFO beat: sentry --config=sentry.conf.py run cron --loglevel=INFO -release: sentry --config=sentry.conf.py upgrade --noinput From 8f31d4a69506e82e3f898bd3b3f79279238ba25d Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Thu, 9 Feb 2017 09:45:33 +0100 Subject: [PATCH 30/31] Revert "Remove release phase" This reverts commit 5d868a5b6e7e90f70b5724e788f3f9536e575d2f. --- Procfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Procfile b/Procfile index 171ae71..7774bc5 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,4 @@ web: uwsgi --ini=uwsgi.ini --http=0.0.0.0:$PORT worker: sentry --config=sentry.conf.py run worker --loglevel=INFO beat: sentry --config=sentry.conf.py run cron --loglevel=INFO +release: sentry --config=sentry.conf.py upgrade --noinput From f397c735ca744662f7d8fff27202c28de97050d7 Mon Sep 17 00:00:00 2001 From: Yannick Schutz Date: Thu, 9 Feb 2017 09:52:07 +0100 Subject: [PATCH 31/31] Fix the warnings --- sentry.conf.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sentry.conf.py b/sentry.conf.py index 83bdfd5..7c41dc8 100644 --- a/sentry.conf.py +++ b/sentry.conf.py @@ -131,8 +131,8 @@ # Any Django storage backend is compatible with Sentry. For more solutions see # the django-storages package: https://django-storages.readthedocs.org/en/latest/ -SENTRY_FILESTORE = 'storages.backends.s3boto.S3BotoStorage' -SENTRY_FILESTORE_OPTIONS = {} +SENTRY_OPTIONS['filestore.backend'] = 'storages.backends.s3boto.S3BotoStorage' +SENTRY_OPTIONS['filestore.options'] = {} AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID') AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY') @@ -265,3 +265,5 @@ # If this file ever becomes compromised, it's important to regenerate your SECRET_KEY # Changing this value will result in all current sessions being invalidated SENTRY_OPTIONS['system.secret-key'] = os.environ['SECRET_KEY'] + +SENTRY_DIGESTS = 'sentry.digests.backends.redis.RedisBackend'