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.

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

Update config and bring the latest version #29

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6368669
try sentry-auth-google
atmos Aug 15, 2016
e266202
try integrating with github too
atmos Aug 15, 2016
831a55a
remove sentry-auth-github
atmos Aug 15, 2016
9435a62
try setting the constant this way
atmos Aug 15, 2016
bd84cc2
use the right env vars
atmos Aug 15, 2016
f794f55
try updating to 8.7.0
atmos Aug 15, 2016
c1c9af7
console logging implies this is what i should be doing now
atmos Aug 15, 2016
c3474c6
more updated behavior the logs taught me
atmos Aug 15, 2016
0f2de69
Merge pull request #1 from heroku/upgrade-to-latest
atmos Aug 16, 2016
360f5ac
add a travis yaml file
atmos Aug 23, 2016
5fd1699
run pip install
atmos Aug 23, 2016
9b817d3
see if i can install with sudo
atmos Aug 23, 2016
637d906
try installing to the travis users directory
atmos Aug 23, 2016
eadf330
Merge pull request #3 from heroku/add-travis
atmos Aug 23, 2016
5f0725b
add update script from inside the dyno
atmos Dec 6, 2016
ecff539
maybe?
atmos Dec 6, 2016
2c08f4c
try separate lines
atmos Dec 6, 2016
896c41c
try specifying languages
atmos Dec 6, 2016
0c3913f
don't specify a user
atmos Dec 6, 2016
131ed41
try packaging again
atmos Dec 6, 2016
3c10839
disable email notifications
atmos Dec 6, 2016
f86fe96
i can't sed apparently
atmos Dec 6, 2016
1280b64
update versions of sentry too
atmos Dec 6, 2016
c189340
try adding it back explicitly
atmos Dec 6, 2016
6e3e48b
see if adding back old deps fixes things
atmos Dec 6, 2016
597130b
remove the sed call
atmos Dec 6, 2016
197fad1
Update to 8.13.0
ys Feb 8, 2017
8cebdb0
Update urlparse
ys Feb 8, 2017
fc70b34
Add release phase
ys Feb 8, 2017
ba909ec
No prompt on upgrade
ys Feb 8, 2017
5d868a5
Remove release phase
ys Feb 8, 2017
8f31d4a
Revert "Remove release phase"
ys Feb 9, 2017
f397c73
Fix the warnings
ys Feb 9, 2017
6752c13
Merge branch 'master' into update-config
ys Feb 9, 2017
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
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
language: python
python: "2.7"
sudo: false
script: python -m py_compile sentry.conf.py
install:
- pip install --upgrade pip
- pip install -r requirements.txt
script: python -m py_compile sentry.conf.py
notifications:
email: false
7 changes: 7 additions & 0 deletions bin/update
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh -e

version="$1"

pip install --upgrade pip
pip install pip-tools
pip-compile --output-file requirements.txt requirements.in
3 changes: 2 additions & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ boto
dj-database-url
django-bcrypt
django-secure
django-social-auth
django-storages
ndg-httpsclient # required by requests
psycopg2
sentry
sentry==8.13.0
sentry-auth-google
sentry-github
56 changes: 33 additions & 23 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@
#
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
boto==2.43.0
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.8.3 # via cryptography, symsynd
cffi==1.7.0 # via cryptography, libsourcemap, symsynd
click==6.6 # via sentry
contextlib2==0.5.4 # via raven
cryptography==1.5.2 # via pyopenssl, python-u2flib-server
Expand All @@ -23,66 +26,73 @@ 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-storages==1.5.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
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
ipaddress==1.0.17 # via cryptography, sentry
ipaddress==1.0.16 # via cryptography, sentry
jmespath==0.9.0 # via boto3, botocore
kombu==3.0.35 # via celery, sentry
lxml==3.6.4 # via sentry, toronado
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
packaging==16.8 # via setuptools
percy==0.4.1 # via sentry
petname==1.7 # via sentry
Pillow==3.2.0 # 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.16 # via cffi
PyOpenSSL==16.2.0 # via ndg-httpsclient, 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
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 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.7 # via celery
PyYAML==3.11 # via sentry
pytz==2016.6.1 # via celery
pyyaml==3.11 # via sentry
qrcode==5.3 # via sentry
raven==5.31.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.11.1 # via percy, 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.9.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.2 # via django-debug-toolbar
statsd==3.1 # via sentry
structlog==16.1.0 # via sentry
symsynd==1.2.0 # 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.14 # 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
7 changes: 5 additions & 2 deletions sentry.conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import dj_database_url
from sentry.conf.server import *
from urlparse import urlparse

CONF_ROOT = os.path.dirname(__file__)

Expand Down Expand Up @@ -130,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')
Expand Down Expand Up @@ -264,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'