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-06 17:04:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-set_version (Old)
and /work/SRC/openSUSE:Factory/.obs-service-set_version.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-set_version"
Fri Jan 6 17:04:59 2023 rev:42 rq:1056150 version:0.6.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes
2021-12-21 18:40:16.797854901 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-set_version.new.1563/obs-service-set_version.changes
2023-01-06 17:05:32.840178552 +0100
@@ -1,0 +2,8 @@
+Thu Jan 05 09:07:08 UTC 2023 - [email protected]
+
+- Update to version 0.6.0:
+ * Test against Python 3.10 which is the Tumbleweed default
+ * Remove TravisCI - we switched to GitHub Actions
+ * handle removed packaging.version.LegacyVersion (Fixes #83)
+
+-------------------------------------------------------------------
Old:
----
obs-service-set_version-0.5.14.tar.gz
New:
----
obs-service-set_version-0.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-set_version.spec ++++++
--- /var/tmp/diff_new_pack.v9DhTe/_old 2023-01-06 17:05:33.848184213 +0100
+++ /var/tmp/diff_new_pack.v9DhTe/_new 2023-01-06 17:05:33.852184236 +0100
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,14 +23,8 @@
%endif
%define service set_version
-%if 0%{?suse_version} > 1315 || 0%{?fedora_version} || 0%{?rhel} >= 8
-%define use_python python3
-%else
-%define use_python python
-%endif
-
Name: obs-service-%{service}
-Version: 0.5.14
+Version: 0.6.0
Release: 0
Summary: An OBS source service: Update spec file version
License: GPL-2.0-or-later
@@ -41,19 +35,17 @@
BuildArch: noarch
%if %{with obs_scm_testsuite}
-BuildRequires: %{use_python}-ddt
-BuildRequires: %{use_python}-flake8
-BuildRequires: %{use_python}-packaging
+BuildRequires: python3-ddt
+BuildRequires: python3-flake8
+BuildRequires: python3-packaging
%endif
-%if 0%{?suse_version}
%if 0%{?suse_version} > 1315
Requires: python3-base
%else
-Requires: python
-%endif
-Recommends: %{use_python}-packaging
+Requires: python3
%endif
+Recommends: python3-packaging
%description
This is a source service for openSUSE Build Service.
@@ -65,11 +57,9 @@
%setup -q
%build
-sed -i -e "1 s,#!/usr/bin/python$,#!/usr/bin/%{use_python}," set_version
-
%if %{with obs_scm_testsuite}
%check
-make test PYTHON=%{use_python}
+make test PYTHON=python3
%endif
%install
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.v9DhTe/_old 2023-01-06 17:05:33.884184416 +0100
+++ /var/tmp/diff_new_pack.v9DhTe/_new 2023-01-06 17:05:33.888184438 +0100
@@ -1,5 +1,5 @@
pkgname=obs-service-set_version
-pkgver=0.5.14
+pkgver=0.6.0
pkgrel=0
pkgdesc="An OBS source service: Update spec file version"
arch=('i686' 'x86_64')
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.v9DhTe/_old 2023-01-06 17:05:33.916184595 +0100
+++ /var/tmp/diff_new_pack.v9DhTe/_new 2023-01-06 17:05:33.916184595 +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">854fd2773fc0683c64a42c7ea42c4c743f3dd57f</param></service></servicedata>
+ <param
name="changesrevision">3128c8ac5a8a076d9b6bf5dd9a128162f7b86fe3</param></service></servicedata>
(No newline at EOF)
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.v9DhTe/_old 2023-01-06 17:05:33.936184707 +0100
+++ /var/tmp/diff_new_pack.v9DhTe/_new 2023-01-06 17:05:33.944184752 +0100
@@ -1,9 +1,9 @@
Format: 1.0
Source: obs-service-set_version
-Version: 0.5.14-0
+Version: 0.6.0-0
Binary: obs-service-set_version
Provides: obs-service-set_version
-Maintainer: Adrian Schroeter <[email protected]>
+Maintainer: Dirk Mueller <[email protected]>
Architecture: all
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 7), python3, flake8 | python3-flake8,
python3-ddt, python3-packaging
++++++ obs-service-set_version-0.5.14.tar.gz ->
obs-service-set_version-0.6.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-set_version-0.5.14/.github/workflows/main.yml
new/obs-service-set_version-0.6.0/.github/workflows/main.yml
--- old/obs-service-set_version-0.5.14/.github/workflows/main.yml
2021-07-14 11:26:12.000000000 +0200
+++ new/obs-service-set_version-0.6.0/.github/workflows/main.yml
2023-01-05 09:50:03.000000000 +0100
@@ -16,10 +16,10 @@
steps:
- uses: actions/checkout@v2
- - name: Set up Python 3.9
+ - name: Set up Python 3.10
uses: actions/setup-python@v2
with:
- python-version: 3.9
+ python-version: "3.10"
- name: Install required deb packages
run: sudo apt-get install zypper devscripts
- name: Install python dependencies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.14/.travis.yml
new/obs-service-set_version-0.6.0/.travis.yml
--- old/obs-service-set_version-0.5.14/.travis.yml 2021-07-14
11:26:12.000000000 +0200
+++ new/obs-service-set_version-0.6.0/.travis.yml 1970-01-01
01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-# Docker Infrastructure (see
http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
)
-sudo: false
-
-language: python
-python:
- - "2.7"
- - "3.6"
-
-# see http://docs.travis-ci.com/user/apt/#Adding-APT-Packages for adding
packages in a container build
-addons:
- apt:
- packages:
- - devscripts
- - dpkg
-
-install:
- - pip install flake8 ddt unittest2 packaging
-script:
- - flake8 set_version tests/
- - python -m unittest discover tests/
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.14/set_version
new/obs-service-set_version-0.6.0/set_version
--- old/obs-service-set_version-0.5.14/set_version 2021-07-14
11:26:12.000000000 +0200
+++ new/obs-service-set_version-0.6.0/set_version 2023-01-05
09:50:03.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
# A simple script to update version number in spec, dsc or arch linux files
@@ -15,6 +15,7 @@
from __future__ import print_function
import argparse
+from contextlib import suppress
import glob
import os
import re
@@ -26,7 +27,7 @@
import logging
try:
- from packaging.version import LegacyVersion, Version, parse
+ from packaging.version import Version, parse
except ImportError:
HAS_PACKAGING = False
import warnings
@@ -35,6 +36,9 @@
else:
HAS_PACKAGING = True
+if HAS_PACKAGING:
+ with suppress(ImportError):
+ from packaging.version import LegacyVersion
if os.environ.get('DEBUG_SET_VERSION') == "1":
logging.getLogger().setLevel(logging.DEBUG)
@@ -351,8 +355,11 @@
v_rpm = v_rpm.replace('rc', '~xrc')
v_rpm = v_rpm.replace('.dev', '~dev')
version_rpm = v_rpm
- elif isinstance(v, LegacyVersion):
- # TODO(toabctl): handle setuptools style legacy version
+ else:
+ with suppress(NameError):
+ if isinstance(v, LegacyVersion):
+ # TODO(toabctl): handle setuptools style legacy version
+ pass
pass
return version_rpm
