From a2f99ad35e9ab7e5bf248b88d939be5b478b1637 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Sat, 17 Aug 2013 17:49:23 +0100
Subject: [PATCH] Remove ConfFixture from toplevel public API

There's no need to make the fixtures, testtools, etc. libraries a
runtime requirement, so let's move it from the toplevel oslo.messaging
API so you need to explicitly import it.

Change-Id: I9e2f32a898d78489f2d8d9c218c81f35cda14e34
---
 doc/source/conffixture.rst | 9 +++++++++
 oslo/messaging/__init__.py | 1 -
 requirements.txt           | 3 ---
 test-requirements.txt      | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 doc/source/conffixture.rst

diff --git a/doc/source/conffixture.rst b/doc/source/conffixture.rst
new file mode 100644
index 000000000..792fadc0d
--- /dev/null
+++ b/doc/source/conffixture.rst
@@ -0,0 +1,9 @@
+----------------------
+Testing Configurations
+----------------------
+
+.. currentmodule:: oslo.messaging.conffixture
+
+.. autoclass:: ConfFixture
+   :members:
+
diff --git a/oslo/messaging/__init__.py b/oslo/messaging/__init__.py
index 73c6f2a11..453a73ea2 100644
--- a/oslo/messaging/__init__.py
+++ b/oslo/messaging/__init__.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from .conffixture import *
 from .exceptions import *
 from .localcontext import *
 from .notify import *
diff --git a/requirements.txt b/requirements.txt
index 84667dec2..38a138ef1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,6 @@
 oslo.config
 stevedore
 
-# for oslo.messging.conffixture
-fixtures>=0.3.12
-
 # for timeutils
 iso8601
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 1503dde7f..718149386 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,7 @@ flake8==2.0
 hacking>=0.5.6,<0.7
 
 discover
+fixtures>=0.3.12
 mox>=0.5.3
 python-subunit
 testrepository>=0.0.13