Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package
obs-service-replace_using_package_version for openSUSE:Factory checked in at
2023-04-12 12:50:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-replace_using_package_version
(Old)
and
/work/SRC/openSUSE:Factory/.obs-service-replace_using_package_version.new.19717
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-replace_using_package_version"
Wed Apr 12 12:50:58 2023 rev:6 rq:1078414 version:0.0.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-replace_using_package_version/obs-service-replace_using_package_version.changes
2023-03-31 21:14:12.338089986 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-replace_using_package_version.new.19717/obs-service-replace_using_package_version.changes
2023-04-12 12:50:59.840720534 +0200
@@ -1,0 +2,16 @@
+Tue Apr 11 10:19:11 UTC 2023 - contain...@suse.com
+
+- Update to version 1681202780.6d8bb3c:
+ * Run unit & install test only for the system python
+ * Add python 3.11 tox environment
+ * Switch to using rpm.labelCompare instead of parse_version
+ * Fix copyright strings
+ * Fix test_find_package_version
+ * Bump mock from 4.0.3 to 5.0.1
+ * Bump pytest-xdist from 2.5.0 to 3.0.2
+ * Bump tox from 3.25.1 to 3.28.0
+ * Bump Gr1N/setup-poetry from 7 to 8
+ * Bump pytest-container from 0.0.2 to 0.1.1
+ * Bump actions/setup-python from 4.3.0 to 4.5.0
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-replace_using_package_version.spec ++++++
--- /var/tmp/diff_new_pack.tVVT63/_old 2023-04-12 12:51:00.392723760 +0200
+++ /var/tmp/diff_new_pack.tVVT63/_new 2023-04-12 12:51:00.396723783 +0200
@@ -30,7 +30,7 @@
Source2: LICENSE
BuildRequires: sed
Requires: python3-docopt
-Requires: python3-setuptools
+Requires: python3-rpm
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.tVVT63/_old 2023-04-12 12:51:00.468724204 +0200
+++ /var/tmp/diff_new_pack.tVVT63/_new 2023-04-12 12:51:00.472724227 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/obs-service-replace_using_package_version.git</param>
- <param
name="changesrevision">6dcaef0f89b089ac6f83200ce25c0d907e45111a</param></service></servicedata>
+ <param
name="changesrevision">eb96e8582f54b9e2c5c5259e379ced1e79cd642d</param></service></servicedata>
(No newline at EOF)
++++++ replace_using_package_version.py ++++++
--- /var/tmp/diff_new_pack.tVVT63/_old 2023-04-12 12:51:00.496724367 +0200
+++ /var/tmp/diff_new_pack.tVVT63/_new 2023-04-12 12:51:00.500724391 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2018 SUSE Linux GmbH. All rights reserved.
+# SPDX-FileCopyrightText: (c) 2023 SUSE LLC
#
# This file is part of obs-service-replace_using_package_version.
#
@@ -49,7 +49,7 @@
import re
import os
import subprocess
-from pkg_resources import parse_version
+from rpm import labelCompare
from typing import List
version_regex = {
@@ -185,7 +185,7 @@
rpm_file = os.path.join(root, pkg)
if get_pkg_name_from_rpm(rpm_file) == package:
rpm_ver = get_pkg_version_from_rpm(rpm_file)
- if version is None or rpm_ver >= version:
+ if version is None or labelCompare(rpm_ver, version) >= 0:
version = rpm_ver
return version
@@ -195,7 +195,7 @@
for f in os.listdir(path):
if f.endswith('obsinfo') and package in f:
obsinfo_ver = get_pkg_version_from_obsinfo(f)
- if version is None or obsinfo_ver >= version:
+ if version is None or labelCompare(obsinfo_ver, version) >= 0:
version = obsinfo_ver
return version
@@ -212,35 +212,35 @@
return subprocess.check_output(command).decode()
-def get_pkg_version_from_obsinfo(obsinfo_file):
+def get_pkg_version_from_obsinfo(obsinfo_file: str) -> Optional[str]:
regex = re.compile(obsinfo_regex)
with open(obsinfo_file) as f:
for line in f:
match = regex.match(line)
if match:
- return parse_version(match[1])
+ return match[1]
return None
-def get_pkg_name_from_rpm(rpm_file):
+def get_pkg_name_from_rpm(rpm_file: str) -> str:
command = [
'rpm', '-qp', '--queryformat', '%{NAME}', rpm_file
]
return run_command(command)
-def get_pkg_version_from_rpm(rpm_file):
+def get_pkg_version_from_rpm(rpm_file: str) -> str:
command = [
'rpm', '-qp', '--queryformat', '%{VERSION}', rpm_file
]
- return parse_version(run_command(command))
+ return run_command(command)
-def get_pkg_version(package):
+def get_pkg_version(package: str) -> str:
command = [
'rpm', '-q', '--queryformat', '%{VERSION}', package
]
- return parse_version(run_command(command))
+ return run_command(command)
def init(__name__):
