From eeab09eacb973ad904a5d581d5a9449775f7f223 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Mon, 18 Oct 2021 08:50:13 -0400 Subject: [PATCH] fix deprecated package in a_atleast_b.py --- .github/workflows/build.yml | 1 + src/tools/a_atleast_b.py | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 353b3334..9c2407f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -215,6 +215,7 @@ jobs: - name: Basic Tests build jobs only if: matrix.goal != 'test' run: | + $pip install packaging export vline=$($gam version | grep "Python ") export python_line=($vline) export this_python=${python_line[1]} diff --git a/src/tools/a_atleast_b.py b/src/tools/a_atleast_b.py index 9f9a0b77..280f9fc5 100755 --- a/src/tools/a_atleast_b.py +++ b/src/tools/a_atleast_b.py @@ -1,13 +1,11 @@ #!/usr/bin/env python3 -#from packaging import version -from distutils.version import LooseVersion +from packaging import version import sys a = sys.argv[1] b = sys.argv[2] -#result = version.parse(a) >= version.parse(b) -result = LooseVersion(a) >= LooseVersion(b) +result = version.parse(a) >= version.parse(b) if result: print('OK: %s is equal or newer than %s' % (a, b)) else: