diff options
| -rw-r--r-- | cmd2/__init__.py | 6 | ||||
| -rwxr-xr-x | cmd2/cmd2.py (renamed from cmd2.py) | 0 | ||||
| -rwxr-xr-x | setup.py | 2 | ||||
| -rw-r--r-- | tests/__init__.py | 5 | ||||
| -rw-r--r-- | tests/test_argparse.py | 2 | ||||
| -rw-r--r-- | tests/test_cmd2.py | 4 | ||||
| -rw-r--r-- | tests/test_submenu.py | 2 | ||||
| -rw-r--r-- | tests/test_transcript.py | 2 |
8 files changed, 17 insertions, 6 deletions
diff --git a/cmd2/__init__.py b/cmd2/__init__.py new file mode 100644 index 00000000..fe3747e0 --- /dev/null +++ b/cmd2/__init__.py @@ -0,0 +1,6 @@ +# +# -*- coding: utf-8 -*- +# +from .cmd2 import Cmd, Cmd2TestCase, set_posix_shlex, set_strip_quotes, AddSubmenu +from .cmd2 import can_clip, with_category, categorize +from .cmd2 import with_argument_list, with_argparser, with_argparser_and_unknown_args @@ -95,7 +95,7 @@ setup( url='https://github.com/python-cmd2/cmd2', license='MIT', platforms=['any'], - py_modules=["cmd2"], + packages=find_packages(), keywords='command prompt console cmd', install_requires=INSTALL_REQUIRES, extras_require=EXTRAS_REQUIRE, diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 00000000..6d3e5a82 --- /dev/null +++ b/tests/__init__.py @@ -0,0 +1,5 @@ +# +# -*- coding: utf-8 -*- +# +from .conftest import run_cmd, StdOut, normalize, BASE_HELP, BASE_HELP_VERBOSE, \ + HELP_HISTORY, SHORTCUTS_TXT, SHOW_TXT, SHOW_LONG diff --git a/tests/test_argparse.py b/tests/test_argparse.py index 7096848a..569dc57b 100644 --- a/tests/test_argparse.py +++ b/tests/test_argparse.py @@ -8,7 +8,7 @@ import pytest import cmd2 from unittest import mock -from conftest import run_cmd, StdOut +#from conftest import run_cmd, StdOut # Prefer statically linked gnureadline if available (for macOS compatibility due to issues with libedit) try: diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py index e4316757..bf6d5242 100644 --- a/tests/test_cmd2.py +++ b/tests/test_cmd2.py @@ -22,8 +22,8 @@ except ImportError: from unittest import mock import cmd2 -from conftest import run_cmd, normalize, BASE_HELP, BASE_HELP_VERBOSE, \ - HELP_HISTORY, SHORTCUTS_TXT, SHOW_TXT, SHOW_LONG, StdOut +#from conftest import run_cmd, normalize, BASE_HELP, BASE_HELP_VERBOSE, \ +# HELP_HISTORY, SHORTCUTS_TXT, SHOW_TXT, SHOW_LONG, StdOut def test_ver(): diff --git a/tests/test_submenu.py b/tests/test_submenu.py index 3064da56..f91991ea 100644 --- a/tests/test_submenu.py +++ b/tests/test_submenu.py @@ -5,7 +5,7 @@ Cmd2 testing for argument parsing import pytest import cmd2 -from conftest import run_cmd, StdOut, normalize +#from conftest import run_cmd, StdOut, normalize class SecondLevelB(cmd2.Cmd): diff --git a/tests/test_transcript.py b/tests/test_transcript.py index a24f2fa5..f3d98b0a 100644 --- a/tests/test_transcript.py +++ b/tests/test_transcript.py @@ -16,7 +16,7 @@ import pytest import cmd2 from cmd2 import Cmd, Cmd2TestCase, set_posix_shlex, set_strip_quotes -from conftest import run_cmd, StdOut, normalize +#from conftest import run_cmd, StdOut, normalize class CmdLineApp(Cmd): |