[Python-modules-commits] r25697 - in packages/nose2/trunk/debian (4 files)

barry at users.alioth.debian.org barry at users.alioth.debian.org
Wed Aug 28 20:05:15 UTC 2013


    Date: Wednesday, August 28, 2013 @ 20:05:12
  Author: barry
Revision: 25697

- Fix documentation building.
- Make sure python3-nose2 installs /usr/bin/nose2-3
- Fix dependencies and *some* lintian warnings.

Added:
  packages/nose2/trunk/debian/patches/doc-support.patch
Modified:
  packages/nose2/trunk/debian/control
  packages/nose2/trunk/debian/patches/series
  packages/nose2/trunk/debian/rules

Modified: packages/nose2/trunk/debian/control
===================================================================
--- packages/nose2/trunk/debian/control	2013-08-28 19:40:46 UTC (rev 25696)
+++ packages/nose2/trunk/debian/control	2013-08-28 20:05:12 UTC (rev 25697)
@@ -8,6 +8,7 @@
                python-all,
                python-setuptools,
                python-six,
+               python-sphinx,
                python-tox,
                python3-all,
                python3-setuptools,
@@ -26,14 +27,16 @@
 
 Package: python-nose2
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: python-pkg-resources, python-six,
+         ${misc:Depends}, ${python:Depends}
 Suggests: python-nose2-doc, python3-nose2
 Description: next generation of nicer testing for Python (Python 2)
  This is the Python 2 package.
 
 Package: python3-nose2
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends: python3-pkg-resources, python3-six,
+         ${misc:Depends}, ${python3:Depends}
 Suggests: python-nose2, python-nose2-doc
 Description: next generation of nicer testing for Python (Python 3)
  This is the Python 3 package.

Added: packages/nose2/trunk/debian/patches/doc-support.patch
===================================================================
--- packages/nose2/trunk/debian/patches/doc-support.patch	                        (rev 0)
+++ packages/nose2/trunk/debian/patches/doc-support.patch	2013-08-28 20:05:12 UTC (rev 25697)
@@ -0,0 +1,229 @@
+Description: Add files from upstream git that are missing in the PyPI
+ tarball, which are required to build the Sphinx documentation.
+Author: Barry Warsaw <barry at debian.org>
+Forwarded: not-needed
+
+--- /dev/null
++++ b/docs/conf.py
+@@ -0,0 +1,221 @@
++# -*- coding: utf-8 -*-
++#
++# nose2 documentation build configuration file, created by
++# sphinx-quickstart on Thu Oct  7 15:16:09 2010.
++#
++# This file is execfile()d with the current directory set to its containing dir.
++#
++# Note that not all possible configuration values are present in this
++# autogenerated file.
++#
++# All configuration values have a default; values that are commented out
++# serve to show the default.
++
++import sys, os
++
++# 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('..'))
++sys.path.append(os.path.abspath('_themes'))
++
++# -- General configuration -----------------------------------------------------
++
++# If your documentation needs a minimal Sphinx version, state it here.
++needs_sphinx = '1.0'
++
++# 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.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.ifconfig', 'sphinx.ext.viewcode', 'nose2.sphinxext']
++
++# Add any paths that contain templates here, relative to this directory.
++templates_path = ['_templates']
++
++# The suffix of source filenames.
++source_suffix = '.rst'
++
++# The encoding of source files.
++#source_encoding = 'utf-8-sig'
++
++# The master toctree document.
++master_doc = 'index'
++
++# General information about the project.
++project = u'nose2'
++copyright = u'2010, Jason Pellerin'
++
++# The version info for the project you're documenting, acts as replacement for
++# |version| and |release|, also used in various other places throughout the
++# built documents.
++#
++# The short X.Y version.
++version = '0.4'
++# The full version, including alpha/beta/rc tags.
++release = '0.4.7'
++
++# The language for content autogenerated by Sphinx. Refer to documentation
++# for a list of supported languages.
++#language = None
++
++# There are two options for replacing |today|: either, you set today to some
++# non-false value, then it is used:
++#today = ''
++# Else, today_fmt is used as the format for a strftime call.
++#today_fmt = '%B %d, %Y'
++
++# List of patterns, relative to source directory, that match files and
++# directories to ignore when looking for source files.
++exclude_patterns = ['_build']
++
++# The reST default role (used for this markup: `text`) to use for all documents.
++#default_role = None
++
++# If true, '()' will be appended to :func: etc. cross-reference text.
++#add_function_parentheses = True
++
++# If true, the current module name will be prepended to all description
++# unit titles (such as .. function::).
++#add_module_names = True
++
++# If true, sectionauthor and moduleauthor directives will be shown in the
++# output. They are ignored by default.
++#show_authors = False
++
++# The name of the Pygments (syntax highlighting) style to use.
++pygments_style = 'sphinx'
++
++# A list of ignored prefixes for module index sorting.
++#modindex_common_prefix = []
++
++
++# -- Options for HTML output ---------------------------------------------------
++
++# The theme to use for HTML and HTML Help pages.  See the documentation for
++# a list of builtin themes.
++html_theme = 'default'
++
++# 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
++# documentation.
++#html_theme_options = {}
++
++# Add any paths that contain custom themes here, relative to this directory.
++html_theme_path = ['_themes']
++
++# The name for this set of Sphinx documents.  If None, it defaults to
++# "<project> v<release> documentation".
++#html_title = None
++
++# A shorter title for the navigation bar.  Default is the same as html_title.
++#html_short_title = None
++
++# The name of an image file (relative to this directory) to place at the top
++# of the sidebar.
++#html_logo = None
++
++# The name of an image file (within the static path) to use as favicon of the
++# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
++# pixels large.
++#html_favicon = None
++
++# Add any paths that contain custom static files (such as style sheets) here,
++# relative to this directory. They are copied after the builtin static files,
++# so a file named "default.css" will overwrite the builtin "default.css".
++#html_static_path = ['_static']
++
++# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
++# using the given strftime format.
++#html_last_updated_fmt = '%b %d, %Y'
++
++# If true, SmartyPants will be used to convert quotes and dashes to
++# typographically correct entities.
++#html_use_smartypants = True
++
++# Custom sidebar templates, maps document names to template names.
++#html_sidebars = {}
++
++# Additional templates that should be rendered to pages, maps page names to
++# template names.
++#html_additional_pages = {}
++
++# If false, no module index is generated.
++#html_domain_indices = True
++
++# If false, no index is generated.
++#html_use_index = True
++
++# If true, the index is split into individual pages for each letter.
++#html_split_index = False
++
++# If true, links to the reST sources are added to the pages.
++#html_show_sourcelink = True
++
++# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
++#html_show_sphinx = True
++
++# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
++#html_show_copyright = True
++
++# If true, an OpenSearch description file will be output, and all pages will
++# contain a <link> tag referring to it.  The value of this option must be the
++# base URL from which the finished HTML is served.
++#html_use_opensearch = ''
++
++# This is the file name suffix for HTML files (e.g. ".xhtml").
++#html_file_suffix = None
++
++# Output file base name for HTML help builder.
++htmlhelp_basename = 'nose2doc'
++
++
++# -- Options for LaTeX output --------------------------------------------------
++
++# The paper size ('letter' or 'a4').
++#latex_paper_size = 'letter'
++
++# The font size ('10pt', '11pt' or '12pt').
++#latex_font_size = '10pt'
++
++# Grouping the document tree into LaTeX files. List of tuples
++# (source start file, target name, title, author, documentclass [howto/manual]).
++latex_documents = [
++  ('index', 'nose2.tex', u'nose2 Documentation',
++   u'Jason Pellerin', 'manual'),
++]
++
++# The name of an image file (relative to this directory) to place at the top of
++# the title page.
++#latex_logo = None
++
++# For "manual" documents, if this is true, then toplevel headings are parts,
++# not chapters.
++#latex_use_parts = False
++
++# If true, show page references after internal links.
++#latex_show_pagerefs = False
++
++# If true, show URL addresses after external links.
++#latex_show_urls = False
++
++# Additional stuff for the LaTeX preamble.
++#latex_preamble = ''
++
++# Documents to append as an appendix to all manuals.
++#latex_appendices = []
++
++# If false, no module index is generated.
++#latex_domain_indices = True
++
++
++# -- Options for manual page output --------------------------------------------
++
++# One entry per manual page. List of tuples
++# (source start file, name, description, authors, manual section).
++man_pages = [
++    ('index', 'nose2', u'nose2 Documentation',
++     [u'Jason Pellerin'], 1)
++]
++
++
++# Example configuration for intersphinx: refer to the Python standard library.
++intersphinx_mapping = {'python': ('http://docs.python.org/', None)}

Modified: packages/nose2/trunk/debian/patches/series
===================================================================
--- packages/nose2/trunk/debian/patches/series	2013-08-28 19:40:46 UTC (rev 25696)
+++ packages/nose2/trunk/debian/patches/series	2013-08-28 20:05:12 UTC (rev 25697)
@@ -1 +1,2 @@
 requirements.patch
+doc-support.patch

Modified: packages/nose2/trunk/debian/rules
===================================================================
--- packages/nose2/trunk/debian/rules	2013-08-28 19:40:46 UTC (rev 25696)
+++ packages/nose2/trunk/debian/rules	2013-08-28 20:05:12 UTC (rev 25697)
@@ -13,4 +13,14 @@
 export https_proxy = https://127.0.9.1:9
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+
+override_dh_sphinxdoc:
+	sphinx-build -b html -d debian/tmp/doctrees docs \
+		debian/python-nose2-doc/usr/share/doc/python-nose2-doc/html
+	dh_sphinxdoc
+
+override_dh_auto_install:
+	dh_auto_install
+	mv debian/python3-nose2/usr/bin/nose2 \
+	   debian/python3-nose2/usr/bin/nose2-3




More information about the Python-modules-commits mailing list