Hello community,
here is the log from the commit of package python-renderspec for
openSUSE:Factory checked in at 2019-09-23 12:37:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-renderspec (Old)
and /work/SRC/openSUSE:Factory/.python-renderspec.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-renderspec"
Mon Sep 23 12:37:16 2019 rev:8 rq:732093 version:1.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-renderspec/python-renderspec.changes
2017-10-13 14:18:08.350816367 +0200
+++
/work/SRC/openSUSE:Factory/.python-renderspec.new.7948/python-renderspec.changes
2019-09-23 12:38:38.429597888 +0200
@@ -1,0 +2,52 @@
+Fri Sep 20 07:49:13 UTC 2019 - Dirk Mueller <dmuel...@suse.com>
+
+- add conflict for the impossible to workaround staging failures
+
+-------------------------------------------------------------------
+Thu Jul 11 17:22:15 UTC 2019 - cloud-de...@suse.de
+
+- update to version 1.12.0
+ - Add contextfunctions 'py2' and 'py3'
+
+-------------------------------------------------------------------
+Wed Jun 26 15:37:43 UTC 2019 - Dirk Mueller <dmuel...@suse.com>
+
+- switch to python 3.x only package
+
+-------------------------------------------------------------------
+Mon Jun 17 10:07:53 UTC 2019 - cloud-de...@suse.de
+
+- update to version 1.11.1
+ - Switch to TOX_CONSTRAINTS_FILE
+ - Update flake8 version to latest release
+ - Switch to openstackdocstheme
+ - OpenDev Migration Patch
+ - Preserve list order in _pymod2pkg_translate
+ - Fix _pymod2pkg_translate when skip_pyversion is None
+ - Follow opendev rebranding
+
+-------------------------------------------------------------------
+Thu Apr 25 08:41:10 UTC 2019 - cloud-de...@suse.de
+
+- update to version 1.10.0
+ - fix tox python3 overrides
+ - Update home-page
+ - Update links in README
+ - Switch to stestr
+ - Change openstack-dev to openstack-discuss
+ - Move linter dependencies out of test-requirements
+ - Removed older version of python added 3.5
+ - Avoid tox_install.sh for constraints support
+ - switch documentation job to new PTI
+ - Update to a somewhat recent flake8 version
+ - add python 3.6 unit test job
+ - Updated from global requirements
+ - import zuul job settings from project-config
+- convert to singlespec
+
+-------------------------------------------------------------------
+Wed Apr 10 10:48:02 UTC 2019 - Dirk Mueller <dmuel...@suse.com>
+
+- refresh spec file from master
+
+-------------------------------------------------------------------
Old:
----
renderspec-1.9.1.tar.gz
New:
----
renderspec-1.12.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-renderspec.spec ++++++
--- /var/tmp/diff_new_pack.okQR9G/_old 2019-09-23 12:38:38.785597829 +0200
+++ /var/tmp/diff_new_pack.okQR9G/_new 2019-09-23 12:38:38.785597829 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-renderspec
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,67 +12,96 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%global sname renderspec
+%global oldpython python
Name: python-renderspec
-Version: 1.9.1
+Version: 1.12.0
Release: 0
Summary: Generate spec files from Jinja2 templates
License: Apache-2.0
Group: Development/Languages/Python
-Url: http://launchpad.net/%{sname}
-Source0:
https://pypi.io/packages/source/r/%{sname}/%{sname}-%{version}.tar.gz
+URL: https://launchpad.net/renderspec
+Source0:
https://files.pythonhosted.org/packages/source/r/renderspec/renderspec-%{version}.tar.gz
BuildRequires: openstack-macros
-BuildRequires: python-devel
-BuildRequires: python-pbr >= 2.0.0
-Requires: python-Jinja2 >= 2.8
-Requires: python-PyYAML >= 3.10.0
+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
+BuildRequires: python3-packaging >= 16.5
+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.9.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 doc
+%package -n python-renderspec-doc
Summary: Documentation for the renderspec utility
Group: Development/Languages/Python
BuildRequires: python-Sphinx
-BuildRequires: python-oslosphinx >= 4.7.0
+BuildRequires: python-openstackdocstheme
Requires: %{name} = %{version}
-%description doc
+%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 %{sname}-%{version}
+%autosetup -p 1 -n renderspec-1.12.0
%py_req_cleanup
%build
-%{py2_build}
+%{python_build}
-%{__python2} setup.py build_sphinx
+PBR_VERSION=1.12.0 sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
-%{py2_install}
+%{python_install}
-%files
+%check
+%python_exec -m stestr.cli run
+
+%files %{python_files}
%license LICENSE
%doc README.rst ChangeLog
-%{_bindir}/%{sname}
-%{python2_sitelib}/%{sname}
-%{python2_sitelib}/*.egg-info
+%if 0%{?suse_version}
+%python3_only %{_bindir}/renderspec
+%else
+%{_bindir}/renderspec
+%endif
+%{python_sitelib}/renderspec
+%{python_sitelib}/*.egg-info
-%files doc
+%files -n python-renderspec-doc
%doc doc/build/html
%license LICENSE
++++++ _service ++++++
--- /var/tmp/diff_new_pack.okQR9G/_old 2019-09-23 12:38:38.813597825 +0200
+++ /var/tmp/diff_new_pack.okQR9G/_new 2019-09-23 12:38:38.813597825 +0200
@@ -2,7 +2,7 @@
<service mode="disabled" name="renderspec">
<param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/renderspec/renderspec.spec.j2</param>
<param name="output-name">python-renderspec.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/global-requirements.txt</param>
+ <param
name="requirements">https://raw.githubusercontent.com/openstack/renderspec/master/requirements.txt</param>
<param name="changelog-email">cloud-de...@suse.de</param>
<param name="changelog-provider">gh,openstack,renderspec</param>
</service>
++++++ renderspec-1.9.1.tar.gz -> renderspec-1.12.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/.stestr.conf
new/renderspec-1.12.0/.stestr.conf
--- old/renderspec-1.9.1/.stestr.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/renderspec-1.12.0/.stestr.conf 2019-07-05 14:49:31.000000000 +0200
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./
+top_dir=./
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/.testr.conf
new/renderspec-1.12.0/.testr.conf
--- old/renderspec-1.9.1/.testr.conf 2017-10-10 19:03:57.000000000 +0200
+++ new/renderspec-1.12.0/.testr.conf 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
- OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
- OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
- OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \
- ${PYTHON:-python} -m subunit.run discover -t ./ ./ $LISTOPT
$IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/.zuul.yaml
new/renderspec-1.12.0/.zuul.yaml
--- old/renderspec-1.9.1/.zuul.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/renderspec-1.12.0/.zuul.yaml 2019-07-05 14:49:31.000000000 +0200
@@ -0,0 +1,6 @@
+- project:
+ templates:
+ - openstack-python-jobs
+ - openstack-python35-jobs
+ - openstack-python36-jobs
+ - publish-openstack-docs-pti
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/AUTHORS
new/renderspec-1.12.0/AUTHORS
--- old/renderspec-1.9.1/AUTHORS 2017-10-10 19:05:56.000000000 +0200
+++ new/renderspec-1.12.0/AUTHORS 2019-07-05 14:50:13.000000000 +0200
@@ -1,6 +1,9 @@
+98k <18552437...@163.com>
Alexander Tsamutali <atsamut...@mirantis.com>
+Andreas Jaeger <a...@suse.com>
Andrii Kroshchenko <akroshche...@mirantis.com>
Dirk Mueller <d...@dmllr.de>
+Doug Hellmann <d...@doughellmann.com>
Flavio Percoco <flape...@gmail.com>
Haikel Guemar <hgue...@fedoraproject.org>
Igor Yozhikov <iyozhi...@mirantis.com>
@@ -9,5 +12,9 @@
Thomas Bechtold <tbecht...@suse.com>
Thomas Bechtold <thomasbecht...@jpberlin.de>
Tony Xu <hhkt...@gmail.com>
+Vu Cong Tuan <tua...@vn.fujitsu.com>
avnish <avnish....@nectechnologies.in>
gecong1973 <ge.c...@zte.com.cn>
+huang.zhiping <huang.zhip...@99cloud.net>
+melissaml <ma....@99cloud.net>
+qingszhao <zhao.daq...@99cloud.net>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/ChangeLog
new/renderspec-1.12.0/ChangeLog
--- old/renderspec-1.9.1/ChangeLog 2017-10-10 19:05:56.000000000 +0200
+++ new/renderspec-1.12.0/ChangeLog 2019-07-05 14:50:13.000000000 +0200
@@ -1,6 +1,45 @@
CHANGES
=======
+1.12.0
+------
+
+* Add contextfunctions 'py2' and 'py3'
+
+1.11.1
+------
+
+* Fix \_pymod2pkg\_translate when skip\_pyversion is None
+
+1.11.0
+------
+
+* Preserve list order in \_pymod2pkg\_translate
+* Switch to TOX\_CONSTRAINTS\_FILE
+* Update flake8 version to latest release
+* Follow opendev rebranding
+* Switch to openstackdocstheme
+* OpenDev Migration Patch
+
+1.10.0
+------
+
+* Update home-page
+* Move linter dependencies out of test-requirements
+* Change openstack-dev to openstack-discuss
+* Change openstack-dev to openstack-discuss
+* Switch to stestr
+* Removed older version of python added 3.5
+* fix tox python3 overrides
+* add python 3.6 unit test job
+* switch documentation job to new PTI
+* import zuul job settings from project-config
+* Update links in README
+* Updated from global requirements
+* Avoid tox\_install.sh for constraints support
+* Updated from global requirements
+* Update to a somewhat recent flake8 version
+
1.9.1
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/PKG-INFO
new/renderspec-1.12.0/PKG-INFO
--- old/renderspec-1.9.1/PKG-INFO 2017-10-10 19:05:57.000000000 +0200
+++ new/renderspec-1.12.0/PKG-INFO 2019-07-05 14:50:13.000000000 +0200
@@ -1,18 +1,17 @@
Metadata-Version: 1.1
Name: renderspec
-Version: 1.9.1
+Version: 1.12.0
Summary: Jinja2 template renderer for generating .spec files
-Home-page: http://docs.openstack.org/developer/renderspec/
+Home-page: https://docs.openstack.org/renderspec/latest/
Author: OpenStack
-Author-email: openstack-...@lists.openstack.org
+Author-email: openstack-disc...@lists.openstack.org
License: UNKNOWN
-Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
- .. image:: http://governance.openstack.org/badges/renderspec.svg
- :target: http://governance.openstack.org/reference/tags/index.html
+ .. image:: https://governance.openstack.org/tc/badges/renderspec.svg
+ :target:
https://governance.openstack.org/tc/reference/tags/index.html
.. Change things from this point on
@@ -25,7 +24,7 @@
Documentation for renderspec can be found at
- http://docs.openstack.org/developer/renderspec/
+ https://docs.openstack.org/renderspec/latest/
For more information about the OpenStack rpm packaging initiative,
please
follow the link to the wiki page:
@@ -45,12 +44,12 @@
their work on the latest code, available from the master GIT
repository at:
- https://git.openstack.org/cgit/openstack/renderspec
+ https://opendev.org/openstack/renderspec
Developers should also join the discussion on the mailing list,
at:
- http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
+
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss
or join the IRC channel on
@@ -68,5 +67,4 @@
Classifier: Programming Language :: Python :: 2
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/README.rst
new/renderspec-1.12.0/README.rst
--- old/renderspec-1.9.1/README.rst 2017-10-10 19:03:57.000000000 +0200
+++ new/renderspec-1.12.0/README.rst 2019-07-05 14:49:31.000000000 +0200
@@ -2,8 +2,8 @@
Team and repository tags
========================
-.. image:: http://governance.openstack.org/badges/renderspec.svg
- :target: http://governance.openstack.org/reference/tags/index.html
+.. image:: https://governance.openstack.org/tc/badges/renderspec.svg
+ :target: https://governance.openstack.org/tc/reference/tags/index.html
.. Change things from this point on
@@ -16,7 +16,7 @@
Documentation for renderspec can be found at
- http://docs.openstack.org/developer/renderspec/
+ https://docs.openstack.org/renderspec/latest/
For more information about the OpenStack rpm packaging initiative, please
follow the link to the wiki page:
@@ -36,12 +36,12 @@
their work on the latest code, available from the master GIT
repository at:
- https://git.openstack.org/cgit/openstack/renderspec
+ https://opendev.org/openstack/renderspec
Developers should also join the discussion on the mailing list,
at:
- http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
+ http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss
or join the IRC channel on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/doc/requirements.txt
new/renderspec-1.12.0/doc/requirements.txt
--- old/renderspec-1.9.1/doc/requirements.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/renderspec-1.12.0/doc/requirements.txt 2019-07-05 14:49:31.000000000
+0200
@@ -0,0 +1,6 @@
+# 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.
+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
+openstackdocstheme>=1.18.1 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/doc/source/conf.py
new/renderspec-1.12.0/doc/source/conf.py
--- old/renderspec-1.9.1/doc/source/conf.py 2017-10-10 19:03:57.000000000
+0200
+++ new/renderspec-1.12.0/doc/source/conf.py 2019-07-05 14:49:31.000000000
+0200
@@ -10,7 +10,7 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = [
'sphinx.ext.autodoc',
- 'oslosphinx',
+ 'openstackdocstheme',
]
# autodoc generation is a bit aggressive and a nuisance when doing heavy
@@ -40,6 +40,9 @@
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
+# openstackdocstheme options
+repository_name = 'openstack/renderspec'
+
# -- Options for HTML output --------------------------------------------------
# The theme to use for HTML and HTML Help pages. Major themes that come with
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/doc/source/index.rst
new/renderspec-1.12.0/doc/source/index.rst
--- old/renderspec-1.9.1/doc/source/index.rst 2017-10-10 19:03:57.000000000
+0200
+++ new/renderspec-1.12.0/doc/source/index.rst 2019-07-05 14:49:31.000000000
+0200
@@ -25,13 +25,13 @@
Contributing
============
-Code is hosted at `git.openstack.org`_. Submit bugs to the
+Code is hosted at `opendev.org`_. Submit bugs to the
renderspec project on `Launchpad`_. Submit code to the
openstack/renderspec project using `Gerrit`_.
-.. _git.openstack.org: https://git.openstack.org/cgit/openstack/renderspec
+.. _opendev.org: https://opendev.org/openstack/renderspec
.. _Launchpad: https://launchpad.net/renderspec
-.. _Gerrit:
http://docs.openstack.org/infra/manual/developers.html#development-workflow
+.. _Gerrit:
https://docs.openstack.org/infra/manual/developers.html#development-workflow
Indices and tables
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/doc/source/usage.rst
new/renderspec-1.12.0/doc/source/usage.rst
--- old/renderspec-1.9.1/doc/source/usage.rst 2017-10-10 19:03:57.000000000
+0200
+++ new/renderspec-1.12.0/doc/source/usage.rst 2019-07-05 14:49:31.000000000
+0200
@@ -259,6 +259,14 @@
BuildRequires: python2-oslo-config >= 2:3.4.0 python3-oslo-config >= 2:3.4.0
+context function `py2`
+**********************
+Similar to `py2pkg` but uses a `py_versions` set to `py2`
+
+context function `py3`
+**********************
+Similar to `py2pkg` but uses a `py_versions` set to `py3`.
+
context function `epoch`
************************
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/renderspec/contextfuncs.py
new/renderspec-1.12.0/renderspec/contextfuncs.py
--- old/renderspec-1.9.1/renderspec/contextfuncs.py 2017-10-10
19:03:57.000000000 +0200
+++ new/renderspec-1.12.0/renderspec/contextfuncs.py 2019-07-05
14:49:31.000000000 +0200
@@ -153,8 +153,9 @@
py_versions = [py_versions]
kwargs = {}
if py_versions:
- kwargs['py_vers'] = list(set(py_versions) -
- set((context['skip_pyversion'],)))
+ kwargs['py_vers'] = [i for i in py_versions if i not in
+ set((context['skip_pyversion'],))]
+
translations = pymod2pkg.module2package(
pkg_name, context['spec_style'], **kwargs)
# we want always return a list but module2package() might return a string
@@ -206,6 +207,14 @@
return ' '.join(['%s%s' % (name, v_str) for name in name_list])
+def _context_py2(context, pkg_name, pkg_version=None):
+ return _context_py2pkg(context, pkg_name, pkg_version, py_versions=['py2'])
+
+
+def _context_py3(context, pkg_name, pkg_version=None):
+ return _context_py2pkg(context, pkg_name, pkg_version, py_versions=['py3'])
+
+
def _context_license_spdx(context, value):
"""convert a given known spdx license to another one"""
# more values can be taken from from https://github.com/hughsie/\
@@ -262,6 +271,16 @@
@contextfunction
+def _globals_py2(context, pkg_name, pkg_version=None):
+ return _context_py2(context, pkg_name, pkg_version)
+
+
+@contextfunction
+def _globals_py3(context, pkg_name, pkg_version=None):
+ return _context_py3(context, pkg_name, pkg_version)
+
+
+@contextfunction
def _globals_fetch_source(context, url):
return _context_fetch_source(context, url)
@@ -308,6 +327,8 @@
env.globals['py2rpmversion'] = _globals_py2rpmversion
env.globals['py2rpmrelease'] = _globals_py2rpmrelease
env.globals['py2pkg'] = _globals_py2pkg
+ env.globals['py2'] = _globals_py2
+ env.globals['py3'] = _globals_py3
env.globals['py2name'] = _globals_py2name
env.globals['epoch'] = _globals_epoch
env.globals['license'] = _globals_license_spdx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/renderspec/versions.py
new/renderspec-1.12.0/renderspec/versions.py
--- old/renderspec-1.9.1/renderspec/versions.py 2017-10-10 19:03:57.000000000
+0200
+++ new/renderspec-1.12.0/renderspec/versions.py 2019-07-05
14:49:31.000000000 +0200
@@ -24,13 +24,13 @@
"""parse the given lines and return a dict with pkg_name->version.
lines must follow PEP0508"""
requires = {}
- for l in lines:
+ for line in lines:
# skip comments and empty lines
- if l.startswith('#') or len(l.strip()) == 0:
+ if line.startswith('#') or len(line.strip()) == 0:
continue
# remove trailing comments
- l = l.split('#')[0].rstrip(' ')
- r = Requirement(l)
+ line = line.split('#')[0].rstrip(' ')
+ r = Requirement(line)
# check if we need the requirement
if r.marker:
# TODO (toabctl): currently we hardcode python 2.7 and linux2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/renderspec.egg-info/PKG-INFO
new/renderspec-1.12.0/renderspec.egg-info/PKG-INFO
--- old/renderspec-1.9.1/renderspec.egg-info/PKG-INFO 2017-10-10
19:05:56.000000000 +0200
+++ new/renderspec-1.12.0/renderspec.egg-info/PKG-INFO 2019-07-05
14:50:13.000000000 +0200
@@ -1,18 +1,17 @@
Metadata-Version: 1.1
Name: renderspec
-Version: 1.9.1
+Version: 1.12.0
Summary: Jinja2 template renderer for generating .spec files
-Home-page: http://docs.openstack.org/developer/renderspec/
+Home-page: https://docs.openstack.org/renderspec/latest/
Author: OpenStack
-Author-email: openstack-...@lists.openstack.org
+Author-email: openstack-disc...@lists.openstack.org
License: UNKNOWN
-Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
- .. image:: http://governance.openstack.org/badges/renderspec.svg
- :target: http://governance.openstack.org/reference/tags/index.html
+ .. image:: https://governance.openstack.org/tc/badges/renderspec.svg
+ :target:
https://governance.openstack.org/tc/reference/tags/index.html
.. Change things from this point on
@@ -25,7 +24,7 @@
Documentation for renderspec can be found at
- http://docs.openstack.org/developer/renderspec/
+ https://docs.openstack.org/renderspec/latest/
For more information about the OpenStack rpm packaging initiative,
please
follow the link to the wiki page:
@@ -45,12 +44,12 @@
their work on the latest code, available from the master GIT
repository at:
- https://git.openstack.org/cgit/openstack/renderspec
+ https://opendev.org/openstack/renderspec
Developers should also join the discussion on the mailing list,
at:
- http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
+
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss
or join the IRC channel on
@@ -68,5 +67,4 @@
Classifier: Programming Language :: Python :: 2
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/renderspec.egg-info/SOURCES.txt
new/renderspec-1.12.0/renderspec.egg-info/SOURCES.txt
--- old/renderspec-1.9.1/renderspec.egg-info/SOURCES.txt 2017-10-10
19:05:57.000000000 +0200
+++ new/renderspec-1.12.0/renderspec.egg-info/SOURCES.txt 2019-07-05
14:50:13.000000000 +0200
@@ -1,4 +1,5 @@
-.testr.conf
+.stestr.conf
+.zuul.yaml
AUTHORS
ChangeLog
LICENSE
@@ -9,6 +10,7 @@
test-requirements.txt
tests.py
tox.ini
+doc/requirements.txt
doc/source/conf.py
doc/source/index.rst
doc/source/installation.rst
@@ -27,5 +29,4 @@
renderspec.egg-info/requires.txt
renderspec.egg-info/top_level.txt
renderspec/dist-templates/fedora.spec.j2
-renderspec/dist-templates/suse.spec.j2
-tools/tox_install.sh
\ No newline at end of file
+renderspec/dist-templates/suse.spec.j2
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/renderspec.egg-info/pbr.json
new/renderspec-1.12.0/renderspec.egg-info/pbr.json
--- old/renderspec-1.9.1/renderspec.egg-info/pbr.json 2017-10-10
19:05:56.000000000 +0200
+++ new/renderspec-1.12.0/renderspec.egg-info/pbr.json 2019-07-05
14:50:13.000000000 +0200
@@ -1 +1 @@
-{"git_version": "eb3ea10", "is_release": true}
\ No newline at end of file
+{"git_version": "8083f1e", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/renderspec.egg-info/requires.txt
new/renderspec-1.12.0/renderspec.egg-info/requires.txt
--- old/renderspec-1.9.1/renderspec.egg-info/requires.txt 2017-10-10
19:05:56.000000000 +0200
+++ new/renderspec-1.12.0/renderspec.egg-info/requires.txt 2019-07-05
14:50:13.000000000 +0200
@@ -1,8 +1,5 @@
-Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8
pymod2pkg!=0.8.0,>=0.7.0
+Jinja2>=2.10
PyYAML>=3.10
packaging>=16.5
-six>=1.9.0
-
-[bandit]
-bandit>=1.1.0
+six>=1.10.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/requirements.txt
new/renderspec-1.12.0/requirements.txt
--- old/renderspec-1.9.1/requirements.txt 2017-10-10 19:03:57.000000000
+0200
+++ new/renderspec-1.12.0/requirements.txt 2019-07-05 14:49:31.000000000
+0200
@@ -1,8 +1,8 @@
# 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.
-Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)
pymod2pkg!=0.8.0,>=0.7.0 # Apache-2.0
+Jinja2>=2.10 # BSD License (3 clause)
PyYAML>=3.10 # MIT
packaging>=16.5 # Apache-2.0
-six>=1.9.0 # MIT
+six>=1.10.0 # MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/setup.cfg
new/renderspec-1.12.0/setup.cfg
--- old/renderspec-1.9.1/setup.cfg 2017-10-10 19:05:57.000000000 +0200
+++ new/renderspec-1.12.0/setup.cfg 2019-07-05 14:50:13.000000000 +0200
@@ -4,8 +4,8 @@
description-file =
README.rst
author = OpenStack
-author-email = openstack-...@lists.openstack.org
-home-page = http://docs.openstack.org/developer/renderspec/
+author-email = openstack-disc...@lists.openstack.org
+home-page = https://docs.openstack.org/renderspec/latest/
classifier =
Environment :: Console
Environment :: OpenStack
@@ -17,13 +17,8 @@
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
- Programming Language :: Python :: 3.4
Programming Language :: Python :: 3.5
-[extras]
-bandit =
- bandit>=1.1.0 # Apache-2.0
-
[global]
setup-hooks =
pbr.hooks.setup_hook
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/test-requirements.txt
new/renderspec-1.12.0/test-requirements.txt
--- old/renderspec-1.9.1/test-requirements.txt 2017-10-10 19:03:57.000000000
+0200
+++ new/renderspec-1.12.0/test-requirements.txt 2019-07-05 14:49:31.000000000
+0200
@@ -1,12 +1,8 @@
# 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.
-flake8<2.6.0,>=2.5.4 # MIT
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
testresources>=2.0.0 # Apache-2.0/BSD
-testtools>=1.4.0 # MIT
+testtools>=2.2.0 # MIT
ddt>=1.0.1 # MIT
mock>=2.0.0 # BSD
-
-sphinx>=1.6.2 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/tests.py
new/renderspec-1.12.0/tests.py
--- old/renderspec-1.9.1/tests.py 2017-10-10 19:03:57.000000000 +0200
+++ new/renderspec-1.12.0/tests.py 2019-07-05 14:49:31.000000000 +0200
@@ -134,6 +134,32 @@
context, pkg_name, pkg_version, py_versions),
expected_result)
+ @data(
+ ({'spec_style': 'suse', 'epochs': {}, 'requirements': {}},
+ 'oslo.config', None, 'python2-oslo.config'),
+ )
+ @unpack
+ def test_context_py2(self, context, pkg_name, pkg_version,
+ expected_result):
+ context.setdefault('skip_pyversion', ())
+ self.assertEqual(
+ renderspec.contextfuncs._context_py2(
+ context, pkg_name, pkg_version),
+ expected_result)
+
+ @data(
+ ({'spec_style': 'suse', 'epochs': {}, 'requirements': {}},
+ 'oslo.config', None, 'python3-oslo.config'),
+ )
+ @unpack
+ def test_context_py3(self, context, pkg_name, pkg_version,
+ expected_result):
+ context.setdefault('skip_pyversion', ())
+ self.assertEqual(
+ renderspec.contextfuncs._context_py3(
+ context, pkg_name, pkg_version),
+ expected_result)
+
def test_context_epoch_without_epochs(self):
self.assertEqual(
renderspec.contextfuncs._context_epoch(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/tools/tox_install.sh
new/renderspec-1.12.0/tools/tox_install.sh
--- old/renderspec-1.9.1/tools/tox_install.sh 2017-10-10 19:03:57.000000000
+0200
+++ new/renderspec-1.12.0/tools/tox_install.sh 1970-01-01 01:00:00.000000000
+0100
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Client constraint file contains this client version pin that is in conflict
-# with installing the client from source. We should remove the version pin in
-# the constraints file before applying it for from-source installation.
-
-CONSTRAINTS_FILE=$1
-shift 1
-
-set -e
-
-# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
-# published to logs.openstack.org for easy debugging.
-localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
-
-if [[ $CONSTRAINTS_FILE != http* ]]; then
- CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
-fi
-# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
-curl $CONSTRAINTS_FILE --insecure --progress-bar --output $localfile
-
-pip install -c$localfile openstack-requirements
-
-# This is the main purpose of the script: Allow local installation of
-# the current repo. It is listed in constraints file and thus any
-# install will be constrained and we need to unconstrain it.
-edit-constraints $localfile -- $CLIENT_NAME
-
-pip install -c$localfile -U $*
-exit $?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/renderspec-1.9.1/tox.ini
new/renderspec-1.12.0/tox.ini
--- old/renderspec-1.9.1/tox.ini 2017-10-10 19:03:57.000000000 +0200
+++ new/renderspec-1.12.0/tox.ini 2019-07-05 14:49:31.000000000 +0200
@@ -5,36 +5,36 @@
[testenv]
usedevelop = True
-install_command =
- {toxinidir}/tools/tox_install.sh
{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
{opts} {packages}
+install_command = pip install {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
OS_STDOUT_NOCAPTURE=False
OS_STDERR_NOCAPTURE=False
PYTHONHASHSEED=0
- BRANCH_NAME=master
- CLIENT_NAME=renderspec
-deps = -r{toxinidir}/requirements.txt
+deps =
+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --testr-args='{posargs}'
+commands = stestr run {posargs}
[testenv:pep8]
-deps =
- .[bandit]
- {[testenv]deps}
+basepython = python3
+deps = {[testenv]deps}
+ flake8<3.8.0,>=3.7.0
+ bandit>=1.1.0
commands =
flake8
bandit -r -s B701 renderspec -x tests
[testenv:venv]
+basepython = python3
commands = {posargs}
-[testenv:bandit]
-deps = .[bandit]
-commands = bandit -s B701 -r renderspec -x tests
-
[flake8]
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build
[testenv:docs]
-commands = python setup.py build_sphinx
+basepython = python3
+deps = -r{toxinidir}/doc/requirements.txt
+commands =
+ python setup.py build_sphinx
