diff --git a/openstack/castellan/castellan.spec.j2 b/openstack/castellan/castellan.spec.j2 index 91dbd132e..050d5a9e8 100644 --- a/openstack/castellan/castellan.spec.j2 +++ b/openstack/castellan/castellan.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'castellan' %} -{% set upstream_version = upstream_version('1.2.2') %} +{% set upstream_version = upstream_version('1.3.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/ironic-lib/ironic-lib.spec.j2 b/openstack/ironic-lib/ironic-lib.spec.j2 index 0cda611c8..4600710be 100644 --- a/openstack/ironic-lib/ironic-lib.spec.j2 +++ b/openstack/ironic-lib/ironic-lib.spec.j2 @@ -1,5 +1,5 @@ Name: {{ py2name('ironic-lib') }} -Version: 2.17.0 +Version: 2.18.0 Release: 0 Summary: Ironic Common Libraries License: {{ license('Apache-2.0') }} diff --git a/openstack/metalsmith/metalsmith.spec.j2 b/openstack/metalsmith/metalsmith.spec.j2 index 950adca32..1c57ef8dc 100644 --- a/openstack/metalsmith/metalsmith.spec.j2 +++ b/openstack/metalsmith/metalsmith.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'metalsmith' %} -{% set upstream_version = upstream_version('0.12.0') %} +{% set upstream_version = upstream_version('0.13.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 e2aab6bf0..f1d6fce6a 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.15.1') %} +{% set upstream_version = upstream_version('1.16.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/os-xenapi/os-xenapi.spec.j2 b/openstack/os-xenapi/os-xenapi.spec.j2 index 0735b9512..d7c266f81 100644 --- a/openstack/os-xenapi/os-xenapi.spec.j2 +++ b/openstack/os-xenapi/os-xenapi.spec.j2 @@ -1,6 +1,6 @@ %define with_tests 1 {% set pypi_name = 'os-xenapi' %} -{% set upstream_version = upstream_version('0.3.3') %} +{% set upstream_version = upstream_version('0.3.4') %} {% set rpm_release = '1' %} Name: {{ py2name() }} Version: {{ py2rpmversion() }} diff --git a/openstack/osc-lib/osc-lib.spec.j2 b/openstack/osc-lib/osc-lib.spec.j2 index 36f446972..1f86f26d7 100644 --- a/openstack/osc-lib/osc-lib.spec.j2 +++ b/openstack/osc-lib/osc-lib.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'osc-lib' %} -{% set upstream_version = upstream_version('1.12.1') %} +{% set upstream_version = upstream_version('1.13.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/oslo.db/oslo.db.spec.j2 b/openstack/oslo.db/oslo.db.spec.j2 index aa0012c07..847a79276 100644 --- a/openstack/oslo.db/oslo.db.spec.j2 +++ b/openstack/oslo.db/oslo.db.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslo.db' %} -{% set upstream_version = upstream_version('5.0.0') %} +{% set upstream_version = upstream_version('5.0.1') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/tooz/0001-Move-grpcio-from-requirements.txt-to-extras.patch b/openstack/tooz/0001-Move-grpcio-from-requirements.txt-to-extras.patch new file mode 100644 index 000000000..64895fec3 --- /dev/null +++ b/openstack/tooz/0001-Move-grpcio-from-requirements.txt-to-extras.patch @@ -0,0 +1,34 @@ +From 535121d6133af5d8cf108cb0594511d426fa38ae Mon Sep 17 00:00:00 2001 +From: Thomas Bechtold +Date: Mon, 4 Mar 2019 10:17:07 +0100 +Subject: [PATCH] Move grpcio from requirements.txt to extras + +It is only needed for the etcd3 driver. + +Change-Id: I0a0215f56b37d9a4286097b7f748f68d59afcb35 +--- + requirements.txt | 1 - + setup.cfg | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +Index: tooz-1.65.0/requirements.txt +=================================================================== +--- tooz-1.65.0.orig/requirements.txt ++++ tooz-1.65.0/requirements.txt +@@ -13,4 +13,3 @@ futures>=3.0;python_version=='2.7' or py + futurist>=1.2.0 # Apache-2.0 + oslo.utils>=3.15.0 # Apache-2.0 + oslo.serialization>=1.10.0 # Apache-2.0 +-grpcio>=1.18.0 +Index: tooz-1.65.0/setup.cfg +=================================================================== +--- tooz-1.65.0.orig/setup.cfg ++++ tooz-1.65.0/setup.cfg +@@ -47,6 +47,7 @@ etcd = + requests>=2.10.0 # Apache-2.0 + etcd3 = + etcd3>=0.6.2 # Apache-2.0 ++ grpcio>=1.18.0 + etcd3gw = + etcd3gw>=0.1.0 # Apache-2.0 + zake = diff --git a/openstack/tooz/0001-Remove-grpcio-from-requirements.txt.patch b/openstack/tooz/0001-Remove-grpcio-from-requirements.txt.patch deleted file mode 100644 index 8b8977c68..000000000 --- a/openstack/tooz/0001-Remove-grpcio-from-requirements.txt.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9c2807281be01c28643471ebe9f9ef3d40b4c2c5 Mon Sep 17 00:00:00 2001 -From: Thomas Bechtold -Date: Mon, 4 Mar 2019 10:17:07 +0100 -Subject: [PATCH] Remove grpcio from requirements.txt - -It is not used anywhere. - -Change-Id: I0a0215f56b37d9a4286097b7f748f68d59afcb35 ---- - requirements.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/requirements.txt b/requirements.txt -index b2aee6d..1af5228 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -13,4 +13,3 @@ futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD - futurist>=1.2.0 # Apache-2.0 - oslo.utils>=3.15.0 # Apache-2.0 - oslo.serialization>=1.10.0 # Apache-2.0 --grpcio>=1.0.0,<1.16.0 --- -2.21.0 - diff --git a/openstack/tooz/tooz.spec.j2 b/openstack/tooz/tooz.spec.j2 index b3ff7c3ab..7606a40bf 100644 --- a/openstack/tooz/tooz.spec.j2 +++ b/openstack/tooz/tooz.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'tooz' %} -{% set upstream_version = upstream_version('1.64.2') %} +{% set upstream_version = upstream_version('1.65.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} @@ -15,7 +15,7 @@ Group: Development/Languages/Python URL: https://docs.openstack.org/developer/tooz/ Source0: {{ source }} # https://review.openstack.org/#/c/640695/ -Patch1: 0001-Remove-grpcio-from-requirements.txt.patch +Patch1: 0001-Move-grpcio-from-requirements.txt-to-extras.patch BuildRequires: memcached BuildRequires: openstack-macros BuildRequires: {{ py2pkg('enum34', py_versions=['py2']) }}