From c4eec82c4ea6b678dec047c3750366ba78e91e9d6fdb5a2d9985c09899ff48f6 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 22 Jan 2019 09:31:08 +0000
Subject: [PATCH] - break build cycle with stestr (bsc#1121610)
 ------------------------------------------------------------------

OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/python-stevedore?expand=0&rev=13
---
 _service                 |  4 ++--
 python-stevedore.changes |  5 +++++
 python-stevedore.spec    | 17 ++++++++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/_service b/_service
index 10d25d5..056e52a 100644
--- a/_service
+++ b/_service
@@ -1,8 +1,8 @@
 <services>
   <service mode="disabled" name="renderspec">
-    <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/stevedore/stevedore.spec.j2</param>
+    <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/rocky/openstack/stevedore/stevedore.spec.j2</param>
     <param name="output-name">python-stevedore.spec</param>
-    <param name="requirements">https://raw.githubusercontent.com/openstack/requirements/master/requirements.txt</param>
+    <param name="requirements">https://raw.githubusercontent.com/openstack/stevedore/stable/rocky/requirements.txt</param>
     <param name="changelog-email">cloud-devel@suse.de</param>
     <param name="changelog-provider">gh,openstack,stevedore</param>
   </service>
diff --git a/python-stevedore.changes b/python-stevedore.changes
index f06fe63..fe7a4a1 100644
--- a/python-stevedore.changes
+++ b/python-stevedore.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Tue Jan 22 09:30:35 UTC 2019 - Dirk Mueller <dmueller@suse.com>
+
+- break build cycle with stestr (bsc#1121610)
+
+------------------------------------------------------------------
 Wed Sep 19 21:55:25 UTC 2018 - cloud-devel@suse.de
 
 - update to version 1.29.0
diff --git a/python-stevedore.spec b/python-stevedore.spec
index b0497e4..fdcc416 100644
--- a/python-stevedore.spec
+++ b/python-stevedore.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-stevedore
 #
-# 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
@@ -28,16 +28,18 @@ BuildRequires:  openstack-macros
 BuildRequires:  python-devel
 BuildRequires:  python2-docutils
 BuildRequires:  python2-mock
-BuildRequires:  python2-pbr
+BuildRequires:  python2-pbr >= 2.0.0
+BuildRequires:  python2-pytest
 BuildRequires:  python2-setuptools
-BuildRequires:  python2-stestr
+BuildRequires:  python2-testtools
 BuildRequires:  python3-devel
 BuildRequires:  python3-docutils
 BuildRequires:  python3-mock
-BuildRequires:  python3-pbr
+BuildRequires:  python3-pbr >= 2.0.0
+BuildRequires:  python3-pytest
 BuildRequires:  python3-setuptools
-BuildRequires:  python3-stestr
-Requires:       python-pbr
+BuildRequires:  python3-testtools
+Requires:       python-pbr >= 2.0.0
 Requires:       python-six >= 1.10.0
 BuildArch:      noarch
 %python_subpackages
@@ -89,7 +91,8 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %python_install
 
 %check
-%python_exec -m stestr.cli run
+# use pytest instead of stestr to break a build cycle between python-cliff, python-stestr and python-stevedore
+%python_exec -m pytest stevedore/tests
 
 %files %{python_files}
 %license LICENSE