diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 7c7a8ad..aebf51d 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 47c3725..542c4bd 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 8634bd8..fd01ca0 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 7b38c84..49ee6d1 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]