From 0e50afb59995985d74b2e44b5da8a4406445d39b Mon Sep 17 00:00:00 2001 From: Aditya Bansal Date: Fri, 13 Jul 2018 13:16:14 +0530 Subject: [PATCH] thumbor: Add ldap and django as a dependancy. 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). --- requirements/thumbor.in | 3 +++ requirements/thumbor.txt | 7 ++++++- version.py | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/requirements/thumbor.in b/requirements/thumbor.in index a6e29d9b0b..4e39f654a0 100644 --- a/requirements/thumbor.in +++ b/requirements/thumbor.in @@ -1,6 +1,9 @@ tc-aws==6.2.7 thumbor==6.4.2 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 # use of tools/update-locked-requirements but for some reason `pip-compile` diff --git a/requirements/thumbor.txt b/requirements/thumbor.txt index a46e0cf976..a2bda2c5d4 100644 --- a/requirements/thumbor.txt +++ b/requirements/thumbor.txt @@ -13,6 +13,8 @@ backports.ssl-match-hostname==3.5.0.1 botocore==1.10.31 # via tornado-botocore certifi==2018.1.18 derpconf==0.8.2 # via thumbor +django-auth-ldap==1.5.0 +django==1.11.13 docutils==0.14 # via botocore futures==3.1.1 # via thumbor jmespath==0.9.3 # via botocore @@ -20,10 +22,13 @@ libthumbor==1.3.2 # via thumbor olefile==0.45.1 # via pillow piexif==1.0.13 # 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 pycurl==7.43.0.2 # via thumbor, tornado-botocore 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 six==1.11.0 # via derpconf, libthumbor, python-dateutil, singledispatch, thumbor statsd==3.2.2 # via thumbor diff --git a/version.py b/version.py index 38cc8b4888..11e08ebd2c 100644 --- a/version.py +++ b/version.py @@ -8,4 +8,4 @@ ZULIP_VERSION = "1.8.1+git" # Typically, adding a dependency only requires a minor version bump, and # removing a dependency requires a major version bump. -PROVISION_VERSION = '23.1' +PROVISION_VERSION = '23.2'