Merge branch 'master' of github.com:pinterest/pymemcache into switch_to_pytest

Conflicts:
	.gitignore
	tox.ini

1 files changed, 7 insertions, 1 deletions

diff --git a/tox.ini b/tox.ini
index 252aff5..09c0e1f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,14 @@
 [tox]
-envlist = py26, py27, pypy, py33, py34
+envlist = py26, py27, pypy, py33, py34, docs
 
 [testenv]
 commands =
     pip install -r test-requirements.txt
     pip install -e .
     py.test {posargs}
+
+[testenv:docs]
+commands =
+    pip install -r docs-requirements.txt
+    sphinx-apidoc -o docs/apidoc/ pymemcache
+    sphinx-build -b html docs/ docs/_build