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

Author: anselor

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

cmd2.py

@@ -183,7 +183,7 @@ class RlType(Enum):
     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()

docs/conf.py

@@ -62,7 +62,7 @@
 # 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.

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1

setup.py

@@ -8,7 +8,7 @@
 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 @@
 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

tests/test_cmd2.py

@@ -25,7 +25,7 @@
 
 
 def test_ver():
-    assert cmd2.__version__ == '0.8.3'
+    assert cmd2.__version__ == '0.8.4'
 
 
 def test_empty_statement(base_app):