Hello community,
here is the log from the commit of package python-renderspec for
openSUSE:Factory checked in at 2020-03-17 13:11:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-renderspec (Old)
and /work/SRC/openSUSE:Factory/.python-renderspec.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-renderspec"
Tue Mar 17 13:11:39 2020 rev:9 rq:785863 version:2.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-renderspec/python-renderspec.changes
2019-09-23 12:38:38.429597888 +0200
+++
/work/SRC/openSUSE:Factory/.python-renderspec.new.3160/python-renderspec.changes
2020-03-17 13:11:43.641871852 +0100
@@ -1,0 +2,11 @@
+Tue Mar 17 09:50:15 UTC 2020 - [email protected]
+
+- update to version 2.0.0
+ - Set ignore_basepython_conflict in tox
+ - Add Python 3 Train unit tests
+ - Drop py27 support
+ - Fix urllib.urlopen for python3
+ - Drop use of unittest2
+ - Remove usage of platform.linux_distribution
+
+-------------------------------------------------------------------
Old:
----
renderspec-1.12.0.tar.gz
New:
----
renderspec-2.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-renderspec.spec ++++++
--- /var/tmp/diff_new_pack.KUPun9/_old 2020-03-17 13:11:44.117872218 +0100
+++ /var/tmp/diff_new_pack.KUPun9/_new 2020-03-17 13:11:44.121872221 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-renderspec
#
-# 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,7 +18,7 @@
%global oldpython python
Name: python-renderspec
-Version: 1.12.0
+Version: 2.0.0
Release: 0
Summary: Generate spec files from Jinja2 templates
License: Apache-2.0
@@ -26,13 +26,6 @@
URL: https://launchpad.net/renderspec
Source0:
https://files.pythonhosted.org/packages/source/r/renderspec/renderspec-%{version}.tar.gz
BuildRequires: openstack-macros
-BuildRequires: python2-Jinja2 >= 2.10
-BuildRequires: python2-ddt
-BuildRequires: python2-mock
-BuildRequires: python2-packaging >= 16.5
-BuildRequires: python2-pbr
-BuildRequires: python2-pymod2pkg >= 0.7.0
-BuildRequires: python2-stestr
BuildRequires: python3-Jinja2 >= 2.10
BuildRequires: python3-ddt
BuildRequires: python3-mock
@@ -40,66 +33,62 @@
BuildRequires: python3-pbr
BuildRequires: python3-pymod2pkg >= 0.7.0
BuildRequires: python3-stestr
-Requires: python-Jinja2 >= 2.10
-Requires: python-PyYAML >= 3.10
-Requires: python-packaging >= 16.5
-Requires: python-pymod2pkg >= 0.7.0
-Requires: python-six >= 1.10.0
-Conflicts: %{oldpython}-renderspec < %{version}
BuildArch: noarch
-%if 0%{?suse_version}
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
-%else
-# on RDO, update-alternatives is in chkconfig
-Requires(post): chkconfig
-Requires(postun): chkconfig
-%endif
-%python_subpackages
%description
renderspec is a tool to convert a .spec.j2 Jinja2 template to
a rpm .spec file which is usable for different distributions
and follow their policies and processes.
+%package -n python3-renderspec
+Summary: Generate spec files from Jinja2 templates
+Group: Development/Languages/Python
+Requires: python3-Jinja2 >= 2.10
+Requires: python3-PyYAML >= 3.10
+Requires: python3-packaging >= 16.5
+Requires: python3-pymod2pkg >= 0.7.0
+Requires: python3-six
+Conflicts: %{oldpython}-renderspec < %{version}
+
+%description -n python3-renderspec
+renderspec is a tool to convert a .spec.j2 Jinja2 template to
+a rpm .spec file which is usable for different distributions
+and follow their policies and processes.
+
%package -n python-renderspec-doc
Summary: Documentation for the renderspec utility
Group: Development/Languages/Python
-BuildRequires: python-Sphinx
-BuildRequires: python-openstackdocstheme
-Requires: %{name} = %{version}
+BuildRequires: python3-Sphinx
+BuildRequires: python3-openstackdocstheme
+Requires: python3-renderspec = %{version}
%description -n python-renderspec-doc
Documentation for the renderspec tool which is a tool to convert
a spec.j2 Jinja2 template into a rpm .spec file.
%prep
-%autosetup -p 1 -n renderspec-1.12.0
+%autosetup -p 1 -n renderspec-2.0.0
%py_req_cleanup
%build
-%{python_build}
+%{py3_build}
-PBR_VERSION=1.12.0 sphinx-build -b html doc/source doc/build/html
+PBR_VERSION=2.0.0 %sphinx_build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
-%{python_install}
+%{py3_install}
%check
-%python_exec -m stestr.cli run
+python3 -m stestr.cli run
-%files %{python_files}
+%files -n python3-renderspec
%license LICENSE
%doc README.rst ChangeLog
-%if 0%{?suse_version}
-%python3_only %{_bindir}/renderspec
-%else
%{_bindir}/renderspec
-%endif
-%{python_sitelib}/renderspec
-%{python_sitelib}/*.egg-info
+%{python3_sitelib}/renderspec
+%{python3_sitelib}/*.egg-info
%files -n python-renderspec-doc
%doc doc/build/html
++++++ renderspec-1.12.0.tar.gz -> renderspec-2.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/.zuul.yaml
new/renderspec-2.0.0/.zuul.yaml
--- old/renderspec-1.12.0/.zuul.yaml 2019-07-05 14:49:31.000000000 +0200
+++ new/renderspec-2.0.0/.zuul.yaml 2020-03-17 10:23:02.000000000 +0100
@@ -1,6 +1,4 @@
- project:
templates:
- - openstack-python-jobs
- - openstack-python35-jobs
- - openstack-python36-jobs
+ - openstack-python3-ussuri-jobs
- publish-openstack-docs-pti
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/AUTHORS
new/renderspec-2.0.0/AUTHORS
--- old/renderspec-1.12.0/AUTHORS 2019-07-05 14:50:13.000000000 +0200
+++ new/renderspec-2.0.0/AUTHORS 2020-03-17 10:23:50.000000000 +0100
@@ -2,13 +2,16 @@
Alexander Tsamutali <[email protected]>
Andreas Jaeger <[email protected]>
Andrii Kroshchenko <[email protected]>
+Corey Bryant <[email protected]>
Dirk Mueller <[email protected]>
Doug Hellmann <[email protected]>
Flavio Percoco <[email protected]>
+Ghanshyam Mann <[email protected]>
Haikel Guemar <[email protected]>
Igor Yozhikov <[email protected]>
Jakub Ruzicka <[email protected]>
Javier Pena <[email protected]>
+Sean McGinnis <[email protected]>
Thomas Bechtold <[email protected]>
Thomas Bechtold <[email protected]>
Tony Xu <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/ChangeLog
new/renderspec-2.0.0/ChangeLog
--- old/renderspec-1.12.0/ChangeLog 2019-07-05 14:50:13.000000000 +0200
+++ new/renderspec-2.0.0/ChangeLog 2020-03-17 10:23:50.000000000 +0100
@@ -1,6 +1,16 @@
CHANGES
=======
+2.0.0
+-----
+
+* Fix urllib.urlopen for python3
+* Remove usage of platform.linux\_distribution
+* Set ignore\_basepython\_conflict in tox
+* Drop py27 support
+* Drop use of unittest2
+* Add Python 3 Train unit tests
+
1.12.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/PKG-INFO
new/renderspec-2.0.0/PKG-INFO
--- old/renderspec-1.12.0/PKG-INFO 2019-07-05 14:50:13.000000000 +0200
+++ new/renderspec-2.0.0/PKG-INFO 2020-03-17 10:23:50.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: renderspec
-Version: 1.12.0
+Version: 2.0.0
Summary: Jinja2 template renderer for generating .spec files
Home-page: https://docs.openstack.org/renderspec/latest/
Author: OpenStack
@@ -64,7 +64,6 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: POSIX :: Linux
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/doc/source/usage.rst
new/renderspec-2.0.0/doc/source/usage.rst
--- old/renderspec-1.12.0/doc/source/usage.rst 2019-07-05 14:49:31.000000000
+0200
+++ new/renderspec-2.0.0/doc/source/usage.rst 2020-03-17 10:23:02.000000000
+0100
@@ -126,10 +126,11 @@
{% set upstream_version = upstream_version('1.2.3.0rc1') %}
{% set rpm_release = '1' %}
+ {% set source = url_pypi() %}
%name oslo.config
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
- Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-{{
upstream_version }}.tar.gz
+ Source0: {{ source }}
%prep
%setup -q -n %{sname}-{{upstream_version}}
@@ -138,7 +139,7 @@
%name oslo.config
Version: 1.2.3.0~rc1
Release: 0
- Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-1.2.3rc1.tar.gz
+ Source0:
https://files.pythonhosted.org/packages/source/o/%{sname}/%{sname}-1.2.3rc1.tar.gz
%prep
%setup -q -n %{sname}-1.2.3.0rc1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/renderspec/__init__.py
new/renderspec-2.0.0/renderspec/__init__.py
--- old/renderspec-1.12.0/renderspec/__init__.py 2019-07-05
14:49:31.000000000 +0200
+++ new/renderspec-2.0.0/renderspec/__init__.py 2020-03-17 10:23:02.000000000
+0100
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import print_function
-
import argparse
import os
import platform
@@ -80,7 +78,11 @@
def _get_default_distro():
- distname, _, _ = platform.linux_distribution()
+
+ distname = None
+ # Python 3.8 or newer does no longer provide this function
+ if hasattr(platform, 'linux_distribution'):
+ distname, _, _ = platform.linux_distribution()
# newer distros only have /etc/os-release and then platform doesn't work
# anymore and upstream does not want to fix it:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/renderspec/contextfuncs.py
new/renderspec-2.0.0/renderspec/contextfuncs.py
--- old/renderspec-1.12.0/renderspec/contextfuncs.py 2019-07-05
14:49:31.000000000 +0200
+++ new/renderspec-2.0.0/renderspec/contextfuncs.py 2020-03-17
10:23:02.000000000 +0100
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import print_function
-
import os
from jinja2 import contextfilter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/renderspec/utils.py
new/renderspec-2.0.0/renderspec/utils.py
--- old/renderspec-1.12.0/renderspec/utils.py 2019-07-05 14:49:31.000000000
+0200
+++ new/renderspec-2.0.0/renderspec/utils.py 2020-03-17 10:23:02.000000000
+0100
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import print_function
-
from contextlib import closing
from contextlib import contextmanager
from email.parser import HeaderParser
@@ -23,17 +21,15 @@
import shutil
import tarfile
import tempfile
+import urllib.request
import zipfile
-import six
-from six.moves.urllib.request import urlopen
-
def _download_file(url, dest_dir, dest_filename):
"""download a given url to a given destination directory and
destination filenamee"""
filename = os.path.join(dest_dir, dest_filename)
- with closing(urlopen(url)) as response: # nosec
+ with closing(urllib.request.urlopen(url)) as response: # nosec
with open(filename, 'wb') as f:
while True:
buf = response.read(8192)
@@ -68,7 +64,7 @@
def _find_archives(directories, basename):
"""return a list of archives in the given directories
or an empty list if no archive(s) can be found"""
- if isinstance(directories, six.string_types):
+ if isinstance(directories, str):
directories = [directories]
return sorted(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/renderspec/versions.py
new/renderspec-2.0.0/renderspec/versions.py
--- old/renderspec-1.12.0/renderspec/versions.py 2019-07-05
14:49:31.000000000 +0200
+++ new/renderspec-2.0.0/renderspec/versions.py 2020-03-17 10:23:02.000000000
+0100
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import print_function
-
from packaging.requirements import Requirement
from packaging.version import Version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/renderspec.egg-info/PKG-INFO
new/renderspec-2.0.0/renderspec.egg-info/PKG-INFO
--- old/renderspec-1.12.0/renderspec.egg-info/PKG-INFO 2019-07-05
14:50:13.000000000 +0200
+++ new/renderspec-2.0.0/renderspec.egg-info/PKG-INFO 2020-03-17
10:23:50.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: renderspec
-Version: 1.12.0
+Version: 2.0.0
Summary: Jinja2 template renderer for generating .spec files
Home-page: https://docs.openstack.org/renderspec/latest/
Author: OpenStack
@@ -64,7 +64,6 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: POSIX :: Linux
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/renderspec.egg-info/pbr.json
new/renderspec-2.0.0/renderspec.egg-info/pbr.json
--- old/renderspec-1.12.0/renderspec.egg-info/pbr.json 2019-07-05
14:50:13.000000000 +0200
+++ new/renderspec-2.0.0/renderspec.egg-info/pbr.json 2020-03-17
10:23:50.000000000 +0100
@@ -1 +1 @@
-{"git_version": "8083f1e", "is_release": true}
\ No newline at end of file
+{"git_version": "50bea70", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/renderspec.egg-info/requires.txt
new/renderspec-2.0.0/renderspec.egg-info/requires.txt
--- old/renderspec-1.12.0/renderspec.egg-info/requires.txt 2019-07-05
14:50:13.000000000 +0200
+++ new/renderspec-2.0.0/renderspec.egg-info/requires.txt 2020-03-17
10:23:50.000000000 +0100
@@ -2,4 +2,3 @@
Jinja2>=2.10
PyYAML>=3.10
packaging>=16.5
-six>=1.10.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/requirements.txt
new/renderspec-2.0.0/requirements.txt
--- old/renderspec-1.12.0/requirements.txt 2019-07-05 14:49:31.000000000
+0200
+++ new/renderspec-2.0.0/requirements.txt 2020-03-17 10:23:02.000000000
+0100
@@ -5,4 +5,3 @@
Jinja2>=2.10 # BSD License (3 clause)
PyYAML>=3.10 # MIT
packaging>=16.5 # Apache-2.0
-six>=1.10.0 # MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/setup.cfg
new/renderspec-2.0.0/setup.cfg
--- old/renderspec-1.12.0/setup.cfg 2019-07-05 14:50:13.000000000 +0200
+++ new/renderspec-2.0.0/setup.cfg 2020-03-17 10:23:50.000000000 +0100
@@ -14,10 +14,9 @@
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Programming Language :: Python
- Programming Language :: Python :: 2
- Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
- Programming Language :: Python :: 3.5
+ Programming Language :: Python :: 3.6
+ Programming Language :: Python :: 3.7
[global]
setup-hooks =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/tests.py
new/renderspec-2.0.0/tests.py
--- old/renderspec-1.12.0/tests.py 2019-07-05 14:49:31.000000000 +0200
+++ new/renderspec-2.0.0/tests.py 2020-03-17 10:23:02.000000000 +0100
@@ -15,10 +15,7 @@
# limitations under the License.
-try:
- import unittest2 as unittest
-except ImportError:
- import unittest
+import unittest
from ddt import data, ddt, unpack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.12.0/tox.ini
new/renderspec-2.0.0/tox.ini
--- old/renderspec-1.12.0/tox.ini 2019-07-05 14:49:31.000000000 +0200
+++ new/renderspec-2.0.0/tox.ini 2020-03-17 10:23:02.000000000 +0100
@@ -1,10 +1,12 @@
[tox]
-envlist = py27,py34,py35,pypy,pep8
-minversion = 2.0
+envlist = py37,pypy,pep8
+minversion = 3.1.1
skipsdist = True
+ignore_basepython_conflict = True
[testenv]
usedevelop = True
+basepython = python3
install_command = pip install {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
OS_STDOUT_NOCAPTURE=False
@@ -17,7 +19,6 @@
commands = stestr run {posargs}
[testenv:pep8]
-basepython = python3
deps = {[testenv]deps}
flake8<3.8.0,>=3.7.0
bandit>=1.1.0
@@ -26,14 +27,12 @@
bandit -r -s B701 renderspec -x tests
[testenv:venv]
-basepython = python3
commands = {posargs}
[flake8]
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build
[testenv:docs]
-basepython = python3
deps = -r{toxinidir}/doc/requirements.txt
commands =
python setup.py build_sphinx
