1*4882a593SmuzhiyunFrom 96e8f0b2d13e890d9ffff8673f18dcc94290efb2 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Tim Orling <tim.orling@konsulko.com> 3*4882a593SmuzhiyunDate: Thu, 13 Jan 2022 20:06:33 -0600 4*4882a593SmuzhiyunSubject: [PATCH] setup.py: StrictVersion -> packaging.version.* 5*4882a593Smuzhiyun 6*4882a593Smuzhiyundistutils is deprecated in Python 3.10 and will be removed in Python 7*4882a593Smuzhiyun3.12 [1] 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunThe recommended replacement for distutils.version is to use 10*4882a593Smuzhiyunpackaging.version 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunStrictVersion can be replaced by packaging.version.Version and helpers 13*4882a593Smuzhiyunlike packaging.version.parse() 14*4882a593Smuzhiyun 15*4882a593Smuzhiyun[1] https://www.python.org/dev/peps/pep-0632/ 16*4882a593Smuzhiyun[2] https://packaging.pypa.io/en/latest/version.html 17*4882a593Smuzhiyun 18*4882a593SmuzhiyunUpstream-Status: Submitted [https://github.com/gammu/python-gammu/pull/67] 19*4882a593Smuzhiyun 20*4882a593SmuzhiyunSigned-off-by: Tim Orling <tim.orling@konsulko.com> 21*4882a593Smuzhiyun--- 22*4882a593Smuzhiyun setup.py | 6 +++--- 23*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 3 deletions(-) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/setup.py b/setup.py 26*4882a593Smuzhiyunindex a458181..bffb09d 100755 27*4882a593Smuzhiyun--- a/setup.py 28*4882a593Smuzhiyun+++ b/setup.py 29*4882a593Smuzhiyun@@ -30,7 +30,7 @@ import os 30*4882a593Smuzhiyun import platform 31*4882a593Smuzhiyun import subprocess 32*4882a593Smuzhiyun import sys 33*4882a593Smuzhiyun-from distutils.version import StrictVersion 34*4882a593Smuzhiyun+from packaging.version import parse, Version 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun from setuptools import Extension, setup 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun@@ -112,9 +112,9 @@ class GammuConfig: 39*4882a593Smuzhiyun with open(self.config_path(self.path)) as handle: 40*4882a593Smuzhiyun for line in handle: 41*4882a593Smuzhiyun if line.startswith("#define GAMMU_VERSION "): 42*4882a593Smuzhiyun- version = line.split('"')[1] 43*4882a593Smuzhiyun+ version = parse(line.split('"')[1]) 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun- if version is None or StrictVersion(version) < StrictVersion(GAMMU_REQUIRED): 46*4882a593Smuzhiyun+ if version is None or version < parse(GAMMU_REQUIRED): 47*4882a593Smuzhiyun print("Too old Gammu version, please upgrade!") 48*4882a593Smuzhiyun sys.exit(100) 49*4882a593Smuzhiyun 50