Additional changes to break up testing requirements

mfleader · Oct 14, 2020 · 3526a76 · 3526a76
1 parent 80c4b7e
commit 3526a76
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 21 deletions.
diff --git a/agent/requirements.txt b/agent/requirements.txt
@@ -3,7 +3,6 @@ bottle
 cffi
 click
 colorlog
-humanize
 python-daemon
 python-pidfile
 redis

diff --git a/agent/test-requirements.txt b/agent/test-requirements.txt
@@ -0,0 +1,2 @@
+pytest>=4.6.3, < 5
+responses
diff --git a/lint-requirements.txt b/lint-requirements.txt
@@ -0,0 +1,2 @@
+black==19.10b0
+flake8==3.8.3
diff --git a/server/requirements.txt b/server/requirements.txt
@@ -5,3 +5,4 @@ flask-restful
 gunicorn
 humanize
 pyesbulk
+requests
diff --git a/server/test-requirements.txt b/server/test-requirements.txt
@@ -0,0 +1 @@
+pytest>=4.6.3, < 5
diff --git a/test-requirements.txt b/test-requirements.txt
diff --git a/tox.ini b/tox.ini
@@ -19,8 +19,6 @@ usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv =
     VIRTUAL_ENV = {envdir}
-deps =
-   -r{toxinidir}/test-requirements.txt
 commands_pre =
     {toxinidir}/detox {envdir}
 envars =
@@ -38,65 +36,69 @@ description = Runs all non-Python3-based server unit/functional tests
 passenv = PBENCH_UNITTEST_SERVER_MODE
 deps =
    -r{toxinidir}/server/requirements.txt
-   -r{toxinidir}/test-requirements.txt
+   -r{toxinidir}/server/test-requirements.txt
 commands =
     bash -c "./server/bin/unittests {posargs}"
 
 [testenv:datalog]
 description = Runs all non-Python3-based agent tool-scripts/datalog unit/functional tests
 deps =
    -r{toxinidir}/agent/requirements.txt
-   -r{toxinidir}/test-requirements.txt
+   -r{toxinidir}/agent/test-requirements.txt
 commands =
     bash -c "./agent/tool-scripts/datalog/unittests {posargs}"
 
 [testenv:postprocess]
 description = Runs all non-Python3-based agent tool-scripts/postprocess unit/functional tests
+deps =
+   -r{toxinidir}/agent/test-requirements.txt
 commands =
     bash -c "./agent/tool-scripts/postprocess/unittests {posargs}"
 
 [testenv:tool-scripts]
 description = Runs all non-Python3-based agent tool-scripts unit/functional tests
+deps =
+   -r{toxinidir}/agent/test-requirements.txt
 commands =
     bash -c "./agent/tool-scripts/unittests {posargs}"
 
 [testenv:util-scripts]
 description = Runs all non-Python3-based agent util-scripts unit/functional tests
 deps =
    -r{toxinidir}/agent/requirements.txt
-   -r{toxinidir}/test-requirements.txt
+   -r{toxinidir}/agent/test-requirements.txt
 commands =
     bash -c "./agent/util-scripts/unittests {posargs}"
 
 [testenv:bench-scripts]
 description = Runs all non-Python3-based agent bench-scripts unit/functional tests
 deps =
    -r{toxinidir}/agent/requirements.txt
-   -r{toxinidir}/test-requirements.txt
+   -r{toxinidir}/agent/test-requirements.txt
 commands =
     bash -c "./agent/bench-scripts/unittests {posargs}"
 
 [testenv:py3-server]
 description = Runs all Python3-based server unit tests
 deps =
    -r{toxinidir}/server/requirements.txt
-   -r{toxinidir}/test-requirements.txt
+   -r{toxinidir}/server/test-requirements.txt
 commands =
     pytest ./lib/pbench/test/unit/server
 
 [testenv:py3-agent]
 description = Runs all Python3-based agent unit tests
 deps =
    -r{toxinidir}/agent/requirements.txt
-   -r{toxinidir}/test-requirements.txt
+   -r{toxinidir}/agent/test-requirements.txt
 commands =
     pytest ./lib/pbench/test/unit/agent
 
 [testenv:py3-functional]
 description = Runs all Python3-based functional tests
 deps =
    -r{toxinidir}/server/requirements.txt
-   -r{toxinidir}/test-requirements.txt
+   -r{toxinidir}/server/test-requirements.txt
 commands =
     pytest ./lib/pbench/test/functional
 
@@ -105,8 +107,6 @@ description = Runs all linting tasks
 commands =
     black --check .
     flake8 .
-deps =
-    black==19.10b0
-    flake8==3.8.3
+deps = -r{toxinidir}/lint-requirements.txt
 skip_install = true
 usedevelop = false