From 362f329bcf446f02dd532995bbf95405ca2873eb Mon Sep 17 00:00:00 2001
From: Mark Doffman <mjdoffma@us.ibm.com>
Date: Thu, 10 Sep 2015 14:34:43 -0500
Subject: [PATCH] Add optional 'fixture' dependencies.

Add extra 'fixture' section so that projects needing to use
oslo_log.fixture can add 'oslo.log [fixture]' to their
requirements to install the fixture dependencies

Closes-Bug: #1493976
Change-Id: I67f3f59c50627a41b672928d037a7bd9997caa11
---
 doc/source/installation.rst | 5 +++++
 setup.cfg                   | 4 ++++
 test-requirements.txt       | 1 -
 tox.ini                     | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 7c7a8ade..aebf51de 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -5,3 +5,8 @@ Installation
 At the command line::
 
     $ pip install oslo.log
+
+To use ``oslo_log.fixture``, some additional dependencies
+are needed. They can be installed using the ``fixtures`` extra::
+
+    $ pip install 'oslo.log[fixtures]'
diff --git a/setup.cfg b/setup.cfg
index 47c37255..542c4bd9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,10 @@ classifier =
 packages =
     oslo_log
 
+[extras]
+fixtures =
+  fixtures>=1.3.1
+
 [pbr]
 warnerrors = true
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 8634bd86..fd01ca04 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,6 @@
 hacking<0.11,>=0.10.0
 
 discover
-fixtures>=1.3.1
 python-subunit>=0.0.18
 testrepository>=0.0.18
 testscenarios>=0.4
diff --git a/tox.ini b/tox.ini
index 7b38c841..49ee6d1d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,7 @@ setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+       -e.[fixtures]
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]