Skip to content

Commit

Permalink
Fixes tox six pkg ImportError #198 (#199)
Browse files Browse the repository at this point in the history
  • Loading branch information
mainanick authored and jparise committed Nov 2, 2018
1 parent 716ad75 commit 45fc36c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion test-requirements.txt
Expand Up @@ -2,6 +2,6 @@ mock
pytest
pytest-cov
gevent==1.3.6; "PyPy" not in platform_python_implementation
pylibmc
pylibmc; sys.platform != 'win32'
python-memcached
future
7 changes: 4 additions & 3 deletions tox.ini
Expand Up @@ -3,14 +3,15 @@ envlist = py27, py34, py35, py36, py37, pypy, pypy3, py27-flake8, py37-flake8, i
skip_missing_interpreters = True

[testenv]
setenv =
PYTHONPATH = {toxinidir}
deps = -r{toxinidir}/test-requirements.txt
commands =
pip install -r test-requirements.txt
pip install -e .
py.test {posargs:pymemcache/test/}

[testenv:integration]
commands =
pip install -r test-requirements.txt
pip install -e .
py.test {posargs:pymemcache/test/ -m integration}

Expand All @@ -28,6 +29,6 @@ commands =

[testenv:docs]
commands =
pip install -r docs-requirements.txt -r test-requirements.txt
pip install -r docs-requirements.txt
sphinx-apidoc -o docs/apidoc/ pymemcache
sphinx-build -b html docs/ docs/_build

0 comments on commit 45fc36c

Please sign in to comment.