From 805e07cd97d8457e37238b8767b3690ad33575b6 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Tue, 23 May 2017 00:16:05 -0700
Subject: [PATCH] setup.py: extras=dev requires txtorcon on both py2 and py3

We used to avoid this on py3, but now that txtorcon (0.19.2) is compatible
with it, we can use it on both. This also means tests can rely on having
txtorcon available.
---
 setup.py | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/setup.py b/setup.py
index 24101ace..e759d744 100644
--- a/setup.py
+++ b/setup.py
@@ -1,24 +1,9 @@
-import sys
 from setuptools import setup
 
 import versioneer
 
 commands = versioneer.get_cmdclass()
 
-DEV_REQUIREMENTS = [
-    "mock",
-    "tox",
-    "pyflakes",
-]
-if sys.version_info[0] < 3:
-    # txtorcon is not yet compatible with py3, so we include "txtorcon" in
-    # DEV_REQUIREMENTS under py2 but not under py3. The test suite will skip
-    # the tor tests when txtorcon is not importable. This results in
-    # different wheels when built under py2 vs py3 (with different
-    # extras_require[dev] dependencies), but I think this is ok, since nobody
-    # should be installing with [dev] from a wheel.
-    DEV_REQUIREMENTS.append("txtorcon")
-
 setup(name="magic-wormhole",
       version=versioneer.get_version(),
       description="Securely transfer data between computers",
@@ -53,8 +38,8 @@
       ],
       extras_require={
           ':sys_platform=="win32"': ["pypiwin32"],
-          "tor": ["txtorcon"],
-          "dev": DEV_REQUIREMENTS, # includes txtorcon on py2, but not py3
+          "tor": ["txtorcon >= 0.19.2"],
+          "dev": ["mock", "tox", "pyflakes", "txtorcon >= 0.19.2"],
       },
       test_suite="wormhole.test",
       cmdclass=commands,