From e8debf4e4392013e1845313a8e284a3df672461a Mon Sep 17 00:00:00 2001 From: Andrew Fyfe Date: Fri, 12 Jan 2018 16:15:58 +0000 Subject: [PATCH] use setuptools parse_version for version comparision adds support for version strings conformin to PEP 440 See https://www.python.org/dev/peps/pep-0440/ --- modoboa/core/utils.py | 13 ++++++------- requirements.txt | 1 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modoboa/core/utils.py b/modoboa/core/utils.py index 43af52c8d..4ef209dae 100644 --- a/modoboa/core/utils.py +++ b/modoboa/core/utils.py @@ -2,10 +2,9 @@ from __future__ import unicode_literals -from django.utils.translation import ugettext as _ +from pkg_resources import parse_version -from versionfield.constants import DEFAULT_NUMBER_BITS -from versionfield.version import Version +from django.utils.translation import ugettext as _ from modoboa.core.extensions import exts_pool from modoboa.lib.api_client import ModoAPIClient @@ -38,15 +37,15 @@ def check_for_updates(request): }] + extensions update_avail = False for extension in extensions: - local_version = Version(extension["version"], DEFAULT_NUMBER_BITS) pkgname = extension["name"].replace("_", "-") for api_extension in local_config.api_versions: if api_extension["name"] != pkgname: continue - last_version = Version( - api_extension["version"], DEFAULT_NUMBER_BITS) extension["last_version"] = api_extension["version"] - if last_version > local_version: + if ( + parse_version(api_extension["version"]) + > parse_version(extension["version"]) + ): extension["update"] = True extension["changelog_url"] = api_extension["url"] update_avail = True diff --git a/requirements.txt b/requirements.txt index 96dfe8d44..05e90244e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,6 @@ django-braces==1.11.0 django-ckeditor==5.2.2 django-reversion==2.0.12 django-subcommand2==0.1.1 -django-versionfield2>=0.5.0 django-xforwardedfor-middleware==2.0 dj-database-url