Hello community,
here is the log from the commit of package obs-service-set_version for
openSUSE:Factory checked in at 2015-09-11 09:04:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-set_version (Old)
and /work/SRC/openSUSE:Factory/.obs-service-set_version.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-set_version"
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes
2015-08-28 08:26:34.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-set_version.new/obs-service-set_version.changes
2015-09-11 09:04:36.000000000 +0200
@@ -2 +2 @@
-Wed Aug 19 09:26:48 UTC 2015 - [email protected]
+Thu Sep 03 07:21:55 UTC 2015 - [email protected]
@@ -4,2 +4,3 @@
-- Update to version 0.5.2:
- + - make test suite happy
+- Update to version 0.5.3:
+ + Set pkgver and pkgrel for PKGBUILD files (fixes #21)
+ + Fix python3 compat
Old:
----
obs-service-set_version-0.5.2.tar.gz
New:
----
obs-service-set_version-0.5.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-set_version.spec ++++++
--- /var/tmp/diff_new_pack.W5pCzt/_old 2015-09-11 09:04:37.000000000 +0200
+++ /var/tmp/diff_new_pack.W5pCzt/_new 2015-09-11 09:04:37.000000000 +0200
@@ -19,14 +19,18 @@
%define service set_version
Name: obs-service-%{service}
-Version: 0.5.2
+Version: 0.5.3
Release: 0
Summary: An OBS source service: Update spec file version
License: GPL-2.0+
Group: Development/Tools/Building
Url: https://github.com/openSUSE/obs-service-%{service}
Source: %{name}-%{version}.tar.gz
+%if 0%{?suse_version}
Recommends: python-packaging
+%else
+Requires: python-packaging
+%endif
Requires: sed
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.W5pCzt/_old 2015-09-11 09:04:37.000000000 +0200
+++ /var/tmp/diff_new_pack.W5pCzt/_new 2015-09-11 09:04:37.000000000 +0200
@@ -1,4 +1,20 @@
-asd=yxc
+pkgname=obs-service-set_version
+pkgver=0.5.3
pkgrel=0
-md5sums=('801b31dd37c1db8fd7164e4c91dc0eaf')
+pkgdesc="An OBS source service: Update spec file version"
+arch=('i686' 'x86_64')
+url="https://www.github.com/openSUSE/obs-service-set_version";
+license=('GPL-2.0+' 'GPL-2.0')
+groups=('base-devel')
+depends=('python')
+source=(obs-service-set_version-${pkgver}.tar.gz)
+md5sums=('SKIP')
+
+package() {
+ msg "Installing build ..."
+ cd "${srcdir}"/obs-service-set_version-${pkgver}
+ mkdir -p ${pkgdir}/usr/lib/obs/service
+ install -m 0755 set_version ${pkgdir}/usr/lib/obs/service
+ install -m 0644 set_version.service ${pkgdir}/usr/lib/obs/service
+}
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.W5pCzt/_old 2015-09-11 09:04:37.000000000 +0200
+++ /var/tmp/diff_new_pack.W5pCzt/_new 2015-09-11 09:04:37.000000000 +0200
@@ -1,5 +1,5 @@
<servicedata>
<service name="tar_scm">
<param
name="url">[email protected]:openSUSE/obs-service-set_version.git</param>
- <param
name="changesrevision">e5b43d3e1562c436fc017536844b93ffbf6193ee</param></service>
+ <param
name="changesrevision">a7f421ccd5879c656bc55469727ac8954d8f535d</param></service>
</servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.W5pCzt/_old 2015-09-11 09:04:37.000000000 +0200
+++ /var/tmp/diff_new_pack.W5pCzt/_new 2015-09-11 09:04:37.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-set-version
-Version: 0.5.2
+Version: 0.5.3
Binary: obs-service-set-version
Maintainer: Adrian Schroeter <[email protected]>
Architecture: all
++++++ obs-service-set_version-0.5.2.tar.gz ->
obs-service-set_version-0.5.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.2/set_version
new/obs-service-set_version-0.5.3/set_version
--- old/obs-service-set_version-0.5.2/set_version 2015-08-19
11:26:48.000000000 +0200
+++ new/obs-service-set_version-0.5.3/set_version 2015-09-03
09:24:48.000000000 +0200
@@ -12,6 +12,7 @@
# of the License, or (at your option) any later version.
# See http://www.gnu.org/licenses/gpl-2.0.html for full license text.
+from __future__ import print_function
import argparse
import glob
@@ -199,7 +200,8 @@
if filename.endswith("PKGBUILD"):
contents_new, subs = re.subn(
r"^{tag}=.*".format(tag=tag),
- r"{tag}={string}".format(tag=tag, string=string), contents)
+ r"{tag}={string}".format(tag=tag, string=string), contents,
+ flags=re.MULTILINE)
else:
# keep inline macros for rpm
contents_new, subs = re.subn(r'^{tag}:(\s*)[^%].*'.format(tag=tag),
@@ -294,7 +296,7 @@
outdir = args['outdir']
if not outdir:
- print "no outdir specified"
+ print("no outdir specified")
sys.exit(-1)
if not version:
@@ -340,4 +342,6 @@
for f in filter(lambda x: x.endswith(("PKGBUILD")), files):
filename = outdir + "/" + f
shutil.copyfile(f, filename)
- _replace_tag(filename, "md5sums", "(SKIP)")
+ _replace_tag(filename, "md5sums", "('SKIP')")
+ _replace_tag(filename, "pkgver", version)
+ _replace_tag(filename, "pkgrel", "0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-set_version-0.5.2/tests/data_test_from_commandline.json
new/obs-service-set_version-0.5.3/tests/data_test_from_commandline.json
--- old/obs-service-set_version-0.5.2/tests/data_test_from_commandline.json
2015-08-19 11:26:48.000000000 +0200
+++ new/obs-service-set_version-0.5.3/tests/data_test_from_commandline.json
2015-09-03 09:24:48.000000000 +0200
@@ -1,14 +1,14 @@
[
[
- {"Version": "1.2.3"}, "1"
+ "1.2.3", "1"
],
[
- {"Version": "1.2.3"}, "3.4.5"
+ "1.2.3", "3.4.5"
],
[
- {"Version": "1.2.3~456+789-Devel3"}, "3.4.5"
+ "1.2.3~456+789-Devel3", "3.4.5"
],
[
- {"Version": "3.4.5"}, "1.2.3~456+789-Devel3"
+ "3.4.5", "1.2.3~456+789-Devel3"
]
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.2/tests/test_base.py
new/obs-service-set_version-0.5.3/tests/test_base.py
--- old/obs-service-set_version-0.5.2/tests/test_base.py 2015-08-19
11:26:48.000000000 +0200
+++ new/obs-service-set_version-0.5.3/tests/test_base.py 2015-09-03
09:24:48.000000000 +0200
@@ -81,7 +81,8 @@
return tar_path
def _run_set_version(self, params=[]):
- self._tmpoutdir =
tempfile.mkdtemp(prefix='obs-service-set_version-test-outdir-')
+ self._tmpoutdir = tempfile.mkdtemp(
+ prefix='obs-service-set_version-test-outdir-')
cmd = [sys.executable,
SET_VERSION_EXECUTABLE,
'--outdir', self._tmpoutdir] + params
@@ -90,7 +91,8 @@
cmd, stderr=subprocess.STDOUT, env=os.environ.copy())
for f in os.listdir(self._tmpoutdir):
os.unlink(self._tmpdir+"/"+f)
- # FIXME: in most modes the files get not replaced, but store
in parallel with _service: prefix
+ # FIXME: in most modes the files get not replaced,
+ # but store in parallel with _service: prefix
shutil.move(self._tmpoutdir+"/"+f, self._tmpdir)
shutil.rmtree(self._tmpoutdir)
except subprocess.CalledProcessError as e:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-set_version-0.5.2/tests/test_debianchangelog.py
new/obs-service-set_version-0.5.3/tests/test_debianchangelog.py
--- old/obs-service-set_version-0.5.2/tests/test_debianchangelog.py
2015-08-19 11:26:48.000000000 +0200
+++ new/obs-service-set_version-0.5.3/tests/test_debianchangelog.py
2015-09-03 09:24:48.000000000 +0200
@@ -49,8 +49,7 @@
@file_data("data_test_from_commandline.json")
def test_from_commandline(self, data):
- spec_tags, new_version = data
- old_version = "8.8.8"
+ old_version, new_version = data
changelog_path = self._write_debian_changelog(
"debian.changelog", old_version)
self._run_set_version(params=['--version', new_version])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.2/tests/test_pkgbuild.py
new/obs-service-set_version-0.5.3/tests/test_pkgbuild.py
--- old/obs-service-set_version-0.5.2/tests/test_pkgbuild.py 1970-01-01
01:00:00.000000000 +0100
+++ new/obs-service-set_version-0.5.3/tests/test_pkgbuild.py 2015-09-03
09:24:48.000000000 +0200
@@ -0,0 +1,49 @@
+# Copyright (C) 2015 SUSE Linux GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA.
+
+
+import os
+
+from ddt import ddt, file_data
+
+from test_base import SetVersionBaseTest
+
+
+@ddt
+class SetVersionPKGBUILD(SetVersionBaseTest):
+ """Test set_version service for PKGBUILD files"""
+
+ def _write_pkgbuild_file(self, pkgbuild_name, tags, custom=[]):
+ """write a given filename with the given tags and custom
+ strings"""
+ pkgbuild_path = os.path.join(self._tmpdir, pkgbuild_name)
+ with open(pkgbuild_path, "a") as f:
+ for c in custom:
+ f.write("%s\n" % c)
+ for key, val in tags.items():
+ f.write("%s=%s\n" % (key, val))
+ f.write("\n")
+ return pkgbuild_path
+
+ @file_data("data_test_from_commandline.json")
+ def test_from_commandline(self, data):
+ old_version, new_version = data
+ pkgbuild_path = self._write_pkgbuild_file(
+ "PKGBUILD", {"pkgver": old_version})
+ self._run_set_version(params=['--version', new_version])
+ expected_str = "pkgver=%s" % (new_version)
+ self._check_file_assert_contains(pkgbuild_path, expected_str)
+ self._check_file_assert_not_contains(pkgbuild_path, old_version)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-set_version-0.5.2/tests/test_rpmspec.py
new/obs-service-set_version-0.5.3/tests/test_rpmspec.py
--- old/obs-service-set_version-0.5.2/tests/test_rpmspec.py 2015-08-19
11:26:48.000000000 +0200
+++ new/obs-service-set_version-0.5.3/tests/test_rpmspec.py 2015-09-03
09:24:48.000000000 +0200
@@ -40,8 +40,8 @@
@file_data("data_test_from_commandline.json")
def test_from_commandline(self, data):
- spec_tags, new_version = data
- spec_path = self._write_specfile("test.spec", spec_tags)
+ old_version, new_version = data
+ spec_path = self._write_specfile("test.spec", {"Version": old_version})
self._run_set_version(params=['--version', new_version])
self._check_file_assert_contains(spec_path, new_version)
