mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-17 05:41:25 +02:00
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/
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user