Skip to content

Commit 0c7f8c4

Browse files
sloriatony
authored andcommitted
Fix has_required_tmux_version when latest tmux HEAD is installed (#25)
When the latest tmux is installed, `tmux -V` returns 'tmux master', which wasn't properly handled by has_required_tmux_version(). Closes tmux-python/tmuxp#199
1 parent 2f8a925 commit 0c7f8c4

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

libtmux/common.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,10 @@ def has_required_tmux_version(version=None):
412412

413413
version = proc.stdout[0].split('tmux ')[1]
414414

415+
# Allow latest tmux HEAD
416+
if version == 'master':
417+
return version
418+
415419
version = re.sub(r'[a-z]', '', version)
416420

417421
if StrictVersion(version) <= StrictVersion("1.7"):

tests/test_common.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from libtmux.common import has_required_tmux_version, which, session_check_name, is_version
99
from libtmux.exc import LibTmuxException, BadSessionName
1010

11-
version_regex = re.compile(r'[0-9]\.[0-9]')
11+
version_regex = re.compile(r'([0-9]\.[0-9])|(master)')
1212

1313

1414
def test_no_arg_uses_tmux_version():
@@ -17,6 +17,11 @@ def test_no_arg_uses_tmux_version():
1717
assert version_regex.match(result) is not None
1818

1919

20+
def test_allows_master_version():
21+
result = has_required_tmux_version('master')
22+
assert version_regex.match(result) is not None
23+
24+
2025
def test_ignores_letter_versions():
2126
"""Ignore letters such as 1.8b.
2227

0 commit comments

Comments
 (0)