Update to this week's releases

Change-Id: I60d345edcb1756f31e804ec006d6fda05eedaa4c
This commit is contained in:
Dirk Mueller 2019-06-19 13:34:38 +02:00
parent 659075eeda
commit e89d0fb30c
10 changed files with 43 additions and 33 deletions

View File

@ -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() %}

View File

@ -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') }}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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() }}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -0,0 +1,34 @@
From 535121d6133af5d8cf108cb0594511d426fa38ae Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
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 =

View File

@ -1,24 +0,0 @@
From 9c2807281be01c28643471ebe9f9ef3d40b4c2c5 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
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

View File

@ -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']) }}