git commit: Revert the fulltoc madness.

[to...@apache.org]

Updated Branches:
  refs/heads/trunk 4eabc33bf -> c946cd847


Revert the fulltoc madness.


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/c946cd84
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/c946cd84
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/c946cd84

Branch: refs/heads/trunk
Commit: c946cd8474b5260a2928f8aa76b96a56ad98c67b
Parents: 4eabc33
Author: Tomaz Muraus <to...@apache.org>
Authored: Wed Dec 18 22:22:36 2013 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Wed Dec 18 22:22:54 2013 +0100

----------------------------------------------------------------------
 docs/conf.py          | 11 +++--------
 requirements-docs.txt |  2 --
 tox.ini               |  1 -
 3 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/c946cd84/docs/conf.py
----------------------------------------------------------------------
diff --git a/docs/conf.py b/docs/conf.py
index 15eefb6..bc1ff23 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,18 +13,11 @@
 
 import sys, os
 
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('../'))
 
-# Nasty hack, but RTD doesn't seem to re-create virtualenvs and we are stuck in
-# a bad state now :/
-if on_rtd:
-    sys.path.insert(0, '/var/build/user_builds/libcloud/envs/latest/src/sphinxcontrib-fulltoc')
-
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -33,7 +26,7 @@ if on_rtd:
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
-              'sphinx.ext.viewcode', 'sphinxcontrib.fulltoc']
+              'sphinx.ext.viewcode']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -99,6 +92,8 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
 if on_rtd:
     html_theme = 'default'
     RTD_NEW_THEME = True

http://git-wip-us.apache.org/repos/asf/libcloud/blob/c946cd84/requirements-docs.txt
----------------------------------------------------------------------
diff --git a/requirements-docs.txt b/requirements-docs.txt
deleted file mode 100644
index 2c2f741..0000000
--- a/requirements-docs.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--e git+https://github.com/Kami/sphinxcontrib-fulltoc.git@fix_for_rtd#egg=sphinxcontrib-fulltoc
-#sphinxcontrib-fulltoc==1.0

http://git-wip-us.apache.org/repos/asf/libcloud/blob/c946cd84/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index 9db6f4f..6caeed9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,7 +40,6 @@ deps = mock
 
 [testenv:docs]
 deps = sphinx
-       sphinxcontrib-fulltoc
 basepython = python2.7
 changedir = docs
 commands = python ../contrib/generate_provider_feature_matrix_table.py