Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package obs-service-set_version for
openSUSE:Factory checked in at 2023-01-18 13:08:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-set_version (Old)
and /work/SRC/openSUSE:Factory/.obs-service-set_version.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-set_version"
Wed Jan 18 13:08:28 2023 rev:43 rq:1058989 version:0.6.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes
2023-01-06 17:05:32.840178552 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-set_version.new.32243/obs-service-set_version.changes
2023-01-18 13:08:32.480032930 +0100
@@ -1,0 +2,8 @@
+Tue Jan 17 14:36:28 UTC 2023 - [email protected]
+
+- Update to version 0.6.1:
+ * Handle already converted versions gracefully
+ * Flake8 fixes (missing import)
+ * Test python3 by default
+
+-------------------------------------------------------------------
Old:
----
obs-service-set_version-0.6.0.tar.gz
New:
----
obs-service-set_version-0.6.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-set_version.spec ++++++
--- /var/tmp/diff_new_pack.9BVLKB/_old 2023-01-18 13:08:33.004035741 +0100
+++ /var/tmp/diff_new_pack.9BVLKB/_new 2023-01-18 13:08:33.008035762 +0100
@@ -24,7 +24,7 @@
%define service set_version
Name: obs-service-%{service}
-Version: 0.6.0
+Version: 0.6.1
Release: 0
Summary: An OBS source service: Update spec file version
License: GPL-2.0-or-later
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.9BVLKB/_old 2023-01-18 13:08:33.044035955 +0100
+++ /var/tmp/diff_new_pack.9BVLKB/_new 2023-01-18 13:08:33.044035955 +0100
@@ -1,5 +1,5 @@
pkgname=obs-service-set_version
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=0
pkgdesc="An OBS source service: Update spec file version"
arch=('i686' 'x86_64')
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.9BVLKB/_old 2023-01-18 13:08:33.076036127 +0100
+++ /var/tmp/diff_new_pack.9BVLKB/_new 2023-01-18 13:08:33.080036148 +0100
@@ -4,6 +4,6 @@
<param
name="changesrevision">eaedc529acba421821e0e5dcb4956c66e7f315a9</param></service>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/obs-service-set_version.git</param>
- <param
name="changesrevision">3128c8ac5a8a076d9b6bf5dd9a128162f7b86fe3</param></service></servicedata>
+ <param
name="changesrevision">5b44109df31ac1da3832eb38ebc6fb4c53df3cf6</param></service></servicedata>
(No newline at EOF)
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.9BVLKB/_old 2023-01-18 13:08:33.096036234 +0100
+++ /var/tmp/diff_new_pack.9BVLKB/_new 2023-01-18 13:08:33.100036255 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-set_version
-Version: 0.6.0-0
+Version: 0.6.1-0
Binary: obs-service-set_version
Provides: obs-service-set_version
Maintainer: Dirk Mueller <[email protected]>
++++++ obs-service-set_version-0.6.0.tar.gz ->
obs-service-set_version-0.6.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.6.0/Makefile
new/obs-service-set_version-0.6.1/Makefile
--- old/obs-service-set_version-0.6.0/Makefile 2023-01-05 09:50:03.000000000
+0100
+++ new/obs-service-set_version-0.6.1/Makefile 2023-01-17 14:53:56.000000000
+0100
@@ -1,5 +1,5 @@
prefix = /usr
-PYTHON ?= python
+PYTHON ?= python3
servicedir = ${prefix}/lib/obs/service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.6.0/set_version
new/obs-service-set_version-0.6.1/set_version
--- old/obs-service-set_version-0.6.0/set_version 2023-01-05
09:50:03.000000000 +0100
+++ new/obs-service-set_version-0.6.1/set_version 2023-01-17
14:53:56.000000000 +0100
@@ -25,6 +25,7 @@
import zipfile
import codecs
import logging
+import packaging
try:
from packaging.version import Version, parse
@@ -343,7 +344,12 @@
if not HAS_PACKAGING:
return version_rpm
- v = parse(version_pip)
+ try:
+ v = parse(version_pip)
+ except packaging.version.InvalidVersion:
+ # Maybe is converted already?
+ return None
+
if isinstance(v, Version):
if v.is_prerelease:
v_rpm = v.public
@@ -429,9 +435,8 @@
files = args['file'] or files_local
# do version convertion if needed
- pack_type = PackageTypeDetector._get_package_type(files)
version_converted = None
- if pack_type == "python":
+ if PackageTypeDetector._get_package_type(files) == "python":
version_converted = _version_python_pip2rpm(version)
# handle rpm specs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-set_version-0.6.0/tests/test_python_pip2rpm.py
new/obs-service-set_version-0.6.1/tests/test_python_pip2rpm.py
--- old/obs-service-set_version-0.6.0/tests/test_python_pip2rpm.py
2023-01-05 09:50:03.000000000 +0100
+++ new/obs-service-set_version-0.6.1/tests/test_python_pip2rpm.py
2023-01-17 14:53:56.000000000 +0100
@@ -118,7 +118,8 @@
('1.2-dev2', '1.2~dev2'),
('1.0.post1', '1.0.post1'),
('1.0rc1', '1.0~xrc1'),
- ('1.0b1', '1.0~xbeta1')
+ ('1.0b1', '1.0~xbeta1'),
+ ('1.7.40~svn', None)
)
@unpack
def test_python_version_pip2rpm(self, pip_ver, expected_ver):
