Skip to content

Commit c5a7124

Browse files
committed
Lots of changes for python 2.6, not ready for pypi yet.
1 parent d2b6b57 commit c5a7124

File tree

7 files changed

+13
-10
lines changed

7 files changed

+13
-10
lines changed

TODO

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ TODO
44
0.1 milestone
55
-------------
66

7-
- Remove doc for ``run_tests.py`` visual test runner. Just have
8-
instruction for running test builder package.
97
- `pep8`_, `pep257`_ for tests.
108
- ``$ tmux freeze`` for virtualenv
119
- ``shell_command_before`` for `teamocil`_.
@@ -21,7 +19,7 @@ TODO
2119
it.
2220
- Handle case where switching client via ``$ tmuxp load`` or
2321
``$ tmuxp attach-session`` into another socket may cause an error.
24-
- python 2.6 support
22+
2523

2624
Done
2725
''''
@@ -33,6 +31,10 @@ Done
3331
- rename functions
3432
- ``util.version()`` to ``util.has_required_tmux_version()``. (done)
3533
- ``config.check_consistency()`` to ``config.validate_schema()``. (done)
34+
- python 2.6 support
35+
- Remove doc for ``run_tests.py`` visual test runner. Just have
36+
instruction for running test builder package.
37+
3638

3739
Future
3840
------

doc/developing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ Create two terminals:
142142

143143
.. code-block:: bash
144144
145-
$ python ./run_tests.py --visual
145+
$ python ./run_tests.py --tests tests_workspacebuilder
146146
147147
Terminal 1 should have flickered and built the session before your eyes.
148-
tmuxp hides this building from normal users. :)
148+
tmuxp hides this building from normal users.
149149

150150
Verbosity and logging
151151
'''''''''''''''''''''

run_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
def main(verbosity=2, failfast=False):
2121
"""Run TestSuite in new tmux session. Exit with code 0 if success."""
2222

23-
suites = unittest.TestLoader().discover('tmuxp.testsuite', pattern="*.py")
23+
suites = unittest.TestLoader().discover('tmuxp.testsuite', pattern="test_*.py")
2424
result = unittest.TextTestRunner(
2525
verbosity=verbosity, failfast=failfast).run(suites)
2626
if result.wasSuccessful():

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@
4444
install_requires=install_reqs,
4545
tests_require=tests_reqs,
4646
test_suite='tmuxp.testsuite',
47+
zip_safe=False,
4748
scripts=['pkg/tmuxp.bash', 'pkg/tmuxp.zsh', 'pkg/tmuxp.tcsh'],
48-
entry_points=dict(console_scripts=['tmuxp=tmuxp:main']),
49+
entry_points=dict(console_scripts=['tmuxp=tmuxp:cli.main']),
4950
classifiers=[
5051
'Development Status :: 3 - Alpha',
5152
"License :: OSI Approved :: BSD License",

tmuxp/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
from .window import Window
1919
from .pane import Pane
2020
from .workspacebuilder import WorkspaceBuilder
21-
from .cli import main
22-
from . import config, util
21+
from . import config, util, cli
2322

2423
import logging
2524

tmuxp/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from distutils.util import strtobool
2323

2424

25-
__version__ = pkg_resources.require("tmuxp")[0].version
25+
__version__ = pkg_resources.require("tmuxp").version
2626

2727
logger = logging.getLogger(__name__)
2828

tmuxp/testsuite/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
1010
"""
1111

12+
1213
from ..server import Server
1314
t = Server()
1415
t.socket_name = 'tmuxp_test'

0 commit comments

Comments
 (0)