Skip to content

Commit 1d8b5e1

Browse files
committed
update warnings
1 parent da861eb commit 1d8b5e1

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

holoviews/core/util/dependencies.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from importlib.util import find_spec
99

1010
_re_no = re.compile(r"\d+")
11+
_convert_int = lambda version_str: tuple(map(int, _re_no.findall(version_str)[:3]))
1112

1213

1314
class VersionError(Exception):
@@ -38,7 +39,7 @@ def _get_version(package_name):
3839
def _no_import_version(package_name) -> tuple[int, int, int]:
3940
"""Get version number without importing the library"""
4041
version_str = _get_version(package_name)
41-
return tuple(map(int, _re_no.findall(version_str)[:3]))
42+
return _convert_int(version_str)
4243

4344

4445
_MIN_SUPPORTED_VERSION = {

holoviews/util/warnings.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import warnings
77

88
import param
9-
from packaging.version import Version
109

1110
__all__ = (
1211
"HoloviewsDeprecationWarning",
@@ -64,16 +63,15 @@ def find_stack_level():
6463

6564
def deprecated(remove_version, old, new=None, extra=None, *, repr_old=True, repr_new=True):
6665
import holoviews as hv
66+
from holoviews.core.util.dependencies import _convert_int
6767

68-
full_version = Version(hv.__version__)
69-
current_version = Version(full_version.base_version)
68+
is_alpha = "a" in hv.__version__
69+
current_version = _convert_int(hv.__version__)
7070

7171
if isinstance(remove_version, str):
72-
remove_version = Version(remove_version)
72+
remove_version = _convert_int(remove_version)
7373

74-
if remove_version <= current_version and not (
75-
full_version.is_prerelease and full_version.pre[0] == "a"
76-
):
74+
if remove_version <= current_version and not is_alpha:
7775
# This error is mainly for developers to remove the deprecated.
7876
raise ValueError(
7977
f"{old!r} should have been removed in {remove_version}, current version {current_version}."

0 commit comments

Comments
 (0)