Hello community,
here is the log from the commit of package python-pymod2pkg for
openSUSE:Factory checked in at 2020-04-21 13:06:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pymod2pkg (Old)
and /work/SRC/openSUSE:Factory/.python-pymod2pkg.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pymod2pkg"
Tue Apr 21 13:06:29 2020 rev:20 rq:795685 version:0.23.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pymod2pkg/python-pymod2pkg.changes
2019-10-07 14:14:22.682846668 +0200
+++
/work/SRC/openSUSE:Factory/.python-pymod2pkg.new.2738/python-pymod2pkg.changes
2020-04-21 13:06:30.704315006 +0200
@@ -1,0 +2,14 @@
+Mon Apr 20 07:53:01 UTC 2020 - Thomas Bechtold <[email protected]>
+
+- Add missing Obsoletes
+
+-------------------------------------------------------------------
+Wed Apr 1 11:09:39 UTC 2020 - [email protected]
+
+- update to version 0.23.0
+ - Drop use of unittest2
+ - [ussuri][goal] Drop python 2.7 support and testing
+ - Switch away from deprecated distribution lookup
+ - Fix some upstream mappings
+
+-------------------------------------------------------------------
Old:
----
pymod2pkg-0.22.1.tar.gz
New:
----
pymod2pkg-0.23.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pymod2pkg.spec ++++++
--- /var/tmp/diff_new_pack.X9go7a/_old 2020-04-21 13:06:31.620316832 +0200
+++ /var/tmp/diff_new_pack.X9go7a/_new 2020-04-21 13:06:31.624316840 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pymod2pkg
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,30 +18,40 @@
%global sname pymod2pkg
Name: python-pymod2pkg
-Version: 0.22.1
+Version: 0.23.0
Release: 0
Summary: OpenStack Packaging - python module name to package name map
License: Apache-2.0
Group: Development/Libraries/Python
URL: https://wiki.openstack.org/wiki/Rpm-packaging
-Source0:
https://files.pythonhosted.org/packages/source/p/pymod2pkg/pymod2pkg-0.22.1.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/p/pymod2pkg/pymod2pkg-0.23.0.tar.gz
BuildRequires: openstack-macros
-BuildRequires: python2-pbr >= 2.0.0
-BuildRequires: python2-stestr
-BuildRequires: python2-testresources
-BuildRequires: python2-testtools
+BuildRequires: python3-distro
BuildRequires: python3-pbr >= 2.0.0
BuildRequires: python3-stestr
BuildRequires: python3-testresources
BuildRequires: python3-testtools
-Requires: python-pbr >= 2.0.0
BuildArch: noarch
-%python_subpackages
%description
pymod2pkg is a simple python module for translating python module names to
corresponding package names which is a common problem in the packaging world.
+%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}
+Obsoletes: python2-pymod2pkg < 0.23.0
+%endif
+
+%description -n python3-pymod2pkg
+pymod2pkg is a simple python module for translating python module names to
+corresponding package names which is a common problem in the packaging world.
+
+This package contains the Python 3.x module.
+
%package -n python-pymod2pkg-doc
Summary: Documentation for python module name to package name map
library
Group: Development/Libraries/Python
@@ -52,11 +62,11 @@
Documentation for python module name to package name map library.
%prep
-%autosetup -p1 -n pymod2pkg-0.22.1
+%autosetup -p1 -n pymod2pkg-0.23.0
%py_req_cleanup
%build
-%{python_build}
+%{py3_build}
# generate html docs
%sphinx_build -b html doc/source doc/build/html
@@ -64,23 +74,16 @@
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
-%{python_install}
-%python_clone -a %{buildroot}%{_bindir}/pymod2pkg
+%{py3_install}
%check
-%python_exec -m stestr.cli run
-
-%post
-%python_install_alternative pymod2pkg
-
-%postun
-%python_uninstall_alternative pymod2pkg
+python3 -m stestr.cli run
-%files %{python_files}
+%files -n python3-pymod2pkg
%license LICENSE
%doc README*
-%python_alternative %{_bindir}/pymod2pkg
-%{python_sitelib}/*
+%{_bindir}/pymod2pkg
+%{python3_sitelib}/*
%files -n python-pymod2pkg-doc
%doc doc/build/html
++++++ pymod2pkg-0.22.1.tar.gz -> pymod2pkg-0.23.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/.zuul.yaml
new/pymod2pkg-0.23.0/.zuul.yaml
--- old/pymod2pkg-0.22.1/.zuul.yaml 2019-09-30 13:59:53.000000000 +0200
+++ new/pymod2pkg-0.23.0/.zuul.yaml 2020-03-23 20:02:07.000000000 +0100
@@ -1,6 +1,5 @@
- project:
templates:
- openstack-lower-constraints-jobs
- - openstack-python-jobs
- - openstack-python3-train-jobs
+ - openstack-python3-ussuri-jobs
- publish-openstack-docs-pti
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/AUTHORS new/pymod2pkg-0.23.0/AUTHORS
--- old/pymod2pkg-0.22.1/AUTHORS 2019-09-30 14:00:45.000000000 +0200
+++ new/pymod2pkg-0.23.0/AUTHORS 2020-03-23 20:03:16.000000000 +0100
@@ -11,6 +11,7 @@
Dirk Mueller <[email protected]>
Doug Hellmann <[email protected]>
Flavio Percoco <[email protected]>
+Ghanshyam Mann <[email protected]>
Haikel Guemar <[email protected]>
Hangdong Zhang <[email protected]>
Igor Yozhikov <[email protected]>
@@ -24,6 +25,7 @@
Joseph Davis <[email protected]>
Ondřej Nový <[email protected]>
Ryan Tidwell <[email protected]>
+Sean McGinnis <[email protected]>
Stefan Nica <[email protected]>
Sumit Jamgade <[email protected]>
Thomas Bechtold <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/ChangeLog
new/pymod2pkg-0.23.0/ChangeLog
--- old/pymod2pkg-0.22.1/ChangeLog 2019-09-30 14:00:45.000000000 +0200
+++ new/pymod2pkg-0.23.0/ChangeLog 2020-03-23 20:03:16.000000000 +0100
@@ -1,6 +1,18 @@
CHANGES
=======
+0.23.0
+------
+
+* Switch away from deprecated distribution lookup
+* [ussuri][goal] Drop python 2.7 support and testing
+* Drop use of unittest2
+
+0.22.2
+------
+
+* Fix some upstream mappings
+
0.22.1
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/PKG-INFO
new/pymod2pkg-0.23.0/PKG-INFO
--- old/pymod2pkg-0.22.1/PKG-INFO 2019-09-30 14:00:45.000000000 +0200
+++ new/pymod2pkg-0.23.0/PKG-INFO 2020-03-23 20:03:16.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pymod2pkg
-Version: 0.22.1
+Version: 0.23.0
Summary: python module name to package name map
Home-page: https://docs.openstack.org/pymod2pkg/latest/
Author: OpenStack
@@ -52,11 +52,10 @@
Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Topic :: Software Development :: Libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/lower-constraints.txt
new/pymod2pkg-0.23.0/lower-constraints.txt
--- old/pymod2pkg-0.22.1/lower-constraints.txt 2019-09-30 13:59:53.000000000
+0200
+++ new/pymod2pkg-0.23.0/lower-constraints.txt 2020-03-23 20:02:07.000000000
+0100
@@ -26,4 +26,3 @@
testresources==2.0.0
testtools==2.2.0
traceback2==1.4.0
-unittest2==1.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/pymod2pkg/__init__.py
new/pymod2pkg-0.23.0/pymod2pkg/__init__.py
--- old/pymod2pkg-0.22.1/pymod2pkg/__init__.py 2019-09-30 13:59:53.000000000
+0200
+++ new/pymod2pkg-0.23.0/pymod2pkg/__init__.py 2020-03-23 20:02:07.000000000
+0100
@@ -13,7 +13,7 @@
from __future__ import print_function
import argparse
-import platform
+import distro
import re
@@ -330,7 +330,7 @@
]
OPENSTACK_UPSTREAM_PKG_MAP = [
- SingleRule('openstacksdk', 'python-openstacksdk'),
+ SingleRule('openstack-placement', 'placement'),
SingleRule('gnocchiclient', 'python-gnocchiclient'),
SingleRule('aodhclient', 'python-aodhclient'),
SingleRule('keystoneauth1', 'keystoneauth'),
@@ -340,17 +340,19 @@
def get_pkg_map(dist):
- if dist.lower().find('suse') != -1:
+ d_lower = dist.lower()
+ if 'suse' in d_lower or 'sles' in d_lower:
return SUSE_PKG_MAP
- if dist.lower().find('ubuntu') != -1:
+ if 'ubuntu' in d_lower:
return UBUNTU_PKG_MAP
return RDO_PKG_MAP
def get_default_tr_func(dist):
- if dist.lower().find('suse') != -1:
+ d_lower = dist.lower()
+ if 'suse' in d_lower or 'sles' in d_lower:
return default_suse_tr
- if dist.lower().find('ubuntu') != -1:
+ if 'ubuntu' in d_lower:
return default_ubuntu_tr
return default_rdo_tr
@@ -360,7 +362,7 @@
mod: python module name
dist: a linux distribution as returned by
- `platform.linux_distribution()[0]`
+ `distro.LinuxDistribution().id().partition(' ')[0]`
pkg_map: a custom package mapping. None means autodetected based on the
given dist parameter
py_vers: a list of python versions the function should return. Default is
@@ -412,9 +414,9 @@
parser = argparse.ArgumentParser(description='Python module name to'
'package name')
group = parser.add_mutually_exclusive_group()
- group.add_argument('--dist', help='distribution style '
- '(default: %(default)s)',
- default=platform.linux_distribution()[0])
+ group.add_argument(
+ '--dist', help='distribution style (default: %(default)s)',
+ default=distro.LinuxDistribution().id().partition(' ')[0])
group.add_argument('--upstream', help='map to OpenStack project name',
action='store_true')
parser.add_argument('--pyver', help='Python versions to return. "py" is '
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/pymod2pkg.egg-info/PKG-INFO
new/pymod2pkg-0.23.0/pymod2pkg.egg-info/PKG-INFO
--- old/pymod2pkg-0.22.1/pymod2pkg.egg-info/PKG-INFO 2019-09-30
14:00:45.000000000 +0200
+++ new/pymod2pkg-0.23.0/pymod2pkg.egg-info/PKG-INFO 2020-03-23
20:03:16.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pymod2pkg
-Version: 0.22.1
+Version: 0.23.0
Summary: python module name to package name map
Home-page: https://docs.openstack.org/pymod2pkg/latest/
Author: OpenStack
@@ -52,11 +52,10 @@
Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Topic :: Software Development :: Libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/pymod2pkg.egg-info/pbr.json
new/pymod2pkg-0.23.0/pymod2pkg.egg-info/pbr.json
--- old/pymod2pkg-0.22.1/pymod2pkg.egg-info/pbr.json 2019-09-30
14:00:45.000000000 +0200
+++ new/pymod2pkg-0.23.0/pymod2pkg.egg-info/pbr.json 2020-03-23
20:03:16.000000000 +0100
@@ -1 +1 @@
-{"git_version": "756c7a7", "is_release": true}
\ No newline at end of file
+{"git_version": "037724d", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/pymod2pkg.egg-info/requires.txt
new/pymod2pkg-0.23.0/pymod2pkg.egg-info/requires.txt
--- old/pymod2pkg-0.22.1/pymod2pkg.egg-info/requires.txt 2019-09-30
14:00:45.000000000 +0200
+++ new/pymod2pkg-0.23.0/pymod2pkg.egg-info/requires.txt 2020-03-23
20:03:16.000000000 +0100
@@ -1 +1,2 @@
+distro
pbr!=2.1.0,>=2.0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/requirements.txt
new/pymod2pkg-0.23.0/requirements.txt
--- old/pymod2pkg-0.22.1/requirements.txt 2019-09-30 13:59:53.000000000
+0200
+++ new/pymod2pkg-0.23.0/requirements.txt 2020-03-23 20:02:07.000000000
+0100
@@ -1,4 +1,5 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
+distro
pbr!=2.1.0,>=2.0.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/setup.cfg
new/pymod2pkg-0.23.0/setup.cfg
--- old/pymod2pkg-0.22.1/setup.cfg 2019-09-30 14:00:45.000000000 +0200
+++ new/pymod2pkg-0.23.0/setup.cfg 2020-03-23 20:03:16.000000000 +0100
@@ -7,11 +7,10 @@
author-email = [email protected]
home-page = https://docs.openstack.org/pymod2pkg/latest/
classifier =
- Programming Language :: Python :: 2
- Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
+ Programming Language :: Python :: 3.8
Intended Audience :: Developers
License :: OSI Approved :: Apache Software License
Topic :: Software Development :: Libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/test-requirements.txt
new/pymod2pkg-0.23.0/test-requirements.txt
--- old/pymod2pkg-0.22.1/test-requirements.txt 2019-09-30 13:59:53.000000000
+0200
+++ new/pymod2pkg-0.23.0/test-requirements.txt 2020-03-23 20:02:07.000000000
+0100
@@ -5,6 +5,5 @@
testresources>=2.0.0 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7;python_version>='3.4' # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/tests.py
new/pymod2pkg-0.23.0/tests.py
--- old/pymod2pkg-0.22.1/tests.py 2019-09-30 13:59:53.000000000 +0200
+++ new/pymod2pkg-0.23.0/tests.py 2020-03-23 20:02:07.000000000 +0100
@@ -14,11 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-# py26 compat
-try:
- import unittest2 as unittest
-except ImportError:
- import unittest
+import unittest
import pymod2pkg
@@ -89,8 +85,8 @@
self.assertEqual(pymod2pkg.module2upstream('oslo.db'), 'oslo.db')
self.assertEqual(pymod2pkg.module2upstream('python-glanceclient'),
'python-glanceclient')
- self.assertEqual(pymod2pkg.module2upstream('openstacksdk'),
- 'python-openstacksdk')
+ self.assertEqual(pymod2pkg.module2upstream('openstack-placement'),
+ 'placement')
self.assertNotEqual(pymod2pkg.module2upstream('keystoneauth1'),
'keystoneauth1')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pymod2pkg-0.22.1/tox.ini new/pymod2pkg-0.23.0/tox.ini
--- old/pymod2pkg-0.22.1/tox.ini 2019-09-30 13:59:53.000000000 +0200
+++ new/pymod2pkg-0.23.0/tox.ini 2020-03-23 20:02:07.000000000 +0100
@@ -1,9 +1,11 @@
[tox]
-envlist = py27,py37,pypy,pep8
-minversion = 2.0
+envlist = py37,pypy,pep8
+minversion = 3.1
skipsdist = True
+ignore_basepython_conflict = True
[testenv]
+basepython = python3
usedevelop = True
install_command = pip install {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
@@ -17,23 +19,19 @@
commands = stestr run {posargs}
[testenv:pep8]
-basepython = python3
deps = {[testenv]deps}
- flake8<3.7.0,>=3.6.0
+ flake8<3.8.0,>=3.7.0
commands = flake8
[testenv:venv]
-basepython = python3
commands = {posargs}
[testenv:docs]
-basepython = python3
commands =
sphinx-build -W -b html doc/source doc/build/html
[testenv:lower-constraints]
-basepython = python3
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
