diff --git a/.travis.yml b/.travis.yml index 47cdd3f43d..953d6c6290 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ env: - RETRY_TIMEOUT_SECONDS=15 matrix: - TMUX_VERSION=master + - TMUX_VERSION=2.8 + - TMUX_VERSION=2.7 - TMUX_VERSION=2.6 - TMUX_VERSION=2.5 - TMUX_VERSION=2.4 diff --git a/requirements/base.txt b/requirements/base.txt index 3d611d1b92..9f971298a9 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ kaptan>=0.5.10 -libtmux==0.8.0 +libtmux==0.8.1 click>=7<8 colorama>=0.3.9 diff --git a/tests/test_workspacebuilder.py b/tests/test_workspacebuilder.py index f25498eae7..6085ea46d4 100644 --- a/tests/test_workspacebuilder.py +++ b/tests/test_workspacebuilder.py @@ -213,8 +213,8 @@ def test_global_options(session): builder = WorkspaceBuilder(sconf=sconfig) builder.build(session=session) - assert "top" in s.show_option('status-position', g=True) - assert 493 == s.show_option('repeat-time', g=True) + assert "top" in s.show_option('status-position', _global=True) + assert 493 == s.show_option('repeat-time', _global=True) def test_global_session_env_options(session, monkeypatch): @@ -234,7 +234,7 @@ def test_global_session_env_options(session, monkeypatch): builder = WorkspaceBuilder(sconf=sconfig) builder.build(session=session) - assert visual_silence in s.show_option('visual-silence', g=True) + assert visual_silence in s.show_option('visual-silence', _global=True) assert repeat_time == s.show_option('repeat-time') assert main_pane_height == s.attached_window.show_window_option('main-pane-height') diff --git a/tmuxp/workspacebuilder.py b/tmuxp/workspacebuilder.py index 37df61850b..2cb3649260 100644 --- a/tmuxp/workspacebuilder.py +++ b/tmuxp/workspacebuilder.py @@ -172,7 +172,7 @@ def build(self, session=None): self.session.set_option(option, value) if 'global_options' in self.sconf: for option, value in self.sconf['global_options'].items(): - self.session.set_option(option, value, g=True) + self.session.set_option(option, value, _global=True) if 'environment' in self.sconf: for option, value in self.sconf['environment'].items(): self.session.set_environment(option, value)