1
0

Accepting request 667838 from Cloud:OpenStack:Factory

- avoid oslo.log dependency (bsc#1121609)

OBS-URL: https://build.opensuse.org/request/show/667838
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-oslo.config?expand=0&rev=28
This commit is contained in:
Dominique Leuenberger 2019-01-24 13:13:49 +00:00 committed by Git OBS Bridge
commit 003771dfca
2 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jan 17 12:09:19 UTC 2019 - Dirk Mueller <dmueller@suse.com>
- avoid oslo.log dependency (bsc#1121609)
-------------------------------------------------------------------
Mon Sep 3 09:12:19 UTC 2018 - cloud-devel@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package python-oslo.config
#
# Copyright (c) 2018 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,7 +12,7 @@
# 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/
#
@ -32,7 +32,6 @@ BuildRequires: python2-fixtures
BuildRequires: python2-mock
BuildRequires: python2-netaddr >= 0.7.18
BuildRequires: python2-oslo.i18n >= 3.15.3
BuildRequires: python2-oslo.log
BuildRequires: python2-oslotest
BuildRequires: python2-pbr
BuildRequires: python2-python-subunit
@ -51,7 +50,6 @@ BuildRequires: python3-fixtures
BuildRequires: python3-mock
BuildRequires: python3-netaddr >= 0.7.18
BuildRequires: python3-oslo.i18n >= 3.15.3
BuildRequires: python3-oslo.log
BuildRequires: python3-oslotest
BuildRequires: python3-pbr
BuildRequires: python3-python-subunit
@ -112,7 +110,8 @@ sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
%build
%{python_build}
PBR_VERSION=6.4.0 sphinx-build -b html doc/source doc/build/html
PBR_VERSION=6.4.0 PYTHONPATH=. \
sphinx-build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
@ -127,6 +126,8 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
%python_uninstall_alternative oslo-config-generator
%check
# Requires oslo.log which we can't depend on for build cycle reasons
rm -v oslo_config/tests/test_cfg.py
%{python_expand rm -rf .testrepository
$python setup.py testr
}