From 109e22506acacf1837c898a5070b389e68fa4dc2 Mon Sep 17 00:00:00 2001
From: Aman Agrawal <f2016561@pilani.bits-pilani.ac.in>
Date: Wed, 22 Apr 2020 05:36:01 +0530
Subject: [PATCH] requirements: Upgrade libthumbor to latest release.

Upgrade libthumbor in main zulip venv. This version drops support
for python 2 and runs on py>=3.6.

As such, it is our first commit taking advantage of our having dropped support
for Debian Stretch and Ubuntu Xenial, our previous Python 3.5-based platforms.
---
 requirements/common.in | 5 ++---
 requirements/dev.txt   | 5 +++--
 requirements/prod.txt  | 5 +++--
 version.py             | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/requirements/common.in b/requirements/common.in
index 70a9b3bdd5..f0c9bf92ca 100644
--- a/requirements/common.in
+++ b/requirements/common.in
@@ -166,9 +166,8 @@ disposable-email-domains
 yamole
 
 # Needed for signing thumbnail requests so that they can be authenticated on the
-# other end.  Using a fork to eliminate a really slow pkgresources import:
-# https://github.com/thumbor/libthumbor/pull/37
-https://github.com/zulip/libthumbor/archive/60ed2431c07686a12f2770b2d852c5650f3ccfc6.zip#egg=libthumbor==1.3.2zulip
+# other end.
+libthumbor==2.0.1
 
 # Needed for string matching in AlertWordProcessor
 pyahocorasick
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 3f79545945..c541d29c06 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -448,8 +448,9 @@ jsonschema==3.2.0 \
     --hash=sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163 \
     --hash=sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a \
     # via aws-sam-translator, cfn-lint
-https://github.com/zulip/libthumbor/archive/60ed2431c07686a12f2770b2d852c5650f3ccfc6.zip#egg=libthumbor==1.3.2zulip \
-    --hash=sha256:84e4a84b15ae13602c1560c58f5aef4faf33bb3ec568db987cce79371129baa8 \
+libthumbor==2.0.1 \
+    --hash=sha256:3c4e1a59c019d22f868d225315c06f97fad30fb5e78112d6a230b978e7d24e38 \
+    --hash=sha256:ed4fe5f27f8f90e7285b7e6dce99c1b67d43a140bf370e989080b43d80ce25f0 \
     # via -r requirements/common.in
 lp37==2.1.1 \
     --hash=sha256:a512cc0314c52c7b31e0aff4bc846867b2fd527ff6a2a626074639250713d73c \
diff --git a/requirements/prod.txt b/requirements/prod.txt
index c507df9555..8cbb61d9c2 100644
--- a/requirements/prod.txt
+++ b/requirements/prod.txt
@@ -294,8 +294,9 @@ jinja2==2.11.2 \
     --hash=sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0 \
     --hash=sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035 \
     # via -r requirements/common.in
-https://github.com/zulip/libthumbor/archive/60ed2431c07686a12f2770b2d852c5650f3ccfc6.zip#egg=libthumbor==1.3.2zulip \
-    --hash=sha256:84e4a84b15ae13602c1560c58f5aef4faf33bb3ec568db987cce79371129baa8 \
+libthumbor==2.0.1 \
+    --hash=sha256:3c4e1a59c019d22f868d225315c06f97fad30fb5e78112d6a230b978e7d24e38 \
+    --hash=sha256:ed4fe5f27f8f90e7285b7e6dce99c1b67d43a140bf370e989080b43d80ce25f0 \
     # via -r requirements/common.in
 lxml==4.5.0 \
     --hash=sha256:06d4e0bbb1d62e38ae6118406d7cdb4693a3fa34ee3762238bcb96c9e36a93cd \
diff --git a/version.py b/version.py
index 9f2813b1d4..9e71c76ca3 100644
--- a/version.py
+++ b/version.py
@@ -44,4 +44,4 @@ API_FEATURE_LEVEL = 1
 #   historical commits sharing the same major version, in which case a
 #   minor version bump suffices.
 
-PROVISION_VERSION = '79.2'
+PROVISION_VERSION = '79.3'