update openstacksdk to v0.17.2

Change-Id: I7b6f6f697a7dfc0a941ffc929e6b860a58657808
This commit is contained in:
tonybrad 2018-08-09 17:17:04 +08:00 committed by Colleen Murphy
parent 78876000b3
commit 465c458680
2 changed files with 4 additions and 47 deletions

View File

@ -1,38 +0,0 @@
From a523ac7fc25e618e01b86fb0350008cde821e37c Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Wed, 31 Jan 2018 13:01:21 -0800
Subject: [PATCH] Let enforcer.py work under both py2 and py3
I guess the gate uses py3, but some of the post jobs still use py2?
Whatever, it's easy enough to support both.
See http://logs.openstack.org/f9/f9b96861577e26f0540158e00706e2505213f4bf/post/publish-openstack-sphinx-docs/58260e1/ara/result/8a18f0c0-d4b0-4cef-9d31-4cf79f3b4999/
for an example failure.
Change-Id: I37e507d37d4a41f5c55f2314bc074556f6262b50
---
doc/source/enforcer.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/doc/source/enforcer.py b/doc/source/enforcer.py
index b8dc182b..5dc0c6d0 100644
--- a/doc/source/enforcer.py
+++ b/doc/source/enforcer.py
@@ -1,5 +1,4 @@
import importlib
-import itertools
import os
from bs4 import BeautifulSoup
@@ -113,7 +112,7 @@ def build_finished(app, exception):
# TEMPORARY: Ignore the wait_for names when determining what is missing.
app.info("ENFORCER: Ignoring wait_for_* names...")
- missing = set(itertools.filterfalse(is_ignored, missing))
+ missing = set(x for x in missing if not is_ignored(x))
missing_count = len(missing)
app.info("ENFORCER: Found %d missing proxy methods "
--
2.16.1

View File

@ -1,5 +1,5 @@
{% set pypi_name = 'openstacksdk' %}
{% set upstream_version = upstream_version('0.11.3') %}
{% set upstream_version = upstream_version('0.17.2') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
@ -11,8 +11,6 @@ License: {{ license('Apache-2.0') }}
Group: Development/Languages/Python
URL: https://launchpad.net/{{ pypi_name }}
Source0: {{ source }}
# https://review.openstack.org/#/c/539685/
Patch1: 0001-Let-enforcer.py-work-under-both-py2-and-py3.patch
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('PyYAML', py_versions=['py2', 'py3']) }}
@ -41,7 +39,6 @@ BuildRequires: {{ py2pkg('requestsexceptions', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('six', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('stestr', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('stevedore', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('testrepository', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('testscenarios', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('testtools', py_versions=['py2', 'py3']) }}
Requires: {{ py2pkg('PyYAML') }}
@ -107,8 +104,7 @@ sed -i 's/^warning-is-error.*/warning-is-error=0/g' setup.cfg
%build
%python_build
export PYTHONPATH=.
%{__python2} setup.py build_sphinx
PBR_VERSION={{ upstream_version }} sphinx-build -b html doc/source doc/build/html
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
@ -122,9 +118,8 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
%python_uninstall_alternative openstack-inventory
%check
%{python_expand rm -rf .testrepository
stestr run
}
export OS_LOG_CAPTURE=true
%python_exec -m stestr.cli run
%files %{python_files}
%license LICENSE