From d284a3bea40ad39f55a3069990158a9e552e919d Mon Sep 17 00:00:00 2001 From: Alain IVARS Date: Mon, 17 Jun 2019 00:04:21 +0100 Subject: [PATCH] fix tox dependencies --- tox.ini | 2 +- {{cookiecutter.github_repository_name}}/docs/conf.py | 6 +++--- {{cookiecutter.github_repository_name}}/tox.ini | 8 -------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tox.ini b/tox.ini index ca36ec2..44b152a 100644 --- a/tox.ini +++ b/tox.ini @@ -19,8 +19,8 @@ deps = changedir=docs #basepython=python3.6 deps = + -r{toxinidir}/requirements.txt -r{toxinidir}/requirements_test.txt - commands= sphinx-build -b html -c {envtmpdir}/../../.. -d {envtmpdir}/doctrees . {envtmpdir}/html diff --git a/{{cookiecutter.github_repository_name}}/docs/conf.py b/{{cookiecutter.github_repository_name}}/docs/conf.py index ba74eb1..7f34bd9 100644 --- a/{{cookiecutter.github_repository_name}}/docs/conf.py +++ b/{{cookiecutter.github_repository_name}}/docs/conf.py @@ -49,9 +49,9 @@ # This pattern also affects html_static_path and html_extra_path. exclude_patterns = [ 'links.inc', - '_build', - 'Thumbs.db', - '.DS_Store' + '_build', + 'Thumbs.db', + '.DS_Store' ] diff --git a/{{cookiecutter.github_repository_name}}/tox.ini b/{{cookiecutter.github_repository_name}}/tox.ini index 258140c..ed8ecbb 100644 --- a/{{cookiecutter.github_repository_name}}/tox.ini +++ b/{{cookiecutter.github_repository_name}}/tox.ini @@ -23,17 +23,9 @@ changedir=docs deps = -r{toxinidir}/requirements.txt -r{toxinidir}/requirements_test.txt - commands= sphinx-build -b html -c {envtmpdir}/../../.. -d {envtmpdir}/doctrees . {envtmpdir}/html -[testenv:coverage_combine] -deps = coverage -commands= - coverage xml - coverage html - coverage erase - [testenv:pep8] skip_install = True whitelist_externals = pep8