From 66d4a9b4a1616b77cbb4bddce1c3a11a8dda7c5c Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 18 Feb 2019 11:47:20 -0500
Subject: [PATCH] Depend on Eliot

---
 src/allmydata/_auto_deps.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 550d430ba..05f840e34 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -97,6 +97,13 @@ install_requires = [
 
     # for 'tahoe invite' and 'tahoe join'
     "magic-wormhole >= 0.10.2",
+
+    # Eliot is contemplating dropping Python 2 support.  Stick to a version we
+    # know works on Python 2.7.  Because we don't have support for `==`
+    # constraints, pin 1.6.x this way.  I feel pretty safe betting that we
+    # won't end up stuck on Eliot 1.6.100 with a critical fix only present in
+    # 1.6.101.  And if we do, I know how to deal with that situation.
+    "eliot >= 1.6.0, <= 1.6.100",
 ]
 
 # Includes some indirect dependencies, but does not include allmydata.
@@ -124,7 +131,8 @@ package_imports = [
     ('pycparser',        'pycparser'),
     ('PyYAML',           'yaml'),
     ('magic-wormhole',   'wormhole'),
-    ('setuptools',       'setuptools')
+    ('setuptools',       'setuptools'),
+    ('eliot',            'eliot'),
 ]
 
 # Dependencies for which we don't know how to get a version number at run-time.