Skip to content

Commit a28770a

Browse files
committed
moves test dependencies from setup to tox config
1 parent f30b692 commit a28770a

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

setup.py

-15
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,6 @@
5151
deps += ['typing', ] # backward compatibility for 3.3 and 3.4
5252

5353

54-
# Extra dependencies for a development environment.
55-
# if 'develop' in sys.argv: <- we cannot do that as pip is doing that in 2 steps.
56-
# TODO(gbin): find another way to filter those out if we don't need them.
57-
58-
deps += ['mock',
59-
'pep8',
60-
# Order matters here, pytest must come last. See also:
61-
# https://github.com/errbotio/errbot/pull/496
62-
# https://bitbucket.org/pypa/setuptools/issues/196/tests_require-pytest-pytest-cov-breaks
63-
'pytest-xdist',
64-
'pytest',
65-
'PyOpenSSL',
66-
'docutils', # for rst linting for pypi.
67-
]
68-
6954
if not ON_WINDOWS:
7055
deps += ['daemonize']
7156

tox.ini

+3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@ skip_missing_interpreters = True
44

55
[testenv]
66
deps =
7+
mock
78
pytest
89
slackclient
10+
911
commands = py.test
1012

1113
[testenv:codestyle]
1214
deps = pycodestyle
1315
commands = pycodestyle errbot tests
1416

1517
[testenv:pypi-lint]
18+
deps = docutils
1619
commands = python setup.py check --restructured --strict --metadata

0 commit comments

Comments
 (0)