diff --git a/CHANGES b/CHANGES index 0220168fc69..bc81ae46999 100644 --- a/CHANGES +++ b/CHANGES @@ -17,6 +17,8 @@ $ pipx install --suffix=@next 'tmuxp' --pip-args '\--pre' --force ## tmuxp 1.19.x (unreleased) + + ### What's new - Environment variables for windows / panes (#845) @@ -48,7 +50,14 @@ $ pipx install --suffix=@next 'tmuxp' --pip-args '\--pre' --force Credit: @zappolowski - +### Internal + +- Update libtmux 0.15.9 -> 0.16.0 + + - Support for environmental variables + - Remove reliance on `distutils.version.LooseVersion` for + `libtmux._compat.LegacyVersion` +- Fix distutil warnings by using libtmux 0.16.0's `LegacyVersion` (#727) ## tmuxp 1.18.2 (2022-11-06) diff --git a/setup.cfg b/setup.cfg index 1f5ab19430e..0f4afdc9f3d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,9 +18,7 @@ line_length = 88 [tool:pytest] filterwarnings = - ignore:distutils Version classes are deprecated. Use packaging.version instead. ignore:The frontend.Option(Parser)? class.*:DeprecationWarning:: - addopts = --reruns=0 --tb=short --no-header --showlocals --doctest-modules doctest_optionflags = ELLIPSIS NORMALIZE_WHITESPACE testpaths = diff --git a/src/tmuxp/plugin.py b/src/tmuxp/plugin.py index 9d4e0f46488..d6af25fe3ae 100644 --- a/src/tmuxp/plugin.py +++ b/src/tmuxp/plugin.py @@ -1,6 +1,5 @@ -from distutils.version import LooseVersion - import libtmux +from libtmux._compat import LegacyVersion as Version from libtmux.common import get_version from .__about__ import __version__ @@ -84,7 +83,7 @@ def __init__( # Dependency versions self.tmux_version = get_version() self.libtmux_version = libtmux.__version__ - self.tmuxp_version = LooseVersion(__version__) + self.tmuxp_version = Version(__version__) self.version_constraints = { "tmux": { @@ -135,9 +134,9 @@ def _pass_version_check(self, version, vmin, vmax, incompatible): """ Provide affirmative if version compatibility is correct. """ - if vmin and version < LooseVersion(vmin): + if vmin and version < Version(vmin): return False - if vmax and version > LooseVersion(vmax): + if vmax and version > Version(vmax): return False if version in incompatible: return False