Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pymod2pkg for
openSUSE:Factory checked in at 2023-09-08 21:15:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pymod2pkg (Old)
and /work/SRC/openSUSE:Factory/.python-pymod2pkg.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pymod2pkg"
Fri Sep 8 21:15:28 2023 rev:23 rq:1109587 version:0.26.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pymod2pkg/python-pymod2pkg.changes
2020-11-26 23:15:44.877054078 +0100
+++
/work/SRC/openSUSE:Factory/.python-pymod2pkg.new.1766/python-pymod2pkg.changes
2023-09-08 21:16:16.092029904 +0200
@@ -1,0 +2,5 @@
+Fri Mar 3 21:32:18 UTC 2023 - cloud-de...@suse.de
+
+- added 0001-add-suse_py39-flavor-to-explicitly-render-templates-.patch
+
+-------------------------------------------------------------------
New:
----
0001-add-suse_py39-flavor-to-explicitly-render-templates-.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pymod2pkg.spec ++++++
--- /var/tmp/diff_new_pack.rkgCbr/_old 2023-09-08 21:16:17.248071221 +0200
+++ /var/tmp/diff_new_pack.rkgCbr/_new 2023-09-08 21:16:17.248071221 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pymod2pkg
#
-# Copyright (c) 2020 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
@@ -25,6 +25,7 @@
Group: Development/Libraries/Python
URL: https://wiki.openstack.org/wiki/Rpm-packaging
Source0:
https://files.pythonhosted.org/packages/source/p/pymod2pkg/pymod2pkg-0.26.0.tar.gz
+Patch1: 0001-add-suse_py39-flavor-to-explicitly-render-templates-.patch
BuildRequires: openstack-macros
BuildRequires: python3-distro
BuildRequires: python3-pbr >= 2.0.0
@@ -39,7 +40,6 @@
%package -n python3-pymod2pkg
Summary: OpenStack Packaging - python module name to package name map
-Group: Development/Libraries/Python
Requires: python3-distro
Requires: python3-pbr >= 2.0.0
%if 0%{?suse_version}
@@ -54,7 +54,6 @@
%package -n python-pymod2pkg-doc
Summary: Documentation for python module name to package name map
library
-Group: Development/Libraries/Python
BuildRequires: python3-Sphinx
BuildRequires: python3-openstackdocstheme
@@ -77,7 +76,7 @@
%{py3_install}
%check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
%files -n python3-pymod2pkg
%license LICENSE
++++++ 0001-add-suse_py39-flavor-to-explicitly-render-templates-.patch ++++++
>From 90059d316cbed4094c434ea77275e65e60e3b87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dirk=20M=C3=BCller?= <d...@dmllr.de>
Date: Fri, 20 Jan 2023 18:32:16 +0100
Subject: [PATCH] add suse_py39 flavor to explicitly render templates for py39
This is needed when py 3.9 is not the primary python version
(e.g. SLE15).
Change-Id: I2a94acbf3b6f601e3665fe3bd32401468af67d20
---
pymod2pkg/__init__.py | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
Index: pymod2pkg-0.26.0/pymod2pkg/__init__.py
===================================================================
--- pymod2pkg-0.26.0.orig/pymod2pkg/__init__.py
+++ pymod2pkg-0.26.0/pymod2pkg/__init__.py
@@ -106,6 +106,20 @@ def default_suse_tr(mod):
return (pkg, py2pkg, py3pkg)
+def default_suse_py39_tr(mod):
+ """
+ Default translation function for openSUSE, SLES, and other
+ SUSE based systems that have python 3.9
+
+ Returns a tuple of 3 elements - the unversioned name, the python2 versioned
+ name and the python3 versioned name.
+ """
+ pkg = 'python-%s' % mod
+ py2pkg = 'python2-%s' % mod
+ py3pkg = 'python39-%s' % mod
+ return (pkg, py2pkg, py3pkg)
+
+
def openstack_prefix_tr(mod):
pkg = 'openstack-' + mod.lower()
return (pkg, '', '')
@@ -263,7 +277,7 @@ RDO_PKG_MAP = [
]
-SUSE_PKG_MAP = [
+SUSE_COMMON_PKG_MAP = [
# not following SUSE naming policy
SingleRule('ansible', 'ansible'),
SingleRule('ansible-runner', 'ansible-runner'),
@@ -304,6 +318,13 @@ SUSE_PKG_MAP = [
pkgfun=suse_horizon_plugins_tr),
]
+SUSE_PKG_MAP = SUSE_COMMON_PKG_MAP
+
+SUSE_PY39_PKG_MAP = SUSE_COMMON_PKG_MAP
+SUSE_PY39_PKG_MAP.extend([
+ SingleRule('devel', 'python-devel', 'python39-devel'),
+])
+
UBUNTU_PKG_MAP = [
SingleRule('django_openstack_auth', 'python-openstack-auth'),
SingleRule('glance_store', 'python-glance-store'),
@@ -342,6 +363,8 @@ OPENSTACK_UPSTREAM_PKG_MAP = [
def get_pkg_map(dist):
d_lower = dist.lower()
+ if 'suse_py39' in d_lower:
+ return SUSE_PY39_PKG_MAP
if 'suse' in d_lower or 'sles' in d_lower:
return SUSE_PKG_MAP
if 'ubuntu' in d_lower:
@@ -351,6 +374,8 @@ def get_pkg_map(dist):
def get_default_tr_func(dist):
d_lower = dist.lower()
+ if 'suse_py39' in d_lower:
+ return default_suse_py39_tr
if 'suse' in d_lower or 'sles' in d_lower:
return default_suse_tr
if 'ubuntu' in d_lower:
