release-engineering/tito
1
0
Fork 0
mirror of https://github.com/rpm-software-management/tito.git synced 2025-02-23 12:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use packaging.version.Version() not LooseVersion

Browse source 
The Version is more strict, but we only use this for the implementation
of tito.props configuration:

    [requirements]
    tito = <version>

And the tito versions are not anyhow extraordinary.

Note, this is done to fix a tox test failure.
This commit is contained in:
Pavel Raiskup 2024-10-04 15:34:06 +02:00 • committed by Jakub Kadlčík
parent 8ce108266b
commit ef5e8abd81
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/tito/builder/main.py
View file

@ -22,7 +22,6 @@ import re
import shutil
import rpm
from pkg_resources import require
from distutils.version import LooseVersion as loose_version
from tempfile import mkdtemp
from tito.common import scl_to_rpm_option, get_latest_tagged_version, \
@ -34,7 +33,8 @@ from tito.common import scl_to_rpm_option, get_latest_tagged_version, \
find_cheetah_template_file, render_cheetah, replace_spec_release, \
find_spec_like_file, warn_out, get_commit_timestamp, chdir, mkdir_p, \
find_git_root, info_out, munge_specfile, BUILDCONFIG_SECTION
from tito.compat import getstatusoutput, getoutput, urlparse, urlretrieve
from tito.compat import (getstatusoutput, getoutput, urlparse, urlretrieve,
Version)
from tito.exception import RunCommandException
from tito.exception import TitoException
from tito.config_object import ConfigObject
@ -406,8 +406,8 @@ class Builder(ConfigObject, BuilderBase):
if self.config.has_section("requirements"):
if self.config.has_option("requirements", "tito"):
if loose_version(self.config.get("requirements", "tito")) > \
loose_version(require('tito')[0].version):
if Version(self.config.get("requirements", "tito")) > \
Version(require('tito')[0].version):
error_out([
"tito version %s or later is needed to build this project." %
self.config.get("requirements", "tito"),

7
src/tito/compat.py
View file

@ -12,6 +12,7 @@
# in this software or its documentation.
# flake8: noqa
# pylint: disable=unused-import,deprecated-module,function-redefined
"""
Compatibility library for Python 2.4 up through Python 3.
@ -19,6 +20,12 @@ Compatibility library for Python 2.4 up through Python 3.
import os
import sys
import contextlib
try:
from packaging.version import Version
except ImportError:
from distutils.version import LooseVersion as Version
ENCODING = sys.getdefaultencoding()
PY2 = sys.version_info[0] == 2
if PY2: