[Python-modules-commits] [pytest] 05/10: merge patched into master
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 cd5de05d1bb05a92fc9bcb5ad56e7c91a6c31c2e
Merge: e4ab4be eff5ad0
Author: Barry Warsaw <barry at python.org>
Date: Mon Dec 14 10:08:09 2015 -0500
merge patched into master
.coveragerc | 7 +
.gitignore | 32 -
.hgignore | 39 -
.hgtags | 77 -
.travis.yml | 37 -
AUTHORS | 128 +-
CHANGELOG | 4481 ++++++++--------
CONTRIBUTING.rst | 420 +-
HOWTORELEASE.rst | 59 -
ISSUES.txt | 364 --
LICENSE | 38 +-
MANIFEST.in | 41 +-
Makefile | 25 -
PKG-INFO | 180 +-
README.rst | 119 +-
_pytest/__init__.py | 4 +-
_pytest/_argcomplete.py | 208 +-
_pytest/_pluggy.py | 11 +
_pytest/assertion/__init__.py | 332 +-
_pytest/assertion/newinterpret.py | 730 +--
_pytest/assertion/oldinterpret.py | 1132 ++---
_pytest/assertion/reinterpret.py | 104 +-
_pytest/assertion/rewrite.py | 1754 +++----
_pytest/assertion/util.py | 651 +--
_pytest/cacheprovider.py | 243 +
_pytest/capture.py | 886 ++--
_pytest/config.py | 2114 ++++----
_pytest/core.py | 543 --
_pytest/doctest.py | 416 +-
_pytest/genscript.py | 260 +-
_pytest/helpconfig.py | 271 +-
_pytest/hookspec.py | 562 +-
_pytest/impl | 254 -
_pytest/junitxml.py | 604 ++-
_pytest/main.py | 1470 +++---
_pytest/mark.py | 622 +--
_pytest/monkeypatch.py | 442 +-
_pytest/nose.py | 142 +-
_pytest/pastebin.py | 180 +-
_pytest/pdb.py | 216 +-
_pytest/pytester.py | 1745 ++++---
_pytest/python.py | 4385 ++++++++--------
_pytest/recwarn.py | 306 +-
_pytest/resultlog.py | 208 +-
_pytest/runner.py | 1014 ++--
_pytest/skipping.py | 606 +--
_pytest/standalonetemplate.py | 174 +-
_pytest/terminal.py | 1113 ++--
_pytest/tmpdir.py | 205 +-
_pytest/unittest.py | 396 +-
_pytest/vendored_packages/README.md | 13 +
_pytest/vendored_packages/__init__.py | 0
.../pluggy-0.3.1.dist-info/DESCRIPTION.rst | 10 +
.../pluggy-0.3.1.dist-info/METADATA | 39 +
.../pluggy-0.3.1.dist-info/RECORD | 8 +
.../vendored_packages/pluggy-0.3.1.dist-info/WHEEL | 6 +
.../pluggy-0.3.1.dist-info/metadata.json | 1 +
.../pluggy-0.3.1.dist-info/pbr.json | 1 +
.../pluggy-0.3.1.dist-info/top_level.txt | 1 +
_pytest/vendored_packages/pluggy.py | 777 +++
appveyor.yml | 82 -
appveyor/install.ps1 | 180 -
appveyor/run_with_env.cmd | 47 -
bench/bench.py | 24 +-
bench/bench_argcomplete.py | 38 +-
bench/empty.py | 6 +-
bench/manyparam.py | 24 +-
bench/skip.py | 20 +-
debian/.git-dpm | 6 +-
debian/patches/local-intersphinx | 671 ++-
debian/patches/remove-herokuapp-images | 443 --
debian/patches/remove_google_js | 50 +-
debian/patches/series | 1 -
doc/en/Makefile | 321 +-
doc/en/_getdoctarget.py | 32 +-
doc/en/_templates/globaltoc.html | 34 +-
doc/en/_templates/links.html | 22 +-
doc/en/_templates/sidebarintro.html | 10 +-
doc/en/_themes/.gitignore | 6 +-
doc/en/_themes/LICENSE | 74 +-
doc/en/_themes/README | 62 +-
doc/en/_themes/flask/layout.html | 48 +-
doc/en/_themes/flask/relations.html | 38 +-
doc/en/_themes/flask/static/flasky.css_t | 1114 ++--
doc/en/_themes/flask/theme.conf | 18 +-
doc/en/_themes/flask_theme_support.py | 172 +-
doc/en/{adopt.txt => adopt.rst} | 156 +-
doc/en/announce/{index.txt => index.rst} | 82 +-
.../{release-2.0.0.txt => release-2.0.0.rst} | 258 +-
.../{release-2.0.1.txt => release-2.0.1.rst} | 134 +-
.../{release-2.0.2.txt => release-2.0.2.rst} | 146 +-
.../{release-2.0.3.txt => release-2.0.3.rst} | 80 +-
.../{release-2.1.0.txt => release-2.1.0.rst} | 94 +-
.../{release-2.1.1.txt => release-2.1.1.rst} | 74 +-
.../{release-2.1.2.txt => release-2.1.2.rst} | 66 +-
.../{release-2.1.3.txt => release-2.1.3.rst} | 64 +-
.../{release-2.2.0.txt => release-2.2.0.rst} | 190 +-
.../{release-2.2.1.txt => release-2.2.1.rst} | 82 +-
.../{release-2.2.2.txt => release-2.2.2.rst} | 86 +-
.../{release-2.2.4.txt => release-2.2.4.rst} | 78 +-
.../{release-2.3.0.txt => release-2.3.0.rst} | 268 +-
.../{release-2.3.1.txt => release-2.3.1.rst} | 78 +-
.../{release-2.3.2.txt => release-2.3.2.rst} | 114 +-
.../{release-2.3.3.txt => release-2.3.3.rst} | 124 +-
.../{release-2.3.4.txt => release-2.3.4.rst} | 78 +-
.../{release-2.3.5.txt => release-2.3.5.rst} | 194 +-
.../{release-2.4.0.txt => release-2.4.0.rst} | 450 +-
.../{release-2.4.1.txt => release-2.4.1.rst} | 50 +-
.../{release-2.4.2.txt => release-2.4.2.rst} | 78 +-
.../{release-2.5.0.txt => release-2.5.0.rst} | 350 +-
.../{release-2.5.1.txt => release-2.5.1.rst} | 94 +-
.../{release-2.5.2.txt => release-2.5.2.rst} | 128 +-
.../{release-2.6.0.txt => release-2.6.0.rst} | 306 +-
.../{release-2.6.1.txt => release-2.6.1.rst} | 118 +-
.../{release-2.6.2.txt => release-2.6.2.rst} | 104 +-
.../{release-2.6.3.txt => release-2.6.3.rst} | 104 +-
.../{release-2.7.0.txt => release-2.7.0.rst} | 202 +-
.../{release-2.7.1.txt => release-2.7.1.rst} | 116 +-
.../{release-2.7.2.txt => release-2.7.2.rst} | 116 +-
doc/en/announce/release-2.8.2.rst | 44 +
doc/en/announce/release-2.8.3.rst | 59 +
doc/en/announce/release-2.8.4.rst | 52 +
doc/en/announce/release-2.8.5.rst | 39 +
doc/en/apiref.txt | 27 -
doc/en/{assert.txt => assert.rst} | 575 +--
.../{bash-completion.txt => bash-completion.rst} | 56 +-
doc/en/{builtin.txt => builtin.rst} | 252 +-
doc/en/cache.rst | 278 +
doc/en/{capture.txt => capture.rst} | 234 +-
doc/en/{changelog.txt => changelog.rst} | 14 +-
doc/en/check_sphinx.py | 34 +-
doc/en/conf.py | 13 +-
doc/en/conftest.py | 2 +-
doc/en/{contact.txt => contact.rst} | 102 +-
doc/en/{contents.txt => contents.rst} | 61 +-
doc/en/{contributing.txt => contributing.rst} | 6 +-
doc/en/{customize.txt => customize.rst} | 420 +-
doc/en/{doctest.txt => doctest.rst} | 161 +-
doc/en/example/assertion/failure_demo.py | 474 +-
.../assertion/global_testmodule_config/conftest.py | 20 +-
.../global_testmodule_config/test_hello.py | 10 +-
doc/en/example/assertion/test_failures.py | 28 +-
.../example/assertion/test_setup_flow_example.py | 84 +-
doc/en/example/{attic.txt => attic.rst} | 158 +-
doc/en/example/conftest.py | 2 +-
doc/en/example/costlysetup/conftest.py | 36 +-
doc/en/example/costlysetup/sub1/__init__.py | 2 +-
doc/en/example/costlysetup/sub1/test_quick.py | 6 +-
doc/en/example/costlysetup/sub2/__init__.py | 2 +-
doc/en/example/costlysetup/sub2/test_two.py | 12 +-
doc/en/example/{index.txt => index.rst} | 68 +-
doc/en/example/layout1/setup.cfg | 8 +-
doc/en/example/{markers.txt => markers.rst} | 1176 ++---
doc/en/example/multipython.py | 102 +-
doc/en/example/{nonpython.txt => nonpython.rst} | 177 +-
doc/en/example/nonpython/conftest.py | 80 +-
doc/en/example/nonpython/test_simple.yml | 14 +-
.../example/{parametrize.txt => parametrize.rst} | 897 ++--
doc/en/example/py2py3/conftest.py | 32 +-
doc/en/example/py2py3/test_py2.py | 14 +-
doc/en/example/py2py3/test_py3.py | 14 +-
doc/en/example/pythoncollection.py | 22 +-
.../{pythoncollection.txt => pythoncollection.rst} | 345 +-
.../{reportingdemo.txt => reportingdemo.rst} | 1196 ++---
doc/en/example/{simple.txt => simple.rst} | 1498 +++---
doc/en/example/{special.txt => special.rst} | 144 +-
doc/en/example/xfail_demo.py | 60 +-
doc/en/{faq.txt => faq.rst} | 332 +-
doc/en/feedback.rst | 16 +-
doc/en/{fixture.txt => fixture.rst} | 1954 +++----
.../{funcarg_compare.txt => funcarg_compare.rst} | 434 +-
doc/en/{funcargs.txt => funcargs.rst} | 28 +-
doc/en/genapi.py | 82 +-
.../{getting-started.txt => getting-started.rst} | 470 +-
doc/en/{goodpractises.txt => goodpractises.rst} | 567 +--
doc/en/{index.txt => index.rst} | 118 +-
doc/en/links.inc | 42 +-
doc/en/{mark.txt => mark.rst} | 75 +-
doc/en/{monkeypatch.txt => monkeypatch.rst} | 165 +-
doc/en/{naming20.txt => naming20.rst} | 40 +-
doc/en/{nose.txt => nose.rst} | 110 +-
doc/en/{overview.txt => overview.rst} | 28 +-
doc/en/{parametrize.txt => parametrize.rst} | 442 +-
doc/en/plugins.rst | 159 +
doc/en/plugins_index/bitbucket.png | Bin 679 -> 0 bytes
doc/en/plugins_index/github.png | Bin 734 -> 0 bytes
doc/en/plugins_index/index.txt | 227 -
doc/en/plugins_index/plugins_index.py | 308 --
doc/en/{projects.txt => projects.rst} | 169 +-
doc/en/pytest.ini | 4 +-
doc/en/recwarn.rst | 124 +
doc/en/recwarn.txt | 42 -
doc/en/release.txt | 54 -
doc/en/{setup.txt => setup.rst} | 20 +-
doc/en/{skipping.txt => skipping.rst} | 603 +--
doc/en/{status.txt => status.rst} | 10 +-
doc/en/{talks.txt => talks.rst} | 223 +-
doc/en/test/{attic.txt => attic.rst} | 234 +-
doc/en/test/config.html | 36 +-
doc/en/test/dist.html | 36 +-
doc/en/test/extend.html | 36 +-
doc/en/test/{index.txt => index.rst} | 70 +-
doc/en/test/{mission.txt => mission.rst} | 26 +-
doc/en/test/plugin/{cov.txt => cov.rst} | 460 +-
doc/en/test/plugin/{coverage.txt => coverage.rst} | 102 +-
doc/en/test/plugin/{django.txt => django.rst} | 14 +-
doc/en/test/plugin/{figleaf.txt => figleaf.rst} | 88 +-
.../test/plugin/{genscript.txt => genscript.rst} | 56 +-
.../test/plugin/{helpconfig.txt => helpconfig.rst} | 76 +-
doc/en/test/plugin/{index.txt => index.rst} | 136 +-
doc/en/test/plugin/{links.txt => links.rst} | 94 +-
doc/en/test/plugin/{nose.txt => nose.rst} | 112 +-
doc/en/test/plugin/{oejskit.txt => oejskit.rst} | 24 +-
doc/en/test/plugin/{terminal.txt => terminal.rst} | 80 +-
doc/en/test/plugin/{xdist.txt => xdist.rst} | 344 +-
doc/en/test/test.html | 36 +-
doc/en/{tmpdir.txt => tmpdir.rst} | 185 +-
doc/en/{unittest.txt => unittest.rst} | 372 +-
doc/en/{usage.txt => usage.rst} | 508 +-
doc/en/{plugins.txt => writing_plugins.rst} | 1082 ++--
doc/en/{xdist.txt => xdist.rst} | 394 +-
doc/en/{xunit_setup.txt => xunit_setup.rst} | 180 +-
doc/en/{yieldfixture.txt => yieldfixture.rst} | 223 +-
extra/get_issues.py | 148 +-
extra/setup-py.test/setup.py | 22 +-
plugin-test.sh | 40 +-
pytest.egg-info/PKG-INFO | 180 +-
pytest.egg-info/SOURCES.txt | 228 +-
pytest.egg-info/entry_points.txt | 2 +-
pytest.egg-info/not-zip-safe | 2 +-
pytest.egg-info/pbr.json | 1 -
pytest.py | 46 +-
requirements-docs.txt | 5 +-
runtox.py | 16 +-
setup.cfg | 38 +-
setup.py | 244 +-
testing/acceptance_test.py | 1348 ++---
testing/conftest.py | 126 -
testing/cx_freeze/install_cx_freeze.py | 20 +-
testing/cx_freeze/tests/test_doctest.txt | 12 +-
testing/python/collect.py | 1998 ++++----
testing/python/fixture.py | 5343 ++++++++++----------
testing/python/integration.py | 707 +--
testing/python/metafunc.py | 1997 ++++----
testing/python/raises.py | 143 +-
testing/test_argcomplete.py | 188 +-
testing/test_assertinterpret.py | 702 +--
testing/test_assertion.py | 1230 ++---
testing/test_assertrewrite.py | 1390 ++---
testing/test_cache.py | 373 ++
testing/test_capture.py | 2116 ++++----
testing/test_collection.py | 1255 ++---
testing/test_config.py | 945 ++--
testing/test_conftest.py | 756 +--
testing/test_core.py | 881 ----
testing/test_doctest.py | 954 ++--
testing/test_genscript.py | 99 +-
testing/test_helpconfig.py | 137 +-
testing/test_junitxml.py | 1210 +++--
testing/test_mark.py | 1298 ++---
testing/test_monkeypatch.py | 561 +-
testing/test_nose.py | 750 +--
testing/test_parseopt.py | 577 +--
testing/test_pastebin.py | 202 +-
testing/test_pdb.py | 577 +--
testing/test_pluginmanager.py | 336 ++
testing/test_pytester.py | 245 +-
testing/test_recwarn.py | 302 +-
testing/test_resultlog.py | 464 +-
testing/test_runner.py | 1140 +++--
testing/test_runner_xunit.py | 504 +-
testing/test_session.py | 487 +-
testing/test_skipping.py | 1477 +++---
testing/test_terminal.py | 1521 +++---
testing/test_tmpdir.py | 286 +-
testing/test_unittest.py | 1457 +++---
tox.ini | 300 +-
277 files changed, 50434 insertions(+), 47323 deletions(-)
diff --cc debian/.git-dpm
index 1687b85,0000000..c1e4490
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- c211afffef911adbe97f161b0356a952ce369b13
- c211afffef911adbe97f161b0356a952ce369b13
- c965cf1199064b06d43b7a08ec0d24042d7c1f77
++eff5ad0e09a322049deb80cdcab6984fb5284aca
++eff5ad0e09a322049deb80cdcab6984fb5284aca
++f2240a070184f58f07c3c5ff1a3c76703ac198ff
+f2240a070184f58f07c3c5ff1a3c76703ac198ff
+pytest_2.8.5.orig.tar.gz
+5062cf57c92b52921359ee94bcda690354fced2e
+573459
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/local-intersphinx
index 863276b,0000000..c59a0d6
mode 100644,000000..100644
--- a/debian/patches/local-intersphinx
+++ b/debian/patches/local-intersphinx
@@@ -1,27 -1,0 +1,670 @@@
- From ef37cfeba72309517159003e01a71cec959eb5e4 Mon Sep 17 00:00:00 2001
++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 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
++ 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 3df5054..b8f355c 100644
++index 1c57225..aca0442 100644
+--- a/doc/en/conf.py
++++ b/doc/en/conf.py
- @@ -313,7 +313,8 @@ texinfo_documents = [
-
-
- # Example configuration for intersphinx: refer to the Python standard library.
- -intersphinx_mapping = {'python': ('http://docs.python.org/', None),
- +intersphinx_mapping = {'python': ('http://docs.python.org/',
- + '/usr/share/doc/python-doc/html/objects.inv'),
- # 'lib': ("http://docs.python.org/2.7library/", None),
- }
-
++@@ -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')
diff --cc debian/patches/remove_google_js
index 317ca95,0000000..193a65a
mode 100644,000000..100644
--- a/debian/patches/remove_google_js
... 74 lines suppressed ...
--
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