From 79ff7ae5cb3b9cd1489c5e514ce7f1650028424e Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Sun, 25 Dec 2016 14:14:17 -0500
Subject: [PATCH] move 'shutilwhich' dependency out to the [test] extra

This is only used by integration/conftest.py, so we don't need an
unconditional dependency on it.

closes ticket:2856
---
 setup.py                    | 1 +
 src/allmydata/_auto_deps.py | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 38b9f0696..e5663db96 100644
--- a/setup.py
+++ b/setup.py
@@ -279,6 +279,7 @@ setup(name="tahoe-lafs", # also set in __init__.py
               "txi2p >= 0.3.1", # in case pip's resolver doesn't work
               "pytest",
               "pytest-twisted",
+              "shutilwhich >= 1.1.0", # in Python 3.3 stdlib
           ],
           "tor": [
               "foolscap[tor] >= 0.12.5",
diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 6ae7a6bb8..8a37bd34b 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -91,9 +91,6 @@ install_requires = [
     #   <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2474>.
     "pyOpenSSL >= 0.14",
     "PyYAML >= 3.11",
-
-    # in Python 3.3 stdlib
-    "shutilwhich >= 1.1.0",
 ]
 
 # Includes some indirect dependencies, but does not include allmydata.