c8359d
# HG changeset patch
c8359d
# User Daniel <daniel@thunderbird.net>
c8359d
# Date 1658184582 0
c8359d
#      Mon Jul 18 22:49:42 2022 +0000
c8359d
# Node ID 9998ed5c2bcee289b03828eba670053614fa26da
c8359d
# Parent  e572bc3cfa07492189aec439e98378b0811ae3bb
c8359d
Bug 1753683 - Replace distutils (deprecated) with packaging. r=rjl
c8359d
c8359d
Differential Revision: https://phabricator.services.mozilla.com/D152123
c8359d
c8359d
diff --git a/comm/python/thirdroc/thirdroc/__init__.py b/comm/python/thirdroc/thirdroc/__init__.py
c8359d
--- a/comm/python/thirdroc/thirdroc/__init__.py
c8359d
+++ b/comm/python/thirdroc/thirdroc/__init__.py
c8359d
@@ -3,11 +3,11 @@
c8359d
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
c8359d
 
c8359d
 from __future__ import print_function, absolute_import
c8359d
 
c8359d
 import re
c8359d
-from distutils.version import StrictVersion
c8359d
+from packaging.version import parse
c8359d
 
c8359d
 VTAG_RE = re.compile(r"^v\d+\.\d+\.\d+$")
c8359d
 
c8359d
 
c8359d
 def tag2version(tag):
c8359d
@@ -22,16 +22,16 @@ def tag2version(tag):
c8359d
         raise Exception("Invalid tag {}".format(tag))
c8359d
 
c8359d
 
c8359d
 def get_latest_version(*versions):
c8359d
     """
c8359d
-    Given a list of versions (that must parse with distutils.version.StrictVersion,
c8359d
+    Given a list of versions (that must parse with packaging.version.parse),
c8359d
     return the latest/newest version.
c8359d
     :param list versions:
c8359d
-    :return StrictVersion:
c8359d
+    :return Version:
c8359d
     """
c8359d
-    version_list = [StrictVersion(tag2version(v)) for v in versions]
c8359d
+    version_list = [parse(tag2version(v)) for v in versions]
c8359d
     version_list.sort()
c8359d
     return version_list[-1]
c8359d
 
c8359d
 
c8359d
 def latest_version(*versions):
c8359d
diff --git a/comm/python/thirdroc/thirdroc/rnp.py b/comm/python/thirdroc/thirdroc/rnp.py
c8359d
--- a/comm/python/thirdroc/thirdroc/rnp.py
c8359d
+++ b/comm/python/thirdroc/thirdroc/rnp.py
c8359d
@@ -6,11 +6,11 @@ from __future__ import absolute_import
c8359d
 
c8359d
 import os
c8359d
 from io import StringIO
c8359d
 from datetime import date
c8359d
 import re
c8359d
-from distutils.version import StrictVersion
c8359d
+from packaging.version import parse
c8359d
 
c8359d
 from mozbuild.preprocessor import Preprocessor
c8359d
 
c8359d
 
c8359d
 def rnp_source_update(rnp_root, version_str, revision, timestamp, bug_report):
c8359d
@@ -21,14 +21,14 @@ def rnp_source_update(rnp_root, version_
c8359d
     :param string version_str: latest version
c8359d
     :param string revision: revision hash (short form)
c8359d
     :param float timestamp: UNIX timestamp from revision
c8359d
     :param string bug_report: where to report bugs for this RNP build
c8359d
     """
c8359d
-    version = StrictVersion(version_str)
c8359d
-    version_major = version.version[0]
c8359d
-    version_minor = version.version[1]
c8359d
-    version_patch = version.version[2]
c8359d
+    version = parse(version_str)
c8359d
+    version_major = version.major
c8359d
+    version_minor = version.minor
c8359d
+    version_patch = version.micro
c8359d
     date_str = date.fromtimestamp(float(timestamp)).strftime("%Y%m%d")
c8359d
     revision_short = revision[:8]
c8359d
     version_full = "{}+git{}.{}.MZLA".format(version_str, date_str, revision_short)
c8359d
 
c8359d
     defines = dict(