From fb9e9b76a86a36b0a0d78ed39f36c3e92af98a88 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulipchat.com>
Date: Sat, 24 Aug 2019 16:27:27 -0700
Subject: [PATCH] requirements: When removing future requirement, leave it
 commented.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

futures is no longer there to be removed.  Be clear about why we’re
removing future (it was never a “pip-tools bug”), and leave evidence
behind to help indicate how long that will be needed.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
---
 requirements/dev.txt             | 1 +
 requirements/docs.txt            | 1 +
 requirements/prod.txt            | 1 +
 tools/update-locked-requirements | 9 ++++++---
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/requirements/dev.txt b/requirements/dev.txt
index 6f64493d68..3aa2c2a2cf 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -63,6 +63,7 @@ docker==4.0.2             # via moto
 docutils==0.14            # via botocore, recommonmark, sphinx
 ecdsa==0.13.2             # via python-jose, sshpubkeys
 fakeldap==0.6.1
+# future==0.17.1            # via commonmark, python-jose, python-twitter
 gitlint==0.12.0
 h2==2.6.2                 # via hyper
 hpack==3.0.0              # via h2
diff --git a/requirements/docs.txt b/requirements/docs.txt
index c01cfed247..6d955e57d8 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -13,6 +13,7 @@ certifi==2019.6.16        # via requests
 chardet==3.0.4            # via requests
 commonmark==0.9.0
 docutils==0.14            # via recommonmark, sphinx
+# future==0.17.1            # via commonmark
 idna==2.8                 # via requests
 imagesize==1.1.0          # via sphinx
 jinja2==2.10.1            # via sphinx
diff --git a/requirements/prod.txt b/requirements/prod.txt
index f898633c99..5f5e78a84e 100644
--- a/requirements/prod.txt
+++ b/requirements/prod.txt
@@ -44,6 +44,7 @@ django-statsd-mozilla==0.4.0
 django-two-factor-auth==1.9.1
 django-webpack-loader==0.6.0
 django==1.11.23
+# future==0.17.1            # via python-twitter
 h2==2.6.2                 # via hyper
 hpack==3.0.0              # via h2
 html2text==2018.1.9
diff --git a/tools/update-locked-requirements b/tools/update-locked-requirements
index 1fe2c77f73..84c89d0a85 100755
--- a/tools/update-locked-requirements
+++ b/tools/update-locked-requirements
@@ -21,9 +21,12 @@ compile_requirements () {
     sed -i 's/-e //' "$output"
 
     if [ "$python_version" != "py2" ]; then
-        # pip-tools bug; future, futures are obsolete in python3
-        sed -i '/futures==/d' "$output"
-        sed -i '/future==/d' "$output"
+        # Remove an unnecessary future requirement declared by commonmark,
+        # python-jose, and python-twitter.
+        # https://github.com/readthedocs/commonmark.py/pull/188
+        # https://github.com/mpdavis/python-jose/pull/134
+        # https://github.com/bear/python-twitter/pull/614
+        sed -i 's/^future==/# &/' "$output"
     fi
 
     (