refactor: use packaging instead of distutil (#700)

jina-ai · Apr 30, 2022 · 050c34e · 050c34e
1 parent d2c2c87
commit 050c34e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/client/clip_client/helper.py b/client/clip_client/helper.py
@@ -1,7 +1,7 @@
 import json
 import sys
 import threading
-from distutils.version import LooseVersion
+from packaging.version import Version
 from urllib.request import Request, urlopen
 
 import pkg_resources
@@ -17,7 +17,7 @@ def _version_check(package: str = None, github_repo: str = None):
         if not github_repo:
             github_repo = package
 
-        cur_ver = LooseVersion(pkg_resources.get_distribution(package).version)
+        cur_ver = Version(pkg_resources.get_distribution(package).version)
         req = Request(
             f'https://pypi.python.org/pypi/{package}/json',
             headers={'User-Agent': 'Mozilla/5.0'},
@@ -27,9 +27,9 @@ def _version_check(package: str = None, github_repo: str = None):
         ) as resp:  # 'with' is important to close the resource after use
             j = json.load(resp)
             releases = j.get('releases', {})
-            latest_release_ver = list(
-                sorted(LooseVersion(v) for v in releases.keys() if '.dev' not in v)
-            )[-1]
+            latest_release_ver = max(
+                Version(v) for v in releases.keys() if '.dev' not in v
+            )
             if cur_ver < latest_release_ver:
                 print(
                     Panel(

diff --git a/client/setup.py b/client/setup.py
@@ -41,7 +41,7 @@
     long_description_content_type='text/markdown',
     zip_safe=False,
     setup_requires=['setuptools>=18.0', 'wheel'],
-    install_requires=['jina>=3.2.10', 'docarray[common]>=0.10.3'],
+    install_requires=['jina>=3.3.21', 'docarray[common]>=0.10.3', 'packaging'],
     extras_require={
         'test': [
             'pytest',

diff --git a/server/clip_server/helper.py b/server/clip_server/helper.py
@@ -2,7 +2,7 @@
 import os
 import sys
 import threading
-from distutils.version import LooseVersion
+from packaging.version import Version
 from urllib.request import Request, urlopen
 
 import pkg_resources
@@ -27,7 +27,7 @@ def _version_check(package: str = None, github_repo: str = None):
         if not github_repo:
             github_repo = package
 
-        cur_ver = LooseVersion(pkg_resources.get_distribution(package).version)
+        cur_ver = Version(pkg_resources.get_distribution(package).version)
         req = Request(
             f'https://pypi.python.org/pypi/{package}/json',
             headers={'User-Agent': 'Mozilla/5.0'},
@@ -37,9 +37,9 @@ def _version_check(package: str = None, github_repo: str = None):
         ) as resp:  # 'with' is important to close the resource after use
             j = json.load(resp)
             releases = j.get('releases', {})
-            latest_release_ver = list(
-                sorted(LooseVersion(v) for v in releases.keys() if '.dev' not in v)
-            )[-1]
+            latest_release_ver = max(
+                Version(v) for v in releases.keys() if '.dev' not in v
+            )
             if cur_ver < latest_release_ver:
                 print(
                     Panel(

diff --git a/server/setup.py b/server/setup.py
@@ -46,8 +46,9 @@
         'torch',
         'regex',
         'torchvision',
-        'jina>=3.2.10',
+        'jina>=3.3.21',
         'docarray>=0.11.0',
+        'packaging',
     ],
     extras_require={
         'onnx': [