[Python-modules-commits] [pytest] 06/10: New upstream release.
Barry Warsaw
barry at moszumanska.debian.org
Thu Dec 17 00:08:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository pytest.
commit c35b8eb0e91e7e68477975249e165e29bcdd4e8c
Author: Barry Warsaw <barry at python.org>
Date: Mon Dec 14 10:14:01 2015 -0500
New upstream release.
* New upstream release.
* debian/patches/local-intersphinx: Removed; no longer necessary.
---
debian/changelog | 7 +
debian/patches/local-intersphinx | 670 ---------------------------------------
2 files changed, 7 insertions(+), 670 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8be4c0d..935e1da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pytest (2.8.5-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * debian/patches/local-intersphinx: Removed; no longer necessary.
+
+ -- Barry Warsaw <barry at debian.org> Mon, 14 Dec 2015 10:13:32 -0500
+
pytest (2.7.3-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/local-intersphinx b/debian/patches/local-intersphinx
deleted file mode 100644
index c59a0d6..0000000
--- a/debian/patches/local-intersphinx
+++ /dev/null
@@ -1,670 +0,0 @@
-From eff5ad0e09a322049deb80cdcab6984fb5284aca Mon Sep 17 00:00:00 2001
-From: Sebastian Ramacher <sramacher at debian.org>
-Date: Thu, 8 Oct 2015 11:04:34 -0700
-Subject: Use objects.inv from python-doc
-
-Bug-Debian: https://bugs.debian.org/739406
-Last-Update: 2014-07-26
-
-Patch-Name: local-intersphinx
----
- doc/en/conf.py | 652 ++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 326 insertions(+), 326 deletions(-)
-
-diff --git a/doc/en/conf.py b/doc/en/conf.py
-index 1c57225..aca0442 100644
---- a/doc/en/conf.py
-+++ b/doc/en/conf.py
-@@ -1,326 +1,326 @@
--# -*- coding: utf-8 -*-
--#
--# pytest documentation build configuration file, created by
--# sphinx-quickstart on Fri Oct 8 17:54:28 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.
--
--# 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 full version, including alpha/beta/rc tags.
--# The short X.Y version.
--
--import os, sys
--sys.path.insert(0, os.path.dirname(__file__))
--import _getdoctarget
--
--version = _getdoctarget.get_minor_version_string()
--release = _getdoctarget.get_version_string()
--
--# 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('.'))
--
--autodoc_member_order = "bysource"
--todo_include_todos = 1
--
--# -- 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.todo', 'sphinx.ext.autosummary',
-- 'sphinx.ext.intersphinx', 'sphinx.ext.viewcode']
--
--# 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 = 'contents'
--
--# General information about the project.
--project = u'pytest'
--copyright = u'2015, holger krekel and pytest-dev team'
--
--
--
--# 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 = ['links.inc', '_build', 'naming20.rst', 'test/*',
-- "old_*",
-- '*attic*',
-- '*/attic*',
-- 'funcargs.rst',
-- 'setup.rst',
-- 'example/remoteinterp.rst',
-- ]
--
--
--# 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 = False
--
--# 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 ---------------------------------------------------
--
--sys.path.append(os.path.abspath('_themes'))
--html_theme_path = ['_themes']
--
--# The theme to use for HTML and HTML Help pages. See the documentation for
--# a list of builtin themes.
--html_theme = 'flask'
--
--# 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 = {
-- 'index_logo': None
--}
--
--# Add any paths that contain custom themes here, relative to this directory.
--#html_theme_path = []
--
--# 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 = "pytest-%s" % release
--
--# The name of an image file (relative to this directory) to place at the top
--# of the sidebar.
--html_logo = "img/pytest1.png"
--
--# 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 = "img/pytest1favi.ico"
--
--# 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 = {}
--#html_sidebars = {'index': 'indexsidebar.html'}
--
--html_sidebars = {
-- 'index': [
-- 'sidebarintro.html',
-- 'globaltoc.html',
-- 'links.html',
-- 'sourcelink.html',
-- 'searchbox.html'
-- ],
-- '**': [
-- 'globaltoc.html',
-- 'relations.html',
-- 'links.html',
-- 'sourcelink.html',
-- 'searchbox.html'
-- ]
--}
--
--# Additional templates that should be rendered to pages, maps page names to
--# template names.
--#html_additional_pages = {}
--#html_additional_pages = {'index': 'index.html'}
--
--
--# If false, no module index is generated.
--html_domain_indices = True
--
--# If false, no index is generated.
--html_use_index = False
--
--# 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 = False
--
--# 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 = 'pytestdoc'
--
--
--# -- 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 = [
-- ('contents', 'pytest.tex', u'pytest Documentation',
-- u'holger krekel, trainer and consultant, http://merlinux.eu', 'manual'),
--]
--
--# The name of an image file (relative to this directory) to place at the top of
--# the title page.
--latex_logo = 'img/pytest1.png'
--
--# 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 = False
--
--# -- Options for manual page output --------------------------------------------
--
--# One entry per manual page. List of tuples
--# (source start file, name, description, authors, manual section).
--man_pages = [
-- ('usage', 'pytest', u'pytest usage',
-- [u'holger krekel at merlinux eu'], 1)
--]
--
--
--# -- Options for Epub output ---------------------------------------------------
--
--# Bibliographic Dublin Core info.
--epub_title = u'pytest'
--epub_author = u'holger krekel at merlinux eu'
--epub_publisher = u'holger krekel at merlinux eu'
--epub_copyright = u'2013, holger krekel et alii'
--
--# The language of the text. It defaults to the language option
--# or en if the language is not set.
--#epub_language = ''
--
--# The scheme of the identifier. Typical schemes are ISBN or URL.
--#epub_scheme = ''
--
--# The unique identifier of the text. This can be a ISBN number
--# or the project homepage.
--#epub_identifier = ''
--
--# A unique identification for the text.
--#epub_uid = ''
--
--# HTML files that should be inserted before the pages created by sphinx.
--# The format is a list of tuples containing the path and title.
--#epub_pre_files = []
--
--# HTML files shat should be inserted after the pages created by sphinx.
--# The format is a list of tuples containing the path and title.
--#epub_post_files = []
--
--# A list of files that should not be packed into the epub file.
--#epub_exclude_files = []
--
--# The depth of the table of contents in toc.ncx.
--#epub_tocdepth = 3
--
--# Allow duplicate toc entries.
--#epub_tocdup = True
--
--
--# -- Options for texinfo output ------------------------------------------------
--
--texinfo_documents = [
-- (master_doc, 'pytest', 'pytest Documentation',
-- ('Holger Krekel@*Benjamin Peterson@*Ronny Pfannschmidt@*'
-- 'Floris Bruynooghe@*others'),
-- 'pytest',
-- 'simple powerful testing with Pytho',
-- 'Programming',
-- 1),
--]
--
--
--# Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'python': ('http://docs.python.org/', None),
--# 'lib': ("http://docs.python.org/2.7library/", None),
-- }
--
--
--def setup(app):
-- #from sphinx.ext.autodoc import cut_lines
-- #app.connect('autodoc-process-docstring', cut_lines(4, what=['module']))
-- app.add_description_unit('confval', 'confval',
-- objname='configuration value',
-- indextemplate='pair: %s; configuration value')
-+# -*- coding: utf-8 -*-
-+#
-+# pytest documentation build configuration file, created by
-+# sphinx-quickstart on Fri Oct 8 17:54:28 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.
-+
-+# 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 full version, including alpha/beta/rc tags.
-+# The short X.Y version.
-+
-+import os, sys
-+sys.path.insert(0, os.path.dirname(__file__))
-+import _getdoctarget
-+
-+version = _getdoctarget.get_minor_version_string()
-+release = _getdoctarget.get_version_string()
-+
-+# 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('.'))
-+
-+autodoc_member_order = "bysource"
-+todo_include_todos = 1
-+
-+# -- 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.todo', 'sphinx.ext.autosummary',
-+ 'sphinx.ext.intersphinx', 'sphinx.ext.viewcode']
-+
-+# 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 = 'contents'
-+
-+# General information about the project.
-+project = u'pytest'
-+copyright = u'2015, holger krekel and pytest-dev team'
-+
-+
-+
-+# 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 = ['links.inc', '_build', 'naming20.rst', 'test/*',
-+ "old_*",
-+ '*attic*',
-+ '*/attic*',
-+ 'funcargs.rst',
-+ 'setup.rst',
-+ 'example/remoteinterp.rst',
-+ ]
-+
-+
-+# 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 = False
-+
-+# 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 ---------------------------------------------------
-+
-+sys.path.append(os.path.abspath('_themes'))
-+html_theme_path = ['_themes']
-+
-+# The theme to use for HTML and HTML Help pages. See the documentation for
-+# a list of builtin themes.
-+html_theme = 'flask'
-+
-+# 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 = {
-+ 'index_logo': None
-+}
-+
-+# Add any paths that contain custom themes here, relative to this directory.
-+#html_theme_path = []
-+
-+# 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 = "pytest-%s" % release
-+
-+# The name of an image file (relative to this directory) to place at the top
-+# of the sidebar.
-+html_logo = "img/pytest1.png"
-+
-+# 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 = "img/pytest1favi.ico"
-+
-+# 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 = {}
-+#html_sidebars = {'index': 'indexsidebar.html'}
-+
-+html_sidebars = {
-+ 'index': [
-+ 'sidebarintro.html',
-+ 'globaltoc.html',
-+ 'links.html',
-+ 'sourcelink.html',
-+ 'searchbox.html'
-+ ],
-+ '**': [
-+ 'globaltoc.html',
-+ 'relations.html',
-+ 'links.html',
-+ 'sourcelink.html',
-+ 'searchbox.html'
-+ ]
-+}
-+
-+# Additional templates that should be rendered to pages, maps page names to
-+# template names.
-+#html_additional_pages = {}
-+#html_additional_pages = {'index': 'index.html'}
-+
-+
-+# If false, no module index is generated.
-+html_domain_indices = True
-+
-+# If false, no index is generated.
-+html_use_index = False
-+
-+# 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 = False
-+
-+# 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 = 'pytestdoc'
-+
-+
-+# -- 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 = [
-+ ('contents', 'pytest.tex', u'pytest Documentation',
-+ u'holger krekel, trainer and consultant, http://merlinux.eu', 'manual'),
-+]
-+
-+# The name of an image file (relative to this directory) to place at the top of
-+# the title page.
-+latex_logo = 'img/pytest1.png'
-+
-+# 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 = False
-+
-+# -- Options for manual page output --------------------------------------------
-+
-+# One entry per manual page. List of tuples
-+# (source start file, name, description, authors, manual section).
-+man_pages = [
-+ ('usage', 'pytest', u'pytest usage',
-+ [u'holger krekel at merlinux eu'], 1)
-+]
-+
-+
-+# -- Options for Epub output ---------------------------------------------------
-+
-+# Bibliographic Dublin Core info.
-+epub_title = u'pytest'
-+epub_author = u'holger krekel at merlinux eu'
-+epub_publisher = u'holger krekel at merlinux eu'
-+epub_copyright = u'2013, holger krekel et alii'
-+
-+# The language of the text. It defaults to the language option
-+# or en if the language is not set.
-+#epub_language = ''
-+
-+# The scheme of the identifier. Typical schemes are ISBN or URL.
-+#epub_scheme = ''
-+
-+# The unique identifier of the text. This can be a ISBN number
-+# or the project homepage.
-+#epub_identifier = ''
-+
-+# A unique identification for the text.
-+#epub_uid = ''
-+
-+# HTML files that should be inserted before the pages created by sphinx.
-+# The format is a list of tuples containing the path and title.
-+#epub_pre_files = []
-+
-+# HTML files shat should be inserted after the pages created by sphinx.
-+# The format is a list of tuples containing the path and title.
-+#epub_post_files = []
-+
-+# A list of files that should not be packed into the epub file.
-+#epub_exclude_files = []
-+
-+# The depth of the table of contents in toc.ncx.
-+#epub_tocdepth = 3
-+
-+# Allow duplicate toc entries.
-+#epub_tocdup = True
-+
-+
-+# -- Options for texinfo output ------------------------------------------------
-+
-+texinfo_documents = [
-+ (master_doc, 'pytest', 'pytest Documentation',
-+ ('Holger Krekel@*Benjamin Peterson@*Ronny Pfannschmidt@*'
-+ 'Floris Bruynooghe@*others'),
-+ 'pytest',
-+ 'simple powerful testing with Pytho',
-+ 'Programming',
-+ 1),
-+]
-+
-+
-+# Example configuration for intersphinx: refer to the Python standard library.
-+intersphinx_mapping = {'python': ('http://docs.python.org/', None),
-+# 'lib': ("http://docs.python.org/2.7library/", None),
-+ }
-+
-+
-+def setup(app):
-+ #from sphinx.ext.autodoc import cut_lines
-+ #app.connect('autodoc-process-docstring', cut_lines(4, what=['module']))
-+ app.add_description_unit('confval', 'confval',
-+ objname='configuration value',
-+ indextemplate='pair: %s; configuration value')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pytest.git
More information about the Python-modules-commits
mailing list