Merge remote-tracking branch 'origin/master' into help_categories

6 files changed, 11 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50af1f5f..253ceaa2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.4 (April 10, 2018)
+* Bug Fixes
+    * Fixed conditional dependency issue in setup.py that was in 0.8.3.
+
 ## 0.8.3 (April 09, 2018)
 * Bug Fixes
     * Fixed ``help`` command not calling functions for help topics
diff --git a/cmd2.py b/cmd2.py
index 6179df69..230de1a6 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -183,7 +183,7 @@ if six.PY2 and sys.platform.startswith('lin'):
     except ImportError:
         pass
 
-__version__ = '0.8.3'
+__version__ = '0.8.4'
 
 # Pyparsing enablePackrat() can greatly speed up parsing, but problems have been seen in Python 3 in the past
 pyparsing.ParserElement.enablePackrat()
diff --git a/docs/conf.py b/docs/conf.py
index 8d457b8a..93f1c4c9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -62,7 +62,7 @@ author = 'Catherine Devlin and Todd Leonhardt'
 # The short X.Y version.
 version = '0.8'
 # The full version, including alpha/beta/rc tags.
-release = '0.8.3'
+release = '0.8.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
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..2221eae0 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ import sys
 import setuptools
 from setuptools import setup
 
-VERSION = '0.8.3'
+VERSION = '0.8.4'
 DESCRIPTION = "cmd2 - a tool for building interactive command line applications in Python"
 LONG_DESCRIPTION = """cmd2 is a tool for building interactive command line applications in Python. Its goal is to make 
 it quick and easy for developers to build feature-rich and user-friendly interactive command line applications.  It 
@@ -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
diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index 833a9a66..545cf1aa 100644
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -25,7 +25,7 @@ from conftest import run_cmd, normalize, BASE_HELP, HELP_HISTORY, SHORTCUTS_TXT,
 
 
 def test_ver():
-    assert cmd2.__version__ == '0.8.3'
+    assert cmd2.__version__ == '0.8.4'
 
 
 def test_empty_statement(base_app):