Move from distutils to packaging

BrewPiProcess.py

@@ -35,11 +35,11 @@
 import os
 import sys
 from time import sleep
-from distutils.version import LooseVersion
+from packaging import version
 
 try:
     import psutil
-    if LooseVersion(psutil.__version__) < LooseVersion("2.0"):
+    if version.parse(psutil.__version__) < version.parse("2.0"):
         print("Your version of pstuil is %s \n" \
         "BrewPi requires psutil 2.0 or higher, please upgrade your version of psutil.\n" \
         "This can best be done via pip, please run:\n" \

MigrateSettings.py

@@ -31,7 +31,7 @@
 # license and credits.
 
 from collections import namedtuple, OrderedDict
-from distutils.version import LooseVersion
+from packaging import version
 import unittest
 
 # SetttingMigrate containes 3 values:
@@ -102,8 +102,8 @@ def getKeyValuePairs(self, oldSettings, oldVersion, newVersion):
         for setting in self.restoreValidity:
             for oldKey in [setting.key] + setting.aliases:
                 if oldKey in oldSettingsCopy:
-                    if (LooseVersion(oldVersion) >= LooseVersion(setting.minVersion) and
-                            LooseVersion(newVersion) <= LooseVersion(setting.maxVersion)):
+                    if (version.parse(oldVersion) >= version.parse(setting.minVersion) and
+                            version.parse(newVersion) <= version.parse(setting.maxVersion)):
                         keyValuePairs[setting.key] = oldSettingsCopy.pop(oldKey)
                         break
         return keyValuePairs, oldSettingsCopy

brewpiVersion.py

@@ -34,7 +34,7 @@
 import simplejson as json
 import sys
 import time
-from distutils.version import LooseVersion
+from packaging import version
 from BrewPiUtil import asciiToUnicode
 from serial import SerialException
 
@@ -131,7 +131,7 @@ class AvrInfo:
                 board_esp8266: "ESP8266"}
 
     def __init__(self, s=None):
-        self.version = LooseVersion("0.0.0")
+        self.version = version.parse("0.0.0")
         self.build = 0
         self.commit = None
         self.simulator = False
@@ -186,7 +186,7 @@ def parseJsonVersion(self, s):
             self.commit = j[AvrInfo.commit]
 
     def parseStringVersion(self, s):
-        self.version = LooseVersion(s)
+        self.version = version.parse(s)
 
     def toString(self):
         if self.version:
@@ -217,10 +217,10 @@ def toExtendedString(self):
         return string
 
     def isNewer(self, versionString):
-        return self.version < LooseVersion(versionString)
+        return self.version < version.parse(versionString)
 
     def isEqual(self, versionString):
-        return self.version == LooseVersion(versionString)
+        return self.version == version.parse(versionString)
 
     def familyName(self):
         family = AvrInfo.families.get(self.board)

gitHubReleases.py

@@ -37,7 +37,6 @@
 import pwd
 import grp
 import stat
-from distutils.version import LooseVersion
 
 repo = "https://api.github.com/repos/lbussy/brewpi-firmware-rmx"
 

requirements.txt

@@ -6,3 +6,4 @@ aioblescan==0.2.6
 GitPython==3.1.11
 pyserial==3.5
 numpy==1.16.2
+packaging==20.9

tests/versionTest.py

@@ -1,11 +1,16 @@
+#!/usr/bin/env python3
+
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.abspath(__file__)) + "/..") # append parent directory to be able to import files
 import unittest
 from brewpiVersion import AvrInfo
-from distutils.version import LooseVersion
+from packaging import version
 
 
 class VersionTestCase(unittest.TestCase):
     def assertVersionEqual(self, v, versionString):
-        self.assertEqual(v.version, LooseVersion(versionString))
+        self.assertEqual(v.version, version.parse(versionString))
         self.assertEqual(versionString, v.toString())
 
     def assertEmptyVersion(self, v):