From 78be192a4e4a334b9da5f3fac1a8cedaf246d5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Berland?= Date: Wed, 18 Jan 2023 11:37:24 +0100 Subject: [PATCH] Support building for py310 and on rhel8 --- komodo/lint.py | 6 +++--- tests/test_lint.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/komodo/lint.py b/komodo/lint.py index 09c271938..9d92c65f3 100755 --- a/komodo/lint.py +++ b/komodo/lint.py @@ -46,8 +46,8 @@ def _validate(pkg, ver, repo): def lint_release_name(pkgfile): relname = os.path.basename(pkgfile) found = False - for py_suffix in "-py27", "-py36", "-py38": - for rh_suffix in "", "-rhel6", "-rhel7": + for py_suffix in "-py27", "-py36", "-py38", "-py310": + for rh_suffix in "", "-rhel6", "-rhel7", "-rhel8": if relname.endswith(py_suffix + rh_suffix + ".yml"): found = True break @@ -56,7 +56,7 @@ def lint_release_name(pkgfile): _kerr( pkg=pkgfile, err="Invalid release name suffix. " - "Must be of the most -pyXX or -pyXX-rhelY", + "Must be of the form -pyXX[X] or -pyXX[X]-rhelY", ) ] diff --git a/tests/test_lint.py b/tests/test_lint.py index 931840972..4992d9b45 100644 --- a/tests/test_lint.py +++ b/tests/test_lint.py @@ -44,6 +44,8 @@ def test_lint(): "/home/anyuser/komodo/2020.01.03-py27.yml", "myrelease-py27.yml", "myrelease-py36.yml", + "myrelease-py310.yml", + "myrelease-py310-rhel8.yml", "myrelease-py27-rhel6.yml", "myrelease-py27-rhel7.yml", "myrelease-py36-rhel6.yml",