setup.py: require txtorcon all the time, remove 'tor' extra

This commit is contained in:
Brian Warner 2017-06-14 23:41:49 +01:00
parent e7bb25907a
commit 2575dbfad3

View File

@ -36,11 +36,11 @@ setup(name="magic-wormhole",
"click", "click",
"humanize", "humanize",
"ipaddress", "ipaddress",
"txtorcon >= 0.19.3",
], ],
extras_require={ extras_require={
':sys_platform=="win32"': ["pypiwin32"], ':sys_platform=="win32"': ["pypiwin32"],
"tor": ["txtorcon >= 0.19.3"], "dev": ["mock", "tox", "pyflakes"],
"dev": ["mock", "tox", "pyflakes", "txtorcon >= 0.19.3"],
}, },
test_suite="wormhole.test", test_suite="wormhole.test",
cmdclass=commands, cmdclass=commands,