Merge branch 'next-gen' of https://github.com/twilio/twilio-python in…

…to next-gen-twiml
twilio · codejudas · Mar 7, 2017 · Mar 2, 2017 · Mar 2, 2017 · Mar 2, 2017
commit 041760d4fbc3e81438503635597f544c35284c32
diff --git a/.gitignore b/.gitignore
@@ -23,10 +23,7 @@ pip-log.txt
 
 .DS_Store
 
-# Sphinx
-docs/tmp
-docs/_build
-cover
+docs/
 
 # PyCharm/IntelliJ
 .idea

diff --git a/Makefile b/Makefile
@@ -26,10 +26,10 @@ cover:
   find tests -type d | xargs nosetests --with-coverage --cover-inclusive --cover-erase --cover-package=twilio
 
 docs-install:
-	. venv/bin/activate; pip install -r docs/requirements.txt
+	. venv/bin/activate; pip install pdoc
 
 docs:
-	. venv/bin/activate; cd docs && make html
+	. venv/bin/activate; pdoc twilio --html --html-dir docs
 
 release:
 	. venv/bin/activate; python setup.py sdist upload

diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/_themes/.gitignore b/docs/_themes/.gitignore
diff --git a/docs/_themes/LICENSE b/docs/_themes/LICENSE
diff --git a/docs/_themes/README.rst b/docs/_themes/README.rst
diff --git a/docs/_themes/flask_theme_support.py b/docs/_themes/flask_theme_support.py
diff --git a/docs/_themes/kr/layout.html b/docs/_themes/kr/layout.html
diff --git a/docs/_themes/kr/relations.html b/docs/_themes/kr/relations.html