[python-rosdep/el6] Remove viewcode sphinx extension

rmattes rmattes at fedoraproject.org
Sat Feb 8 23:54:22 UTC 2014


commit e732b98f7bc3fde8197abbe474aea0fb0c3e9c52
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sat Feb 8 18:54:36 2014 -0500

    Remove viewcode sphinx extension

 python-rosdep.spec                |    4 ++--
 rosdep-0.10.14-catkinsphinx.patch |   25 -------------------------
 rosdep-0.10.25-catkinsphinx.patch |   34 ++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 27 deletions(-)
---
diff --git a/python-rosdep.spec b/python-rosdep.spec
index e0ca735..7d9b39d 100644
--- a/python-rosdep.spec
+++ b/python-rosdep.spec
@@ -13,8 +13,8 @@ Source0:        https://github.com/ros-infrastructure/%{realname}/archive/%{comm
 # Change all "pip" executable references to "python-pip"
 # Fedora-only patch, not submitted upstream.
 Patch0:         %{realname}-0.10.14-pythonpip.patch
-# Disable catkin-sphinx for now, until it's packaged
-Patch1:         %{realname}-0.10.14-catkinsphinx.patch
+# Disable viewcode and catkin-sphinx for now, until it's packaged
+Patch1:         %{realname}-0.10.35-catkinsphinx.patch
 # Disable nose: el6 version is too old
 Patch2:         %{realname}-0.10.14-nose.patch
 
diff --git a/rosdep-0.10.25-catkinsphinx.patch b/rosdep-0.10.25-catkinsphinx.patch
new file mode 100644
index 0000000..b8adc3f
--- /dev/null
+++ b/rosdep-0.10.25-catkinsphinx.patch
@@ -0,0 +1,34 @@
+diff -up ./doc/conf.py.catkinsphinx ./doc/conf.py
+--- ./doc/conf.py.catkinsphinx	2014-01-24 18:12:37.000000000 -0500
++++ ./doc/conf.py	2014-02-08 18:53:27.528934213 -0500
+@@ -16,7 +16,7 @@ import sys, os
+ import sys
+ sys.path.insert(0, '../src')
+ 
+-import catkin_sphinx
++#import catkin_sphinx
+ from rosdep2 import __version__
+ 
+ # If extensions (or modules to document with autodoc) are in another directory,
+@@ -31,7 +31,7 @@ from rosdep2 import __version__
+ 
+ # 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.coverage', 'sphinx.ext.viewcode']
++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.coverage']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+@@ -97,9 +97,9 @@ pygments_style = 'sphinx'
+ 
+ # The theme to use for HTML and HTML Help pages.  See the documentation for
+ # a list of builtin themes.
+-html_theme_path = [os.path.join(os.path.dirname(catkin_sphinx.__file__), 'theme')]
+-html_theme = 'ros-theme'
+-html_logo = 'ros.png'
++#html_theme_path = [os.path.join(os.path.dirname(catkin_sphinx.__file__), 'theme')]
++#html_theme = 'ros-theme'
++#html_logo = 'ros.png'
+ 
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the


More information about the scm-commits mailing list