use packaging.version.Version for version comparison

maestral/cli.py

@@ -80,14 +80,14 @@ def stop_daemon_with_cli_feedback(config_name):
 def _check_for_updates():
     """Checks if updates are available by reading the cached release number from the
     config file and notifies the user."""
+    from packaging.version import Version
     from maestral import __version__
     from maestral.config import MaestralState
-    from maestral.utils.updates import check_version
 
     state = MaestralState('maestral')
     latest_release = state.get('app', 'latest_release')
 
-    has_update = check_version(__version__, latest_release, '<')
+    has_update = Version(__version__) < Version(latest_release)
 
     if has_update:
         click.secho(

maestral/utils/notify.py

@@ -11,6 +11,7 @@ import os
 import time
 import subprocess
 import platform
+from packaging.version import Version
 from enum import Enum
 from pathlib import Path
 import logging
@@ -19,7 +20,6 @@ import click
 
 from maestral.config import MaestralConfig
 from maestral.constants import IS_MACOS_BUNDLE
-from maestral.utils.updates import check_version
 
 if platform.system() == 'Darwin':
     macos_version, *_ = platform.mac_ver()
@@ -212,10 +212,10 @@ class DesktopNotifier:
         )
 
     def _get_available_implementation(self):
-        if IS_MACOS_BUNDLE and check_version(macos_version, '10.14.0', '>='):
+        if IS_MACOS_BUNDLE and Version(macos_version) >= Version('10.14.0'):
             # UNUserNotificationCenter is only supported from signed app bundles
             return SupportedImplementations.notification_center
-        elif platform.system() == 'Darwin' and check_version(macos_version, '10.16.0', '<'):
+        elif platform.system() == 'Darwin' and Version(macos_version) < Version('10.16.0'):
             return SupportedImplementations.legacy_notification_center
         elif self._command_exists('osascript'):
             return SupportedImplementations.osascript

maestral/utils/updates.py

@@ -10,6 +10,7 @@ Attribution-NonCommercial-NoDerivs 2.0 UK: England & Wales License.
 import json
 import re
 import ssl
+from packaging.version import Version
 from distutils.version import LooseVersion
 from urllib.request import urlopen
 from urllib.error import URLError, HTTPError
@@ -21,23 +22,23 @@ from maestral import __version__
 API_URL = "https://api.github.com/repos/samschott/maestral-dropbox/releases"
 
 
-def has_newer_version(version, releases):
-    """Checks current version against a version list of releases to see if an update is
+def get_newer_version(version, releases):
+    """
+    Checks current version against a version list of releases to see if an update is
     available.
 
     :param str version: The current version.
-    :param list[str] releases: A list of valid cleaned releases in chronological order,
-        and the latest release.
+    :param iterable[str] releases: A list of valid cleaned releases.
     :returns: The version string of the latest release if a newer release is available.
     :rtype: str
     """
 
     # filter releases, only offer updates to stable versions
     releases = [r for r in releases if is_stable_version(r)]
-
+    releases.sort(key=lambda x: Version(x))
     latest_release = releases[-1]
 
-    return latest_release if check_version(version, latest_release, '<') else None
+    return latest_release if Version(version) < Version(latest_release) else None
 
 
 def check_update_available(current_version=__version__):
@@ -74,7 +75,7 @@ def check_update_available(current_version=__version__):
             releases_notes = list(reversed(releases_notes))
             release_notes = releases_notes[-1]
 
-            new_version = has_newer_version(current_version, releases)
+            new_version = get_newer_version(current_version, releases)
         except Exception:
             error_msg = "Unable to retrieve information."
     except HTTPError:
@@ -91,60 +92,11 @@ def check_update_available(current_version=__version__):
             "error": error_msg}
 
 
-def check_version(actver, version, cmp_op):
-    """
-    Check version string of an active module against a required version.
-
-    If dev/prerelease tags result in TypeError for string-number comparison,
-    it is assumed that the dependency is satisfied.
-    Users on dev branches are responsible for keeping their own packages up to
-    date.
-
-    Copyright (C) 2013  The IPython Development Team
-
-    Distributed under the terms of the BSD License.
-    """
-    if isinstance(actver, tuple):
-        actver = '.'.join([str(i) for i in actver])
-
-    # Hacks needed so that LooseVersion understands that (for example)
-    # version = '3.0.0' is in fact bigger than actver = '3.0.0rc1'
-    if (is_stable_version(version) and not is_stable_version(actver)
-            and actver.startswith(version) and version != actver):
-        version = version + 'zz'
-    elif (is_stable_version(actver) and not is_stable_version(version)
-          and version.startswith(actver) and version != actver):
-        actver = actver + 'zz'
-
-    try:
-        if cmp_op == '>':
-            return LooseVersion(actver) > LooseVersion(version)
-        elif cmp_op == '>=':
-            return LooseVersion(actver) >= LooseVersion(version)
-        elif cmp_op == '=':
-            return LooseVersion(actver) == LooseVersion(version)
-        elif cmp_op == '<':
-            return LooseVersion(actver) < LooseVersion(version)
-        elif cmp_op == '<=':
-            return LooseVersion(actver) <= LooseVersion(version)
-        else:
-            return False
-    except TypeError:
-        return True
-
-
 def is_stable_version(version):
     """
-    Return true if version is stable, i.e. with letters in the final component.
+    Return true if version is stable.
 
-    Stable version examples: ``1.2``, ``1.3.4``, ``1.0.5``.
+    Stable version examples: ``1.2``, ``1.3.4``, ``1.0.5``, ``1.0.5.post1``.
     Non-stable version examples: ``1.3.4beta``, ``0.1.0rc1``, ``3.0.0dev0``.
     """
-    if not isinstance(version, tuple):
-        version = version.split(".")
-    last_part = version[-1]
-
-    if not re.search(r"[a-zA-Z]", last_part):
-        return True
-    else:
-        return False
+    return not Version(version).is_prerelease

setup.py

@@ -135,6 +135,7 @@ setup(
         'keyring>=19.0.0',
         'keyrings.alt>=3.0.0',
         'lockfile',
+        'packaging',
         'Pyro5>=5.7',
         'requests',
         'rubicon-objc>=0.3.1;sys_platform=="darwin"',