From 3e1a035b43aabd29f3711b89ec9cabd9a94019a2 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 8 May 2020 12:21:42 -0400
Subject: [PATCH] See if this helps

---
 setup.cfg | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 3856a10..dfc4960 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -36,8 +36,10 @@ install_requires =
     eliot
     aniso8601
     python-challenge-bypass-ristretto
-    # Inherit our Twisted dependency from tahoe-lafs so we don't accidentally
-    # get the extras wrong here and break stuff.
+    # The pip resolver sometimes finds treq's dependencies first and these are
+    # incompatible with Tahoe-LAFS'.  So duplicate them here (the ones that
+    # have been observed to cause problems).
+    Twisted[tls,conch]>=18.4.0
     tahoe-lafs==1.14.0
     treq
 
-- 
GitLab