Skip to content

Commit f63340a

Browse files
joseph-flinnjoseph-flinn
committed
running black over changes
1 parent 2742381 commit f63340a

File tree

10 files changed

+116
-118
lines changed

10 files changed

+116
-118
lines changed

‎tests/fixtures/pluginsystem/partials/all_pass.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ def __init__(self):
1717
'tmux_version': '3.0',
1818
'tmuxp_version': '1.6.0',
1919
}
20-
MyTestTmuxpPluginInterface.__init__(self, config)
20+
MyTestTmuxpPluginInterface.__init__(self, config)

‎tests/fixtures/pluginsystem/partials/libtmux_version_fail.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def __init__(self):
66
config = {
77
'plugin_name': 'libtmux-min-version-fail',
88
'libtmux_min_version': '0.8.3',
9-
'libtmux_version': '0.7.0'
9+
'libtmux_version': '0.7.0',
1010
}
1111
MyTestTmuxpPluginInterface.__init__(self, config)
1212

@@ -16,7 +16,7 @@ def __init__(self):
1616
config = {
1717
'plugin_name': 'libtmux-max-version-fail',
1818
'libtmux_max_version': '3.0',
19-
'libtmux_version': '3.5'
19+
'libtmux_version': '3.5',
2020
}
2121
MyTestTmuxpPluginInterface.__init__(self, config)
2222

@@ -26,6 +26,6 @@ def __init__(self):
2626
config = {
2727
'plugin_name': 'libtmux-incompatible-version-fail',
2828
'libtmux_version_incompatible': ['0.7.1'],
29-
'libtmux_version': '0.7.1'
29+
'libtmux_version': '0.7.1',
3030
}
31-
MyTestTmuxpPluginInterface.__init__(self, config)
31+
MyTestTmuxpPluginInterface.__init__(self, config)

‎tests/fixtures/pluginsystem/partials/test_plugin_helpers.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from tmuxp.plugin import TmuxpPluginInterface
22

3+
34
class MyTestTmuxpPluginInterface(TmuxpPluginInterface):
45
def __init__(self, config):
56
tmux_version = config.pop('tmux_version', None)
@@ -16,4 +17,4 @@ def __init__(self, config):
1617
if tmuxp_version:
1718
self.version_constraints['tmuxp']['version'] = tmuxp_version
1819

19-
self._version_check()
20+
self._version_check()

‎tests/fixtures/pluginsystem/partials/tmux_version_fail.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def __init__(self):
66
config = {
77
'plugin_name': 'tmux-min-version-fail',
88
'tmux_min_version': '1.8',
9-
'tmux_version': '1.7'
9+
'tmux_version': '1.7',
1010
}
1111
MyTestTmuxpPluginInterface.__init__(self, config)
1212

@@ -16,7 +16,7 @@ def __init__(self):
1616
config = {
1717
'plugin_name': 'tmux-max-version-fail',
1818
'tmux_max_version': '3.0',
19-
'tmux_version': '3.5'
19+
'tmux_version': '3.5',
2020
}
2121
MyTestTmuxpPluginInterface.__init__(self, config)
2222

@@ -26,7 +26,7 @@ def __init__(self):
2626
config = {
2727
'plugin_name': 'tmux-incompatible-version-fail',
2828
'tmux_version_incompatible': ['2.3'],
29-
'tmux_version': '2.3'
29+
'tmux_version': '2.3',
3030
}
3131

32-
MyTestTmuxpPluginInterface.__init__(self, config)
32+
MyTestTmuxpPluginInterface.__init__(self, config)

‎tests/fixtures/pluginsystem/partials/tmuxp_version_fail.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def __init__(self):
66
config = {
77
'plugin_name': 'tmuxp-min-verion-fail',
88
'tmuxp_min_version': '1.6.0',
9-
'tmuxp_version': '1.5.6'
9+
'tmuxp_version': '1.5.6',
1010
}
1111
MyTestTmuxpPluginInterface.__init__(self, config)
1212

@@ -16,7 +16,7 @@ def __init__(self):
1616
config = {
1717
'plugin_name': 'tmuxp-max-verion-fail',
1818
'tmuxp_max_version': '2.0.0',
19-
'tmuxp_version': '2.5'
19+
'tmuxp_version': '2.5',
2020
}
2121
MyTestTmuxpPluginInterface.__init__(self, config)
2222

@@ -26,6 +26,6 @@ def __init__(self):
2626
config = {
2727
'plugin_name': 'tmuxp-incompatible-verion-fail',
2828
'tmuxp_version_incompatible': ['1.5.0'],
29-
'tmuxp_version': '1.5.0'
29+
'tmuxp_version': '1.5.0',
3030
}
31-
MyTestTmuxpPluginInterface.__init__(self, config)
31+
MyTestTmuxpPluginInterface.__init__(self, config)

‎tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_fail/tmuxp_test_plugin_fail/plugin.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ def __init__(self):
77
'plugin_name': 'tmuxp-plugin-fail-version',
88
'tmuxp_max_version': '0.0.0',
99
}
10-
TmuxpPluginInterface.__init__(self, **config)
10+
TmuxpPluginInterface.__init__(self, **config)

‎tests/test_cli.py‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -982,39 +982,43 @@ def test_load_plugins():
982982
@pytest.mark.skip('Not sure how to clean up the tmux session this makes')
983983
@pytest.mark.parametrize(
984984
"cli_args,inputs",
985-
[(
986-
['load', 'tests/fixtures/workspacebuilder/plugin_versions_fail.yaml'],
987-
['y\n'],
988-
)],
985+
[
986+
(
987+
['load', 'tests/fixtures/workspacebuilder/plugin_versions_fail.yaml'],
988+
['y\n'],
989+
)
990+
],
989991
)
990992
def test_load_plugins_version_fail_skip(cli_args, inputs):
991993
runner = CliRunner()
992994

993-
results = runner.invoke(cli.cli, cli_args, input=''.join(inputs))
995+
results = runner.invoke(cli.cli, cli_args, input=''.join(inputs))
994996
assert '[Loading]' in results.output
995997

996998

997999
@pytest.mark.parametrize(
9981000
"cli_args,inputs",
999-
[(
1000-
['load', 'tests/fixtures/workspacebuilder/plugin_versions_fail.yaml'],
1001-
['n\n'],
1002-
)],
1001+
[
1002+
(
1003+
['load', 'tests/fixtures/workspacebuilder/plugin_versions_fail.yaml'],
1004+
['n\n'],
1005+
)
1006+
],
10031007
)
10041008
def test_load_plugins_version_fail_no_skip(cli_args, inputs):
10051009
runner = CliRunner()
10061010

1007-
results = runner.invoke(cli.cli, cli_args, input=''.join(inputs))
1011+
results = runner.invoke(cli.cli, cli_args, input=''.join(inputs))
10081012
assert '[Not Skipping]' in results.output
10091013

10101014

1011-
@pytest.mark.parametrize("cli_args", [
1012-
(['load', 'tests/fixtures/workspacebuilder/plugin_missing_fail.yaml'])
1013-
])
1015+
@pytest.mark.parametrize(
1016+
"cli_args", [(['load', 'tests/fixtures/workspacebuilder/plugin_missing_fail.yaml'])]
1017+
)
10141018
def test_load_plugins_plugin_missing(cli_args):
10151019
runner = CliRunner()
10161020

1017-
results = runner.invoke(cli.cli, cli_args)
1021+
results = runner.invoke(cli.cli, cli_args)
10181022
assert '[Plugin Error]' in results.output
10191023

10201024

@@ -1043,9 +1047,7 @@ def test_reattach_plugins(server):
10431047

10441048
# open it detached
10451049
builder = WorkspaceBuilder(
1046-
sconf=sconfig,
1047-
plugins=load_plugins(sconfig),
1048-
server=server
1050+
sconf=sconfig, plugins=load_plugins(sconfig), server=server
10491051
)
10501052
builder.build()
10511053

@@ -1056,4 +1058,4 @@ def test_reattach_plugins(server):
10561058

10571059
proc = builder.session.cmd('display-message', '-p', "'#S'")
10581060

1059-
assert proc.stdout[0] == "'plugin_test_r'"
1061+
assert proc.stdout[0] == "'plugin_test_r'"

‎tests/test_plugin.py‎

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,108 +2,101 @@
22
"""Test for tmuxp plugin api."""
33
from __future__ import absolute_import
44

5-
import json
6-
import os
7-
8-
import pytest
9-
10-
import libtmux
11-
from libtmux.common import has_lt_version
12-
from tmuxp.plugin import TmuxpPluginInterface
135
from tmuxp.exc import TmuxpPluginException
146

157
from .fixtures.pluginsystem.partials.all_pass import AllVersionPassPlugin
168
from .fixtures.pluginsystem.partials.tmux_version_fail import (
179
TmuxVersionFailMinPlugin,
1810
TmuxVersionFailMaxPlugin,
19-
TmuxVersionFailIncompatiblePlugin
11+
TmuxVersionFailIncompatiblePlugin,
2012
)
2113
from .fixtures.pluginsystem.partials.libtmux_version_fail import (
2214
LibtmuxVersionFailMinPlugin,
2315
LibtmuxVersionFailMaxPlugin,
24-
LibtmuxVersionFailIncompatiblePlugin
16+
LibtmuxVersionFailIncompatiblePlugin,
2517
)
2618
from .fixtures.pluginsystem.partials.tmuxp_version_fail import (
2719
TmuxpVersionFailMinPlugin,
2820
TmuxpVersionFailMaxPlugin,
29-
TmuxpVersionFailIncompatiblePlugin
21+
TmuxpVersionFailIncompatiblePlugin,
3022
)
3123

3224

3325
def test_all_pass():
3426
try:
35-
plugin = AllVersionPassPlugin()
36-
assert(True)
37-
except TmuxpPluginException as error:
38-
assert(False)
27+
AllVersionPassPlugin()
28+
assert True
29+
except TmuxpPluginException:
30+
assert False
3931

4032

4133
def test_tmux_version_fail_min():
4234
try:
43-
plugin = TmuxVersionFailMinPlugin()
44-
assert(False)
35+
TmuxVersionFailMinPlugin()
36+
assert False
4537
except TmuxpPluginException as error:
46-
assert('Incompatible' in error.__str__())
38+
assert 'Incompatible' in error.__str__()
4739

4840

4941
def test_tmux_version_fail_max():
5042
try:
51-
plugin = TmuxVersionFailMaxPlugin()
52-
assert(False)
43+
TmuxVersionFailMaxPlugin()
44+
assert False
5345
except TmuxpPluginException as error:
54-
assert('Incompatible' in error.__str__())
46+
assert 'Incompatible' in error.__str__()
5547

5648

5749
def test_tmux_version_fail_incompatible():
5850
try:
59-
plugin = TmuxVersionFailIncompatiblePlugin()
60-
assert(False)
51+
TmuxVersionFailIncompatiblePlugin()
52+
assert False
6153
except TmuxpPluginException as error:
62-
assert('Incompatible' in error.__str__())
54+
assert 'Incompatible' in error.__str__()
6355

6456

6557
def test_tmuxp_version_fail_min():
6658
try:
67-
plugin = TmuxpVersionFailMinPlugin()
68-
assert(False)
59+
TmuxpVersionFailMinPlugin()
60+
assert False
6961
except TmuxpPluginException as error:
70-
assert('Incompatible' in error.__str__())
62+
assert 'Incompatible' in error.__str__()
7163

7264

7365
def test_tmuxp_version_fail_max():
7466
try:
75-
plugin = TmuxpVersionFailMaxPlugin()
76-
assert(False)
67+
TmuxpVersionFailMaxPlugin()
68+
assert False
7769
except TmuxpPluginException as error:
78-
assert('Incompatible' in error.__str__())
70+
assert 'Incompatible' in error.__str__()
7971

8072

8173
def test_tmuxp_version_fail_incompatible():
8274
try:
83-
plugin = TmuxpVersionFailIncompatiblePlugin()
84-
assert(False)
75+
TmuxpVersionFailIncompatiblePlugin()
76+
assert False
8577
except TmuxpPluginException as error:
86-
assert('Incompatible' in error.__str__())
78+
assert 'Incompatible' in error.__str__()
79+
8780

8881
def test_libtmux_version_fail_min():
8982
try:
90-
plugin = LibtmuxVersionFailMinPlugin()
91-
assert(False)
83+
LibtmuxVersionFailMinPlugin()
84+
assert False
9285
except TmuxpPluginException as error:
93-
assert('Incompatible' in error.__str__())
86+
assert 'Incompatible' in error.__str__()
9487

9588

9689
def test_libtmux_version_fail_max():
9790
try:
98-
plugin = LibtmuxVersionFailMaxPlugin()
99-
assert(False)
91+
LibtmuxVersionFailMaxPlugin()
92+
assert False
10093
except TmuxpPluginException as error:
101-
assert('Incompatible' in error.__str__())
94+
assert 'Incompatible' in error.__str__()
10295

10396

10497
def test_libtmux_version_fail_incompatible():
10598
try:
106-
plugin = LibtmuxVersionFailIncompatiblePlugin()
107-
assert(False)
99+
LibtmuxVersionFailIncompatiblePlugin()
100+
assert False
108101
except TmuxpPluginException as error:
109-
assert('Incompatible' in error.__str__())
102+
assert 'Incompatible' in error.__str__()

‎tmuxp/cli.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -387,13 +387,13 @@ def load_plugins(sconf):
387387
plugin = getattr(importlib.import_module(module_name), plugin_name)
388388
plugins.append(plugin())
389389
except exc.TmuxpPluginException as error:
390-
if (not click.confirm(
391-
'%sSkip loading %s?'
392-
% (click.style(str(error), fg='yellow'), plugin_name),
393-
default=True
394-
)):
390+
if not click.confirm(
391+
'%sSkip loading %s?'
392+
% (click.style(str(error), fg='yellow'), plugin_name),
393+
default=True,
394+
):
395395
click.echo(
396-
click.style('[Not Skipping] ', fg='yellow')
396+
click.style('[Not Skipping] ', fg='yellow')
397397
+ 'Plugin verions constraint not met. Exiting...'
398398
)
399399
sys.exit(1)
@@ -558,9 +558,7 @@ def load_workspace(
558558

559559
try: # load WorkspaceBuilder object for tmuxp config / tmux server
560560
builder = WorkspaceBuilder(
561-
sconf=sconfig,
562-
plugins=load_plugins(sconfig),
563-
server=t
561+
sconf=sconfig, plugins=load_plugins(sconfig), server=t
564562
)
565563
except exc.EmptyConfigException:
566564
click.echo('%s is empty or parsed no config data' % config_file, err=True)

0 commit comments

Comments
 (0)