summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md6
-rwxr-xr-xcmd2.py37
-rw-r--r--docs/conf.py2
-rwxr-xr-xsetup.py2
-rw-r--r--tests/test_cmd2.py2
5 files changed, 13 insertions, 36 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 2d964eb9..dd2d0c57 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,12 @@
News
====
+0.7.5
+-----
+
+*Release date: TBD*
+
+
0.7.4
-----
diff --git a/cmd2.py b/cmd2.py
index 7c70f2ef..d0fcad42 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -84,7 +84,7 @@ try:
except ImportError:
pass
-__version__ = '0.7.4'
+__version__ = '0.7.5a'
# Pyparsing enablePackrat() can greatly speed up parsing, but problems have been seen in Python 3 in the past
pyparsing.ParserElement.enablePackrat()
@@ -2270,36 +2270,7 @@ class CmdResult(namedtuple_with_two_defaults('CmdResult', ['out', 'err', 'war'])
if __name__ == '__main__':
# If run as the main application, simply start a bare-bones cmd2 application with only built-in functionality.
- # Set this to True to include the ipy command if IPython is installed, which supports advanced interactive debugging
- # of your application via introspection on self.
- # include_ipy = False
- #
- # app = Cmd(use_ipython=include_ipy)
- # app.cmdloop()
-
-
- class HelpApp(Cmd):
- """Class for testing custom help_* methods which override docstring help."""
-
- def __init__(self, *args, **kwargs):
- # Need to use this older form of invoking super class constructor to support Python 2.x and Python 3.x
- Cmd.__init__(self, *args, **kwargs)
-
- def do_squat(self, arg):
- """This docstring help will never be shown because the help_squat method overrides it."""
- pass
-
- def help_squat(self):
- self.stdout.write('This command does diddly squat...\n')
-
- def do_edit(self, arg):
- """This overrides the edit command and does nothing."""
- pass
-
- # This command will be in the "undocumented" section of the help menu
- def do_undoc(self, arg):
- pass
-
-
- app = HelpApp()
+ # Set "use_iptyhon" to True to include the ipy command if IPython is installed, which supports advanced interactive
+ # debugging of your application via introspection on self.
+ app = Cmd(use_ipython=False)
app.cmdloop()
diff --git a/docs/conf.py b/docs/conf.py
index 60a28d13..fa559859 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.7'
# The full version, including alpha/beta/rc tags.
-release = '0.7.0'
+release = '0.7.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.py b/setup.py
index 08eb1a63..85d04046 100755
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ Setuptools setup file, used to install or test 'cmd2'
"""
from setuptools import setup
-VERSION = '0.7.4'
+VERSION = '0.7.5a'
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
diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index 98e99cbf..5499ffea 100644
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -22,7 +22,7 @@ from conftest import run_cmd, normalize, BASE_HELP, HELP_HISTORY, SHORTCUTS_TXT,
def test_ver():
- assert cmd2.__version__ == '0.7.4'
+ assert cmd2.__version__ == '0.7.5a'
def test_empty_statement(base_app):