From eb09c1d8a16f12c48743e6a1e8b1a8287291897d Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Thu, 3 Nov 2011 19:32:37 +0000 Subject: [PATCH] switched to sphinx 1.1 to document special and private members git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@611 96b47cad-a561-4643-ad3b-153ac7d7599c --- doc/conf.py | 2 +- virtualsmartcard/doc/Makefile.am | 2 +- virtualsmartcard/doc/generate_modules.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index a354088..633f1b0 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -27,7 +27,7 @@ sys.path.insert(0, os.path.abspath('../virtualsmartcard/src/vpicc')) # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' +needs_sphinx = '1.1' # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. diff --git a/virtualsmartcard/doc/Makefile.am b/virtualsmartcard/doc/Makefile.am index f3c99a6..9c4d1fc 100644 --- a/virtualsmartcard/doc/Makefile.am +++ b/virtualsmartcard/doc/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = README.rst.in README.rst autotools.rst.in questions.rst.in autotool dist_noinst_SCRIPTS = generate_modules.py -doc: $(top_srcdir)/src/vpicc/virtualsmartcard/*.py $(top_srcdir)/src/vpicc/virtualsmartcard/cards/*.py +doc: $(top_srcdir)/src/vpicc/virtualsmartcard/*.py $(top_srcdir)/src/vpicc/virtualsmartcard/cards/*.py generate_modules.py $(do_subst) < autotools.rst.in > autotools.rst $(do_subst) < questions.rst.in > questions.rst $(do_subst) < README.rst.in > README.rst diff --git a/virtualsmartcard/doc/generate_modules.py b/virtualsmartcard/doc/generate_modules.py index cb0beea..00245a9 100755 --- a/virtualsmartcard/doc/generate_modules.py +++ b/virtualsmartcard/doc/generate_modules.py @@ -38,6 +38,8 @@ OPTIONS = ['members', 'undoc-members', 'inherited-members', 'show-inheritance', + 'private-members', + 'special-members', ] INIT = '__init__.py'