diff --git a/doc-requirements.txt b/doc-requirements.txt deleted file mode 100644 index abb7726..0000000 --- a/doc-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -sphinx -sphinxcontrib-trio diff --git a/test-requirements.txt b/requirements.txt similarity index 90% rename from test-requirements.txt rename to requirements.txt index 55acbc2..1921a18 100644 --- a/test-requirements.txt +++ b/requirements.txt @@ -28,5 +28,6 @@ python-swiftclient tenacity distro-info paramiko - - +# Documentation requirements +sphinx +sphinxcontrib-trio diff --git a/tox.ini b/tox.ini index b76aef2..63f667d 100644 --- a/tox.ini +++ b/tox.ini @@ -11,11 +11,11 @@ commands = nosetests {posargs} {toxinidir}/unit_tests [testenv:py3] basepython = python3 -deps = -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/requirements.txt [testenv:pep8] basepython = python3 -deps = -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/requirements.txt commands = flake8 {posargs} zaza unit_tests [testenv:venv] @@ -28,6 +28,5 @@ ignore = E402,E226 basepython = python3 changedir = doc/source deps = - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/doc-requirements.txt + -r{toxinidir}/requirements.txt commands = sphinx-build -W -b html -d {toxinidir}/doc/build/doctrees . {toxinidir}/doc/build/html