From 2573ecb7d18543c8a9cb81940cc6fd52e97042c9 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 22 Sep 2019 16:07:13 -0700 Subject: [PATCH] requirements: Bump thumbor Django to match main Django. Signed-off-by: Anders Kaseorg --- requirements/thumbor-dev.txt | 2 +- requirements/thumbor.in | 5 +++-- requirements/thumbor.txt | 2 +- version.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/requirements/thumbor-dev.txt b/requirements/thumbor-dev.txt index a64aed3b13..b89a1fa7eb 100644 --- a/requirements/thumbor-dev.txt +++ b/requirements/thumbor-dev.txt @@ -13,7 +13,7 @@ botocore==1.12.183 # via tornado-botocore click==7.0 # via pip-tools derpconf==0.8.3 # via thumbor django-auth-ldap==1.7.0 -django==1.11.14 +django==1.11.23 docutils==0.14 # via botocore futures==3.1.1 # via thumbor, tornado jmespath==0.9.4 # via botocore diff --git a/requirements/thumbor.in b/requirements/thumbor.in index 589af44cc0..2e460b2a80 100644 --- a/requirements/thumbor.in +++ b/requirements/thumbor.in @@ -1,9 +1,10 @@ tc-aws==6.2.10 thumbor==6.5.1 -typing==3.6.6 + # Required for just importing settings from our main django app. django-auth-ldap==1.7.0 -Django==1.11.14 +Django==1.11.23 +typing==3.6.6 # Needed for cloning virtual environments virtualenv-clone==0.5.1 diff --git a/requirements/thumbor.txt b/requirements/thumbor.txt index 4bf70a4763..564d0ac24c 100644 --- a/requirements/thumbor.txt +++ b/requirements/thumbor.txt @@ -12,7 +12,7 @@ backports-abc==0.5 # via tornado botocore==1.12.183 # via tornado-botocore derpconf==0.8.3 # via thumbor django-auth-ldap==1.7.0 -django==1.11.14 +django==1.11.23 docutils==0.14 # via botocore futures==3.1.1 # via thumbor, tornado jmespath==0.9.4 # via botocore diff --git a/version.py b/version.py index fe951091a3..582d360cc9 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = '55.1' +PROVISION_VERSION = '55.2'