Merge pull request #347 from nsoranzo/setup_fixes

 Add wcwidth for setuptools>=18 and build universal wheels

2 files changed, 3 insertions, 0 deletions

diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..2a9acf13
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
index dcace2f9..5fbd354a 100755
--- a/setup.py
+++ b/setup.py
@@ -69,6 +69,7 @@ INSTALL_REQUIRES = ['pyparsing >= 2.0.1', 'pyperclip', 'six']
 EXTRAS_REQUIRE = {
     # Windows also requires pyreadline to ensure tab completion works
     ":sys_platform=='win32'": ['pyreadline'],
+    ":sys_platform!='win32'": ['wcwidth'],
     # Python 3.4 and earlier require contextlib2 for temporarily redirecting stderr and stdout
     ":python_version<'3.5'": ['contextlib2'],
     # Python 3.3 and earlier require enum34 backport of enum module from Python 3.4