From f1dbce4d30d7619eb0063e2867f08d4362a9e265 Mon Sep 17 00:00:00 2001 From: Kiall Mac Innes Date: Sat, 28 Jun 2014 17:40:47 +0000 Subject: [PATCH] Revert "Added olso sphinx, and enabled it for building docs" This reverts commit 0dc48ee793b5ebc919667256723e5758d15d94d1. Change-Id: I4e3111219641032b47dde8a3fd1f33fd46e22214 --- doc/source/conf.py | 2 +- requirements.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index c4728ca80..21d609bee 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -25,7 +25,7 @@ import sys, os # 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.viewcode', 'sphinxcontrib.httpdomain', 'oslosphinx'] +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'sphinxcontrib.httpdomain'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] diff --git a/requirements.txt b/requirements.txt index caf3d46aa..19b4979e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,4 +26,3 @@ dnspython>=1.9.4 posix_ipc oslotest oslo.db>=0.2.0 # Apache-2.0 -oslosphinx