paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

thumbor: Add ldap and django as a dependancy.

Browse Source 
We add this dependancy to thumbor for no use other than making an
import possible in one of the upcoming commits. Basically we wanted to
import LOCAL_UPLOADS_DIR from zproject.prod_settings or
zproject.dev_settings and prod_settings_template.py imports
django-auth-ldap (which depends on python-ldap and django).

This seems counterproductive, but it makes it possible for us to save
significant thumbor server startup time that would have been consumed
in `get-django-setting`, and once thumbor supports Python 3, we'll
probably be merging the virtualenvs anyway (in which case this change
would become a no-op).
This commit is contained in:
Aditya Bansal
2018-07-13 13:16:14 +05:30
committed by Tim Abbott
parent 52f5d83c90
commit 0e50afb599
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
requirements/thumbor.in
View File

@@ -1,6 +1,9 @@
tc-aws==6.2.7 tc-aws==6.2.7
thumbor==6.4.2 thumbor==6.4.2
typing==3.6.4 typing==3.6.4
# Required for just importing settings from our main django app.
django-auth-ldap==1.5.0
Django==1.11.13
# Below dependencies should ideally have been added to thumbor.txt by the # Below dependencies should ideally have been added to thumbor.txt by the
# use of tools/update-locked-requirements but for some reason `pip-compile` # use of tools/update-locked-requirements but for some reason `pip-compile`

7
requirements/thumbor.txt
View File

@@ -13,6 +13,8 @@ backports.ssl-match-hostname==3.5.0.1
botocore==1.10.31 # via tornado-botocore botocore==1.10.31 # via tornado-botocore
certifi==2018.1.18 certifi==2018.1.18
derpconf==0.8.2 # via thumbor derpconf==0.8.2 # via thumbor
django-auth-ldap==1.5.0
django==1.11.13
docutils==0.14 # via botocore docutils==0.14 # via botocore
futures==3.1.1 # via thumbor futures==3.1.1 # via thumbor
jmespath==0.9.3 # via botocore jmespath==0.9.3 # via botocore
@@ -20,10 +22,13 @@ libthumbor==1.3.2 # via thumbor
olefile==0.45.1 # via pillow olefile==0.45.1 # via pillow
piexif==1.0.13 # via thumbor piexif==1.0.13 # via thumbor
pillow==4.3.0 # via thumbor pillow==4.3.0 # via thumbor
pyasn1-modules==0.2.2 # via python-ldap
pyasn1==0.4.3 # via pyasn1-modules, python-ldap
pycryptodome==3.6.1 # via thumbor pycryptodome==3.6.1 # via thumbor
pycurl==7.43.0.2 # via thumbor, tornado-botocore pycurl==7.43.0.2 # via thumbor, tornado-botocore
python-dateutil==2.7.3 # via botocore, tc-aws python-dateutil==2.7.3 # via botocore, tc-aws
pytz==2018.4 # via thumbor python-ldap==3.1.0 # via django-auth-ldap
pytz==2018.4 # via django, thumbor
singledispatch==3.4.0.3 singledispatch==3.4.0.3
six==1.11.0 # via derpconf, libthumbor, python-dateutil, singledispatch, thumbor six==1.11.0 # via derpconf, libthumbor, python-dateutil, singledispatch, thumbor
statsd==3.2.2 # via thumbor statsd==3.2.2 # via thumbor

2
version.py
View File

@@ -8,4 +8,4 @@ ZULIP_VERSION = "1.8.1+git"
# Typically, adding a dependency only requires a minor version bump, and # Typically, adding a dependency only requires a minor version bump, and
# removing a dependency requires a major version bump. # removing a dependency requires a major version bump.
PROVISION_VERSION = '23.1' PROVISION_VERSION = '23.2'