summaryrefslogtreecommitdiffstats
path: root/python/mozrelease
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-08 15:12:12 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-08 15:12:12 +0000
commita7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431 (patch)
tree54617b4f5f04ee87a2c9e3b97cc88b8626859124 /python/mozrelease
parentReleasing progress-linux version 115.7.0esr-1~deb12u1progress7u1. (diff)
downloadfirefox-esr-a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431.tar.xz
firefox-esr-a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431.zip
Merging upstream version 115.8.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'python/mozrelease')
-rw-r--r--python/mozrelease/mozrelease/versions.py56
-rw-r--r--python/mozrelease/test/test_versions.py21
2 files changed, 73 insertions, 4 deletions
diff --git a/python/mozrelease/mozrelease/versions.py b/python/mozrelease/mozrelease/versions.py
index e3e47d4e4a..348b77bd75 100644
--- a/python/mozrelease/mozrelease/versions.py
+++ b/python/mozrelease/mozrelease/versions.py
@@ -3,9 +3,59 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
import re
-from distutils.version import StrictVersion
from looseversion import LooseVersion
+from packaging.version import InvalidVersion
+
+
+class StrictVersion:
+ def __init__(self, vstring):
+ self.parse(vstring)
+
+ def __repr__(self):
+ return "%s ('%s')" % (self.__class__.__name__, str(self))
+
+ def __eq__(self, other):
+ return self._cmp(other) == 0
+
+ def __lt__(self, other):
+ return self._cmp(other) < 0
+
+ def parse(self, vstring):
+ match = self.version_re.match(vstring)
+ if not match:
+ raise InvalidVersion("invalid version number '%s'" % vstring)
+
+ major, minor, patch, pre, pre_num = match.group(1, 2, 4, 5, 6)
+ self.version = int(major), int(minor), int(patch or 0)
+ self.pre = (pre[0], int(pre_num)) if pre else ()
+
+ def __str__(self):
+ return ".".join(map(str, self.version)) + (
+ "".join(map(str, self.pre)) if self.pre else ""
+ )
+
+ def _cmp(self, other):
+ if isinstance(other, str):
+ other = StrictVersion(other)
+ elif not isinstance(other, StrictVersion):
+ raise NotImplementedError
+
+ if self.version < other.version:
+ return -1
+ elif self.version == other.version:
+ if self.pre == other.pre:
+ return 0
+ elif not self.pre:
+ return 1
+ elif not other.pre:
+ return -1
+ elif self.pre < other.pre:
+ return -1
+ else:
+ return 1
+ else:
+ return 1
class MozillaVersionCompareMixin:
@@ -93,12 +143,12 @@ class LooseModernMozillaVersion(MozillaVersionCompareMixin, LooseVersion):
def MozillaVersion(version):
try:
return ModernMozillaVersion(version)
- except ValueError:
+ except InvalidVersion:
pass
try:
if version.count(".") == 3:
return AncientMozillaVersion(version)
- except ValueError:
+ except InvalidVersion:
pass
try:
return LooseModernMozillaVersion(version)
diff --git a/python/mozrelease/test/test_versions.py b/python/mozrelease/test/test_versions.py
index f3bca91f1f..eaf7d653db 100644
--- a/python/mozrelease/test/test_versions.py
+++ b/python/mozrelease/test/test_versions.py
@@ -1,7 +1,11 @@
import mozunit
import pytest
-from mozrelease.versions import MozillaVersion
+from mozrelease.versions import (
+ AncientMozillaVersion,
+ ModernMozillaVersion,
+ MozillaVersion,
+)
ALL_VERSIONS = [ # Keep this sorted
"3.0",
@@ -91,6 +95,21 @@ def test_versions_compare_greater(comparable_versions):
assert MozillaVersion(larger_version) > MozillaVersion(smaller_version)
+def test_ModernMozillaVersion():
+ """Test properties specific to ModernMozillaVersion"""
+ assert isinstance(MozillaVersion("1.2.4"), ModernMozillaVersion)
+ assert isinstance(MozillaVersion("1.2.4rc3"), ModernMozillaVersion)
+ assert MozillaVersion("1.2rc3") == MozillaVersion("1.2.0rc3")
+
+
+def test_AncientMozillaVersion():
+ """Test properties specific to AncientMozillaVersion"""
+ assert isinstance(MozillaVersion("1.2.0.4"), AncientMozillaVersion)
+ assert isinstance(MozillaVersion("1.2.0.4pre1"), AncientMozillaVersion)
+ assert MozillaVersion("1.2pre1") == MozillaVersion("1.2.0pre1")
+ assert MozillaVersion("1.2.0.4pre1") == MozillaVersion("1.2.4pre1")
+
+
@pytest.mark.parametrize("version", ALL_VERSIONS)
def test_versions_compare_equal(version):
"""Test that versions properly compare as equal through multiple passes."""