From 28c16b42547fc4f7d87a4802b4fa2b203f7d0ff2 Mon Sep 17 00:00:00 2001 From: Joey Payne Date: Fri, 10 Apr 2015 08:03:27 -0600 Subject: [PATCH] Added better version sorting thanks to jerone. Sorting versions now works, with major releases ahead of rc, alpha, beta releases. --- command_line.py | 8 +++++--- files/nw-versions.txt | 6 +++--- requirements.txt | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/command_line.py b/command_line.py index 98c67a5..d9fe3d9 100644 --- a/command_line.py +++ b/command_line.py @@ -19,7 +19,7 @@ import subprocess import logging import plistlib -from distutils.version import LooseVersion +from semantic_version import Version from zipfile import ZipFile from tarfile import TarFile @@ -343,8 +343,10 @@ class CommandBase(object): old_versions = set(nw_version.values) new_versions = set(re.findall('(\S+) / \S+', html)) - versions = sorted(list(old_versions.union(new_versions)), - key=LooseVersion, reverse=True) + union_versions = list(old_versions.union(new_versions)) + + versions = sorted(union_versions, + key=Version, reverse=True) nw_version.values = versions f = None diff --git a/files/nw-versions.txt b/files/nw-versions.txt index 9a7b27e..6fb6ce8 100644 --- a/files/nw-versions.txt +++ b/files/nw-versions.txt @@ -1,21 +1,21 @@ +0.12.0 0.12.0-rc1 0.12.0-alpha3 0.12.0-alpha2 0.12.0-alpha1 -0.12.0 0.11.3 0.11.2 0.11.1 -0.11.0-rc1 0.11.0 +0.11.0-rc1 0.10.5 0.10.4 0.10.3 0.10.2 0.10.1 +0.10.0 0.10.0-rc2 0.10.0-rc1 -0.10.0 0.9.2 0.9.1 0.9.0 diff --git a/requirements.txt b/requirements.txt index 2da57bf..036d64e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,5 @@ pillow +qt pyside configobj +semantic_version