Skip to content

Commit

Permalink
Merge pull request kobotoolbox#966 from kobotoolbox/enable-sni-support
Browse files Browse the repository at this point in the history
Install deps to enable SNI support in `requests`
  • Loading branch information
dorey authored Oct 14, 2016
2 parents b67167c + f2fd95e commit 06f7834
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 11 deletions.
7 changes: 6 additions & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ billiard
boto
celery
dj-static
dj_database_url
dj-database-url
django-braces
django-debug-toolbar
django-extensions
Expand Down Expand Up @@ -57,3 +57,8 @@ uWSGI
whitenoise
xlrd
xlwt

# These packages allow `requests` to support SNI
pyopenssl
ndg-httpsclient
pyasn1
41 changes: 31 additions & 10 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,63 +1,84 @@
#
# This file is autogenerated by pip-compile
# Make changes in requirements.in, then run this to update:
# To update, run:
#
# pip-compile requirements.in
# pip-compile --output-file requirements.txt requirements.in
#
-e git+https://github.com/kobotoolbox/formpack.git@kobocat-requirement#egg=formpack
-e git+https://github.com/kobotoolbox/pyxform.git@master#egg=pyxform
-e git+https://github.com/jnm/whoosh@master#egg=Whoosh
amqp==1.4.9
anyjson==0.3.3
begins==0.9
billiard==3.3.0.22
boto==2.39.0
celery==3.1.20
cffi==1.8.3 # via cryptography
contextlib2==0.5.1 # via raven
dj-database-url==0.3.0
cryptography==1.5.2 # via pyopenssl
cssselect==0.9.2 # via pyquery
cyordereddict==1.0.0
dj-database-url==0.4.1
dj-static==0.0.6
django-braces==1.8.1
django-cachebuster==0.2.1
django-debug-toolbar==1.4
django-extensions==1.6.1
django-haystack==2.4.1
django-haystack==2.5.0
django-markitup==2.3.1
django-mptt==0.8.0
django-mptt==0.8.6
django-oauth-toolkit==0.10.0
django-registration-redux==1.3
django-reversion==1.10.1
django-ses==0.7.0
django-taggit==0.18.0
django-taggit==0.21.3
django-toolbelt==0.0.1
django-webpack-loader==0.3.0
Django==1.8.8 # via django-debug-toolbar, django-haystack, django-mptt, django-oauth-toolkit, django-reversion, django-toolbelt, jsonfield
Django==1.8.8 # via django-debug-toolbar, django-haystack, django-oauth-toolkit, django-reversion, django-toolbelt, jsonfield
djangorestframework==3.3.2
docutils==0.12 # via statistics
ecdsa==0.13 # via paramiko
enum34==1.1.6 # via cryptography
Fabric==1.10.2
funcsigs==1.0.2 # via begins
gunicorn==19.4.5
Jinja2==2.8
idna==2.1 # via cryptography
ipaddress==1.0.17 # via cryptography
Jinja2==2.8 # via pyexcelerate
jsonfield==1.0.3
kombu==3.0.33
lxml==2.3.4
Markdown==2.6.5
MarkupSafe==0.23 # via jinja2
ndg-httpsclient==0.4.2
oauthlib==1.0.3
ordereddict==1.1 # via funcsigs
paramiko==1.16.0 # via fabric
path.py==8.1.2
psycopg2==2.6.1
pyasn1==0.1.9
pycparser==2.14 # via cffi
pycrypto==2.6.1 # via paramiko
PyExcelerate==0.6.7
Pygments==2.1
python-dateutil==2.4.2
pyopenssl==16.1.0
pyquery==1.2.11
python-dateutil==2.5.3
pytz==2015.7
raven==5.10.2
requests==2.9.1
shortuuid==0.4.3
six==1.10.0
sqlparse==0.1.18
static3==0.6.1
statistics==1.0.3.5
transifex-client==0.11
unicodecsv==0.14.1
urllib3==1.15.1 # via transifex-client
uWSGI==2.0.12
whitenoise==2.0.6
xlrd==0.8.0
xlwt==1.0.0

# The following packages are commented out because they are
# considered to be unsafe in a requirements file:
# setuptools # via cryptography

0 comments on commit 06f7834

Please sign in to comment.