Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2020-06-17 14:58:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Wed Jun 17 14:58:00 2020 rev:290 rq:815480 version:20200610.3c1b0160
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2020-05-26 17:22:44.180415436 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.3606/openSUSE-release-tools.changes
2020-06-17 14:58:24.922640726 +0200
@@ -1,0 +2,7 @@
+Wed Jun 10 09:47:58 UTC 2020 - [email protected]
+
+- Update to version 20200610.3c1b0160:
+ * Fix flake error F541 in tests/origin_tests.py
+ * Fix osc.core.repository_path_expand
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20200517.e09639bc.obscpio
New:
----
openSUSE-release-tools-20200610.3c1b0160.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.JOQ014/_old 2020-06-17 14:58:26.110644794 +0200
+++ /var/tmp/diff_new_pack.JOQ014/_new 2020-06-17 14:58:26.114644807 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20200517.e09639bc
+Version: 20200610.3c1b0160
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.JOQ014/_old 2020-06-17 14:58:26.162644972 +0200
+++ /var/tmp/diff_new_pack.JOQ014/_new 2020-06-17 14:58:26.166644985 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">222e2ff80255254fa7278ff5bafe72ff50b7b5a2</param>
+ <param
name="changesrevision">3ec840fb226254212139da36f4532972da0d740d</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20200517.e09639bc.obscpio ->
openSUSE-release-tools-20200610.3c1b0160.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200517.e09639bc/osclib/core.py
new/openSUSE-release-tools-20200610.3c1b0160/osclib/core.py
--- old/openSUSE-release-tools-20200517.e09639bc/osclib/core.py 2020-05-17
16:00:10.000000000 +0200
+++ new/openSUSE-release-tools-20200610.3c1b0160/osclib/core.py 2020-06-10
11:46:27.000000000 +0200
@@ -410,30 +410,19 @@
apiurl, list(filter(None, ['source', project, package, '_attribute',
namespace + ':' + name]))))
@memoize(session=True)
-def _repository_path_expand(apiurl, project, repo):
+def repository_path_expand(apiurl, project, repo):
"""Recursively list underlying projects."""
-
- repos = OrderedDict()
-
+ repos = [[project, repo]]
meta = ET.fromstringlist(show_project_meta(apiurl, project))
- for path in meta.findall('.//repository[@name="{}"]/path'.format(repo)):
- rp = repository_path_expand(apiurl, path.get('project', project),
path.get('repository'))
- for project, repo in rp:
- # only the last repo for a project is remembered by OBS
- if project in repos:
- del repos[project]
- repos[project] = repo
-
- return repos
+ paths = meta.findall('.//repository[@name="{}"]/path'.format(repo))
-@memoize(session=True)
-def repository_path_expand(apiurl, project, repo):
- """Recursively list underlying projects."""
- repodict = _repository_path_expand(apiurl, project, repo)
- repos = []
- repos.append([project, repo])
- for project, repo in repodict.items():
- repos.append([project, repo])
+ # The listed paths are taken as-is, except for the last one...
+ for path in paths[:-1]:
+ repos += [[path.get('project', project), path.get('repository')]]
+
+ # ...which is expanded recursively
+ if len(paths) > 0:
+ repos += repository_path_expand(apiurl, paths[-1].get('project',
project), paths[-1].get('repository'))
return repos
@memoize(session=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200517.e09639bc/tests/origin_tests.py
new/openSUSE-release-tools-20200610.3c1b0160/tests/origin_tests.py
--- old/openSUSE-release-tools-20200517.e09639bc/tests/origin_tests.py
2020-05-17 16:00:10.000000000 +0200
+++ new/openSUSE-release-tools-20200610.3c1b0160/tests/origin_tests.py
2020-06-10 11:46:27.000000000 +0200
@@ -113,7 +113,7 @@
request = self.wf.create_submit_request(self.randomString('devel'),
self.randomString('package'))
self.assertReviewBot(request.reqid, self.bot_user, 'new', 'new')
self.assertOutput(f'skipping {request.reqid} of age')
- self.assertOutput(f'since it is younger than 1800s')
+ self.assertOutput('since it is younger than 1800s')
def test_config(self):
attribute_value_save(self.wf.apiurl, self.target_project,
'OriginConfig', 'origins: []')
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.JOQ014/_old 2020-06-17 14:58:26.878647423 +0200
+++ /var/tmp/diff_new_pack.JOQ014/_new 2020-06-17 14:58:26.878647423 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20200517.e09639bc
-mtime: 1589724010
-commit: e09639bcb7ff5c38e0ae0a547c1ef454a9e46657
+version: 20200610.3c1b0160
+mtime: 1591782387
+commit: 3c1b016007a0c04fd94eba18f903190a43cb6444
