From 404f09d7239246b37414d5d6af54533eaa590f85 Mon Sep 17 00:00:00 2001
From: Andreas Motl <andreas.motl@crate.io>
Date: Thu, 18 Jan 2024 00:11:25 +0100
Subject: [PATCH] Use `verlib2.Version` instead of
 `crate.client._pep440.Version`

Instead of vendoring `Version` from `packaging`, pull it in via shared
library `verlib2`.

-- https://github.com/pyveci/verlib2
---
 crate/crash/command.py  | 3 ++-
 crate/crash/commands.py | 2 +-
 crate/crash/sysinfo.py  | 2 +-
 setup.py                | 3 ++-
 tests/test_command.py   | 3 ++-
 tests/test_commands.py  | 3 ++-
 tests/test_sysinfo.py   | 3 ++-
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/crate/crash/command.py b/crate/crash/command.py
index 0d6b6662..9e437aeb 100644
--- a/crate/crash/command.py
+++ b/crate/crash/command.py
@@ -39,9 +39,10 @@
 from urllib3.exceptions import LocationParseError
 
 from crate.client import connect
-from crate.client._pep440 import Version
 from crate.client.exceptions import ConnectionError, ProgrammingError
 
+from verlib2 import Version
+
 from ..crash import __version__ as crash_version
 from .commands import Command, built_in_commands
 from .config import Configuration, ConfigurationError
diff --git a/crate/crash/commands.py b/crate/crash/commands.py
index ab6d7082..ca011d4e 100644
--- a/crate/crash/commands.py
+++ b/crate/crash/commands.py
@@ -21,7 +21,7 @@
 import os
 from collections import OrderedDict
 
-from crate.client._pep440 import Version
+from verlib2 import Version
 
 
 class Command(object):
diff --git a/crate/crash/sysinfo.py b/crate/crash/sysinfo.py
index e3f7a050..db044bdd 100644
--- a/crate/crash/sysinfo.py
+++ b/crate/crash/sysinfo.py
@@ -23,7 +23,7 @@
 
 from collections import namedtuple
 
-from crate.client._pep440 import Version
+from verlib2 import Version
 
 Result = namedtuple('Result', ['rows', 'cols'])
 SYSINFO_MIN_VERSION = Version("0.54.0")
diff --git a/setup.py b/setup.py
index be9aa2f6..ef9fc98b 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,8 @@
     'platformdirs<5',
     'prompt-toolkit>=3.0,<4',
     'tabulate>=0.9,<0.10',
-    'sqlparse>=0.4.4,<0.5.0'
+    'sqlparse>=0.4.4,<0.5.0',
+    'verlib2<0.3',
 ]
 
 
diff --git a/tests/test_command.py b/tests/test_command.py
index 2e26aef7..5412ce7a 100644
--- a/tests/test_command.py
+++ b/tests/test_command.py
@@ -3,7 +3,8 @@
 
 from unittest import TestCase
 
-from crate.client._pep440 import Version
+from verlib2 import Version
+
 from crate.crash.command import (
     Result,
     get_information_schema_query,
diff --git a/tests/test_commands.py b/tests/test_commands.py
index 55804eba..b021d0a8 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -26,7 +26,8 @@
 from unittest import SkipTest, TestCase
 from unittest.mock import MagicMock, call, patch
 
-from crate.client._pep440 import Version
+from verlib2 import Version
+
 from crate.crash.command import CrateShell
 from crate.crash.commands import (
     CheckCommand,
diff --git a/tests/test_sysinfo.py b/tests/test_sysinfo.py
index be51c78a..4e196e00 100644
--- a/tests/test_sysinfo.py
+++ b/tests/test_sysinfo.py
@@ -24,7 +24,8 @@
 from unittest import TestCase
 from unittest.mock import PropertyMock, patch
 
-from crate.client._pep440 import Version
+from verlib2 import Version
+
 from crate.crash.command import CrateShell
 from crate.crash.sysinfo import Result as Res, SysInfoCommand