From 6d4e23882a5b1e1f31fb452aaad9d19cf0d02604 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 19 Jan 2020 14:06:35 -0500 Subject: Move test dependencies to package metadata. --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index a70dff87..aeae13ce 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,6 @@ requires = pip = python {toxinidir}/tools/tox_pip.py [testenv] -deps=-r{toxinidir}/tests/requirements.txt pip_version = pip install_command = {[helpers]pip} install {opts} {packages} list_dependencies_command = {[helpers]pip} freeze --all @@ -25,6 +24,8 @@ setenv = passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED commands=pytest --cov-config={toxinidir}/tox.ini --cov-report= {posargs} usedevelop=True +extras = + tests [testenv:coverage] -- cgit v1.2.3 From d92f778b6c88c8a36c4aecac9543d9297c425096 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 20 Jan 2020 10:34:25 -0500 Subject: Rewrite selective PIP_IGNORE_REQUIRES_PYTHON to allow test dependencies in metadata to be installed without ignoring REQUIRES_PYTHON --- tox.ini | 1 - 1 file changed, 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index aeae13ce..a5ce930f 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,6 @@ install_command = {[helpers]pip} install {opts} {packages} list_dependencies_command = {[helpers]pip} freeze --all setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname} - py27: PIP_IGNORE_REQUIRES_PYTHON=true # TODO: The passed environment variables came from copying other tox.ini files # These should probably be individually annotated to explain what needs them. passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED -- cgit v1.2.3 From 461ea400887a576dba102816f72af1d6966e1768 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 20 Jan 2020 22:09:46 -0500 Subject: Opt into PEP 517 for pip installs to avoid implicit dependency on Setuptools to install test dependencies. --- tox.ini | 1 + 1 file changed, 1 insertion(+) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index a5ce930f..3eb408cc 100644 --- a/tox.ini +++ b/tox.ini @@ -18,6 +18,7 @@ install_command = {[helpers]pip} install {opts} {packages} list_dependencies_command = {[helpers]pip} freeze --all setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname} + PIP_USE_PEP517=1 # TODO: The passed environment variables came from copying other tox.ini files # These should probably be individually annotated to explain what needs them. passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED -- cgit v1.2.3 From 620bd62c00985b551dde326619a6c895d7c80e63 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 21 Jan 2020 22:07:49 -0500 Subject: Set PIP_USE_PEP517 in installer command so as not to influence the tests with that setting. --- tox.ini | 1 - 1 file changed, 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 3eb408cc..a5ce930f 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,6 @@ install_command = {[helpers]pip} install {opts} {packages} list_dependencies_command = {[helpers]pip} freeze --all setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname} - PIP_USE_PEP517=1 # TODO: The passed environment variables came from copying other tox.ini files # These should probably be individually annotated to explain what needs them. passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED -- cgit v1.2.3 From 641e088d193142f236d69c78d272cf7ece0d693c Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 21 Jan 2020 22:38:03 -0500 Subject: Move docs dependencies into package metadata and use same technique as jaraco/skeleton to build docs in tox and rtd. --- tox.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index a5ce930f..2164599f 100644 --- a/tox.ini +++ b/tox.ini @@ -44,12 +44,12 @@ skip_install=True commands=codecov -X gcov --file {toxworkdir}/coverage.xml [testenv:docs] -deps = -r{toxinidir}/docs/requirements.txt -skip_install=True +extras = + docs + testing +changedir = docs commands = - python -m bootstrap - sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/build/html - sphinx-build -W -b man -d {envtmpdir}/doctrees docs docs/build/man + python -m sphinx . {toxinidir}/build/html [coverage:run] source= -- cgit v1.2.3