summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md4
-rwxr-xr-xsetup.py2
-rw-r--r--tox.ini9
3 files changed, 6 insertions, 9 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 52387946..c6713750 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -270,8 +270,8 @@ py.test -n4
```
where `4` should be replaced by the number of parallel threads you wish to run for testing.
-If you have the `pytest-forked` pytest plugin for running tests in isolated formed processes, you
-can speed things up even further:
+If you have the `pytest-forked` pytest plugin (not avilable on Windows) for running tests in isolated formed processes,
+you can speed things up even further:
```shell
py.test -nauto --forked
diff --git a/setup.py b/setup.py
index c3822ef8..47ee5c97 100755
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ if sys.version_info < (3, 0):
INSTALL_REQUIRES += ['subprocess32']
# unittest.mock was added in Python 3.3. mock is a backport of unittest.mock to all versions of Python
-TESTS_REQUIRE = ['mock', 'pytest', 'pytest-xdist', 'pytest-forked']
+TESTS_REQUIRE = ['mock', 'pytest', 'pytest-xdist']
DOCS_REQUIRE = ['sphinx', 'sphinx_rtd_theme', 'pyparsing', 'pyperclip', 'six']
setup(
diff --git a/tox.ini b/tox.ini
index 80763667..77a4ad69 100644
--- a/tox.ini
+++ b/tox.ini
@@ -34,12 +34,11 @@ deps =
pyreadline
pytest
pytest-cov
- pytest-forked
pytest-xdist
six
subprocess32
commands =
- py.test {posargs: -n 2} --cov=cmd2 --cov-report=term-missing --forked
+ py.test {posargs: -n 2} --cov=cmd2 --cov-report=term-missing
codecov
[testenv:py34]
@@ -71,10 +70,9 @@ deps =
pyperclip
pyreadline
pytest
- pytest-forked
pytest-xdist
six
-commands = py.test -v -n2 --forked
+commands = py.test -v -n2
[testenv:py36]
deps =
@@ -98,10 +96,9 @@ deps =
pyperclip
pyreadline
pytest
- pytest-forked
pytest-xdist
six
-commands = py.test -v -n2 --forked
+commands = py.test -v -n2
[testenv:py37]
deps =