Fix the version parsing with third-party tool (skypilot-org#1049)

* version parsing

* format

* format

* update setup

* address comments

Author: Michaelvll

sky/backends/backend_utils.py

@@ -21,6 +21,7 @@
 import filelock
 import jinja2
 import jsonschema
+from packaging import version
 import psutil
 import requests
 from requests import adapters
@@ -628,7 +629,7 @@ def write_cluster_config(to_provision: 'resources.Resources',
                 # Sky remote utils.
                 'sky_remote_path': SKY_REMOTE_PATH,
                 'sky_local_path': str(local_wheel_path),
-                'sky_version': common_utils.normalize_version(sky.__version__),
+                'sky_version': str(version.parse(sky.__version__)),
                 # Local IP handling (optional).
                 'head_ip': None if ip_list is None else ip_list[0],
                 'worker_ips': None if ip_list is None else ip_list[1:],

sky/backends/wheel_utils.py

@@ -8,10 +8,10 @@
 from typing import Optional
 
 import filelock
+from packaging import version
 
 import sky
 from sky.backends import backend_utils
-from sky.utils import common_utils
 
 # Local wheel path is same as the remote path.
 WHEEL_DIR = pathlib.Path(os.path.expanduser(backend_utils.SKY_REMOTE_PATH))
@@ -37,13 +37,14 @@ def cleanup_wheels_dir(wheel_dir: pathlib.Path,
 
 
 def _get_latest_built_wheel() -> pathlib.Path:
+    wheel_name = (f'{_PACKAGE_WHEEL_NAME}-'
+                  f'{version.parse(sky.__version__)}-*.whl')
     try:
-        latest_wheel = max(WHEEL_DIR.glob(
-            f'{_PACKAGE_WHEEL_NAME}-'
-            f'{common_utils.normalize_version(sky.__version__)}-*.whl'),
-                           key=os.path.getctime)
+        latest_wheel = max(WHEEL_DIR.glob(wheel_name), key=os.path.getctime)
     except ValueError:
-        raise FileNotFoundError('Could not find built Sky wheels.') from None
+        raise FileNotFoundError(
+            f'Could not find built SkyPilot wheels {wheel_name!r} '
+            f'under {WHEEL_DIR!r}') from None
     return latest_wheel
 
 

sky/setup_files/setup.py

@@ -74,6 +74,7 @@ def parse_footnote(readme: str) -> str:
     # `Fork support is only compatible with the epoll1 and poll
     # polling strategies`
     'grpcio<=1.43.0',
+    'packaging',
     # The latest 4.21.1 will break ray. Enforce < 4.0.0 until Ray releases the
     # fix.
     # https://github.com/ray-project/ray/pull/25211

sky/utils/common_utils.py

@@ -183,8 +183,3 @@ def method_with_retries(*args, **kwargs):
                     raise
 
     return method_with_retries
-
-
-def normalize_version(version: str) -> str:
-    """Normalize a version string."""
-    return version.replace('-dev', '.dev')