From b31f4c7bd5745e5be29fd63bad3b6aa3fe8bf46c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 29 Oct 2019 11:57:41 +0100 Subject: [PATCH] Update various versions to current master Change-Id: I3754fbb3f35082e428faf9236056701773688d5a --- openstack/keystoneauth1/keystoneauth1.spec.j2 | 9 +++++---- openstack/openstacksdk/openstacksdk.spec.j2 | 4 +++- openstack/os-apply-config/os-apply-config.spec.j2 | 2 +- openstack/os-collect-config/os-collect-config.spec.j2 | 2 +- openstack/os-refresh-config/os-refresh-config.spec.j2 | 2 +- openstack/os-vif/os-vif.spec.j2 | 2 +- openstack/oslo.utils/oslo.utils.spec.j2 | 2 +- openstack/ovsdbapp/ovsdbapp.spec.j2 | 2 +- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/openstack/keystoneauth1/keystoneauth1.spec.j2 b/openstack/keystoneauth1/keystoneauth1.spec.j2 index ba6f49c9a..03ef0d2da 100644 --- a/openstack/keystoneauth1/keystoneauth1.spec.j2 +++ b/openstack/keystoneauth1/keystoneauth1.spec.j2 @@ -1,6 +1,6 @@ %global sname keystoneauth1 Name: {{ py2name('keystoneauth1') }} -Version: 3.17.1 +Version: 3.18.0 Release: 0 Summary: OpenStack authenticating tools License: {{ license('Apache-2.0') }} @@ -46,8 +46,9 @@ Tools for authenticating to an OpenStack-based cloud. These tools include: %package -n python-keystoneauth1-doc Summary: Documentation for OpenStack authenticating tools -BuildRequires: {{ py2pkg('Sphinx') }} -BuildRequires: {{ py2pkg('openstackdocstheme', py_versions=['py2', 'py3']) }} +BuildRequires: {{ py3('Sphinx') }} +BuildRequires: {{ py3('openstackdocstheme') }} +BuildRequires: {{ py3('sphinxcontrib-apidoc') }} %description -n python-keystoneauth1-doc Documentation for OpenStack authenticating tools. @@ -66,7 +67,7 @@ echo "intersphinx_mapping = {}" >> doc/source/conf.py %{python_install} # generate html docs -PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html +PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} diff --git a/openstack/openstacksdk/openstacksdk.spec.j2 b/openstack/openstacksdk/openstacksdk.spec.j2 index 510367bb2..d91984246 100644 --- a/openstack/openstacksdk/openstacksdk.spec.j2 +++ b/openstack/openstacksdk/openstacksdk.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'openstacksdk' %} -{% set upstream_version = upstream_version('0.36.0') %} +{% set upstream_version = upstream_version('0.37.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} @@ -16,6 +16,7 @@ BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('PyYAML', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('appdirs', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('beautifulsoup4', py_versions=['py2', 'py3']) }} +BuildRequires: {{ py2pkg('ddt', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('decorator', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('deprecation', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('dogpile.cache', py_versions=['py2', 'py3']) }} @@ -92,6 +93,7 @@ Summary: %{summary} - Documentation Group: Documentation/HTML BuildRequires: {{ py3('Sphinx') }} BuildRequires: {{ py3('openstackdocstheme') }} +BuildRequires: {{ py3('sphinxcontrib-svg2pdfconverter') }} Requires: %{name} = %{version} %description -n python-openstacksdk-doc diff --git a/openstack/os-apply-config/os-apply-config.spec.j2 b/openstack/os-apply-config/os-apply-config.spec.j2 index 23f0bb726..c20f50a2f 100644 --- a/openstack/os-apply-config/os-apply-config.spec.j2 +++ b/openstack/os-apply-config/os-apply-config.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'os-apply-config' %} -{% set upstream_version = upstream_version('10.4.1') %} +{% set upstream_version = upstream_version('10.5.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/os-collect-config/os-collect-config.spec.j2 b/openstack/os-collect-config/os-collect-config.spec.j2 index 7296323eb..fd8443239 100644 --- a/openstack/os-collect-config/os-collect-config.spec.j2 +++ b/openstack/os-collect-config/os-collect-config.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'os-collect-config' %} -{% set upstream_version = upstream_version('10.4.0') %} +{% set upstream_version = upstream_version('10.5.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/os-refresh-config/os-refresh-config.spec.j2 b/openstack/os-refresh-config/os-refresh-config.spec.j2 index bb3b9451d..240997073 100644 --- a/openstack/os-refresh-config/os-refresh-config.spec.j2 +++ b/openstack/os-refresh-config/os-refresh-config.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'os-refresh-config' %} -{% set upstream_version = upstream_version('10.3.0') %} +{% set upstream_version = upstream_version('10.4.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/os-vif/os-vif.spec.j2 b/openstack/os-vif/os-vif.spec.j2 index f1d6fce6a..2d4731608 100644 --- a/openstack/os-vif/os-vif.spec.j2 +++ b/openstack/os-vif/os-vif.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'os-vif' %} -{% set upstream_version = upstream_version('1.16.0') %} +{% set upstream_version = upstream_version('1.17.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/oslo.utils/oslo.utils.spec.j2 b/openstack/oslo.utils/oslo.utils.spec.j2 index 0df530b0e..1ff5bb534 100644 --- a/openstack/oslo.utils/oslo.utils.spec.j2 +++ b/openstack/oslo.utils/oslo.utils.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslo.utils' %} -{% set upstream_version = upstream_version('3.41.1') %} +{% set upstream_version = upstream_version('3.41.2') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/ovsdbapp/ovsdbapp.spec.j2 b/openstack/ovsdbapp/ovsdbapp.spec.j2 index cd37d76a0..d18c0b15a 100644 --- a/openstack/ovsdbapp/ovsdbapp.spec.j2 +++ b/openstack/ovsdbapp/ovsdbapp.spec.j2 @@ -1,6 +1,6 @@ %define with_tests 0 {% set pypi_name = 'ovsdbapp' %} -{% set upstream_version = upstream_version('0.17.0') %} +{% set upstream_version = upstream_version('0.18.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} Name: {{ py2name() }}