diff --git a/requirements.txt b/requirements.txt index 1aa224a..e4c6db5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,40 +1,31 @@ Django==1.10.3 -Fabric==1.10.2 -PyYAML==3.11 -Pygments==2.0.2 -biplist==0.9 -defusedxml==0.4.1 -dj-database-url==0.3.0 +Fabric==1.12.0 +PyYAML==3.12 +Pygments==2.1.3 +dj-database-url==0.4.1 dj-static==0.0.6 django-annoying==0.10.3 -django-bcrypt==0.9.2 django-debug-toolbar==1.3.2 django-extensions==1.7.4 -django-haystack==2.4.0 +django-haystack==2.5.1 django-markdown-deux==1.0.5 -git+git://github.com/matagus/django-pagination-py3.git#egg=django-pagination django-registration-redux==1.4 -django-storages==1.1.8 +django-storages==1.5.1 django-taggit==0.21.3 django-tastypie==0.13.3 +elasticsearch==5.0.0 +git+git://github.com/matagus/django-pagination-py3.git#egg=django-pagination git+git://github.com/nicksergeant/django-templatetag-sugar.git#egg=django-templatetag-sugar -ecdsa==0.13 -elasticsearch==1.6.0 gunicorn==19.6.0 -lxml==3.4.4 -markdown2==2.3.0 -paramiko==1.15.2 -parsedatetime==1.5 -psycopg2==2.6.1 +parsedatetime==2.1 +psycopg2==2.6.2 py-bcrypt==0.4 pycrypto==2.6.1 -python-dateutil==2.4.2 -python-mimeparse==0.1.4 -python-postmark==0.4.7 -raven==5.5.0 -requests==2.7.0 +python-dateutil==2.5.3 +python-postmark==0.4.10 +raven==5.31.0 +requests==2.11.1 six==1.9.0 smartypants==1.8.6 -sqlparse==0.1.15 -stripe==1.23.0 +stripe==1.41.1 urllib3==1.11 diff --git a/settings.py b/settings.py index 8f0f6c8..0fd6d09 100644 --- a/settings.py +++ b/settings.py @@ -13,6 +13,7 @@ if 'DATABASE_URL' in os.environ: es = urlparse(os.environ.get('SEARCHBOX_SSL_URL') or 'http://127.0.0.1:9200/') + port = es.port or 80 HAYSTACK_CONNECTIONS = {