[Pytest-commit] commit/pytest: hpk42: removed outdated japanese docs from source tree.

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Mon Sep 29 12:33:09 CEST 2014


1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/25aa56b376c1/
Changeset:   25aa56b376c1
User:        hpk42
Date:        2014-09-29 10:31:15+00:00
Summary:     removed outdated japanese docs from source tree.
Affected #:  98 files

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,8 @@
 
 - Improve assertion failure reporting on iterables, by using ndiff and pprint.
 
+- removed outdated japanese docs from source tree.
+
 2.6.3
 -----------
 

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/Makefile
--- a/doc/ja/Makefile
+++ /dev/null
@@ -1,159 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
-
-regen:
-	PYTHONDONTWRITEBYTECODE=1 COLUMNS=76 regendoc --update *.txt */*.txt
-    
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-install: html
-	 rsync -avz _build/html/ pytest.org:/www/pytest.org/latest-ja
-
-installpdf: latexpdf
-	@scp $(BUILDDIR)/latex/pytest.pdf pytest.org:/www/pytest.org/latest
-
-installall: clean install installpdf
-	@echo "done"
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pytest.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pytest.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/pytest"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pytest"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	make -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-texinfo:
-	mkdir -p $(BUILDDIR)/texinfo
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	mkdir -p $(BUILDDIR)/texinfo
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/_static/sphinxdoc.css
--- a/doc/ja/_static/sphinxdoc.css
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * sphinxdoc.css_t
- * ~~~~~~~~~~~~~~~
- *
- * Sphinx stylesheet -- sphinxdoc theme.  Originally created by
- * Armin Ronacher for Werkzeug.
- *
- * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
- at import url("basic.css");
-
-/* -- page layout ----------------------------------------------------------- */
-
-body {
-    font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva',
-                 'Verdana', sans-serif;
-    font-size: 1.1em;
-    letter-spacing: -0.01em;
-    line-height: 150%;
-    text-align: center;
-    background-color: #BFD1D4;
-    color: black;
-    padding: 0;
-    border: 1px solid #aaa;
-
-    margin: 0px 80px 0px 80px;
-    min-width: 740px;
-}
-
-div.document {
-    background-color: white;
-    text-align: left;
-    background-image: url(contents.png);
-    background-repeat: repeat-x;
-}
-
-div.bodywrapper {
-    margin: 0 290px 0 0;
-    border-right: 1px solid #ccc;
-}
-
-div.body {
-    margin: 0;
-    padding: 0.5em 20px 20px 20px;
-}
-
-div.related {
-    font-size: 0.8em;
-}
-
-div.related ul {
-    background-image: url(navigation.png);
-    height: 2em;
-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
-}
-
-div.related ul li {
-    margin: 0;
-    padding: 0;
-    height: 2em;
-    float: left;
-}
-
-div.related ul li.right {
-    float: right;
-    margin-right: 5px;
-}
-
-div.related ul li a {
-    margin: 0;
-    padding: 0 5px 0 5px;
-    line-height: 1.75em;
-    color: #EE9816;
-}
-
-div.related ul li a:hover {
-    color: #3CA8E7;
-}
-
-div.sphinxsidebarwrapper {
-    padding: 0;
-}
-
-div.sphinxsidebar {
-    margin: 0;
-    padding: 0.5em 15px 15px 0;
-    width: 260px;
-    float: right;
-    font-size: 1em;
-    text-align: left;
-}
-
-div.sphinxsidebar h3, div.sphinxsidebar h4 {
-    margin: 1em 0 0.5em 0;
-    font-size: 1em;
-    padding: 0.1em 0 0.1em 0.5em;
-    color: white;
-    border: 1px solid #86989B;
-    background-color: #AFC1C4;
-}
-
-div.sphinxsidebar h3 a {
-    color: white;
-}
-
-div.sphinxsidebar ul {
-    padding-left: 1.5em;
-    margin-top: 7px;
-    padding: 0;
-    line-height: 130%;
-}
-
-div.sphinxsidebar ul ul {
-    margin-left: 20px;
-}
-
-div.sphinxsidebar #searchbox input[type="submit"] {
-    width: 55px;
-}
-
-div.footer {
-    background-color: #E3EFF1;
-    color: #86989B;
-    padding: 3px 8px 3px 0;
-    clear: both;
-    font-size: 0.8em;
-    text-align: right;
-}
-
-div.footer a {
-    color: #86989B;
-    text-decoration: underline;
-}
-
-/* -- body styles ----------------------------------------------------------- */
-
-p {    
-    margin: 0.8em 0 0.5em 0;
-}
-
-a {
-    color: #CA7900;
-    text-decoration: none;
-}
-
-a:hover {
-    color: #2491CF;
-}
-
-div.body a {
-    text-decoration: underline;
-}
-
-h1 {
-    margin: 0;
-    padding: 0.7em 0 0.3em 0;
-    font-size: 1.5em;
-    color: #11557C;
-}
-
-h2 {
-    margin: 1.3em 0 0.2em 0;
-    font-size: 1.35em;
-    padding: 0;
-}
-
-h3 {
-    margin: 1em 0 -0.3em 0;
-    font-size: 1.2em;
-}
-
-div.body h1 a, div.body h2 a, div.body h3 a, div.body h4 a, div.body h5 a, div.body h6 a {
-    color: black!important;
-}
-
-h1 a.anchor, h2 a.anchor, h3 a.anchor, h4 a.anchor, h5 a.anchor, h6 a.anchor {
-    display: none;
-    margin: 0 0 0 0.3em;
-    padding: 0 0.2em 0 0.2em;
-    color: #aaa!important;
-}
-
-h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor,
-h5:hover a.anchor, h6:hover a.anchor {
-    display: inline;
-}
-
-h1 a.anchor:hover, h2 a.anchor:hover, h3 a.anchor:hover, h4 a.anchor:hover,
-h5 a.anchor:hover, h6 a.anchor:hover {
-    color: #777;
-    background-color: #eee;
-}
-
-a.headerlink {
-    color: #c60f0f!important;
-    font-size: 1em;
-    margin-left: 6px;
-    padding: 0 4px 0 4px;
-    text-decoration: none!important;
-}
-
-a.headerlink:hover {
-    background-color: #ccc;
-    color: white!important;
-}
-
-cite, code, tt {
-    font-family: 'Consolas', 'Deja Vu Sans Mono',
-                 'Bitstream Vera Sans Mono', monospace;
-    font-size: 0.95em;
-    letter-spacing: 0.01em;
-}
-
-tt {
-    background-color: #f2f2f2;
-    border-bottom: 1px solid #ddd;
-    color: #333;
-}
-
-tt.descname, tt.descclassname, tt.xref {
-    border: 0;
-}
-
-hr {
-    border: 1px solid #abc;
-    margin: 2em;
-}
-
-a tt {
-    border: 0;
-    color: #CA7900;
-}
-
-a tt:hover {
-    color: #2491CF;
-}
-
-pre {
-    font-family: 'Consolas', 'Deja Vu Sans Mono',
-                 'Bitstream Vera Sans Mono', monospace;
-    font-size: 0.95em;
-    letter-spacing: 0.015em;
-    line-height: 120%;
-    padding: 0.5em;
-    border: 1px solid #ccc;
-    background-color: #f8f8f8;
-}
-
-pre a {
-    color: inherit;
-    text-decoration: underline;
-}
-
-td.linenos pre {
-    padding: 0.5em 0;
-}
-
-div.quotebar {
-    background-color: #f8f8f8;
-    max-width: 250px;
-    float: right;
-    padding: 2px 7px;
-    border: 1px solid #ccc;
-}
-
-div.topic {
-    background-color: #f8f8f8;
-}
-
-table {
-    border-collapse: collapse;
-    margin: 0 -0.5em 0 -0.5em;
-}
-
-table td, table th {
-    padding: 0.2em 0.5em 0.2em 0.5em;
-}
-
-div.admonition, div.warning {
-    font-size: 0.9em;
-    margin: 1em 0 1em 0;
-    border: 1px solid #86989B;
-    background-color: #f7f7f7;
-    padding: 0;
-}
-
-div.admonition p, div.warning p {
-    margin: 0.5em 1em 0.5em 1em;
-    padding: 0;
-}
-
-div.admonition pre, div.warning pre {
-    margin: 0.4em 1em 0.4em 1em;
-}
-
-div.admonition p.admonition-title,
-div.warning p.admonition-title {
-    margin: 0;
-    padding: 0.1em 0 0.1em 0.5em;
-    color: white;
-    border-bottom: 1px solid #86989B;
-    font-weight: bold;
-    background-color: #AFC1C4;
-}
-
-div.warning {
-    border: 1px solid #940000;
-}
-
-div.warning p.admonition-title {
-    background-color: #CF0000;
-    border-bottom-color: #940000;
-}
-
-div.admonition ul, div.admonition ol,
-div.warning ul, div.warning ol {
-    margin: 0.1em 0.5em 0.5em 3em;
-    padding: 0;
-}
-
-div.versioninfo {
-    margin: 1em 0 0 0;
-    border: 1px solid #ccc;
-    background-color: #DDEAF0;
-    padding: 8px;
-    line-height: 1.3em;
-    font-size: 0.9em;
-}
-
-.viewcode-back {
-    font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva',
-                 'Verdana', sans-serif;
-}
-
-div.viewcode-block:target {
-    background-color: #f4debf;
-    border-top: 1px solid #ac9;
-    border-bottom: 1px solid #ac9;
-}

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/index.txt
--- a/doc/ja/announce/index.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-
-..
-    Release announcements
-    ===========================================
-
-リリースアナウンス
-==================
-
-.. toctree::
-   :maxdepth: 2
-
-   release-2.2.4
-   release-2.2.2
-   release-2.2.1
-   release-2.2.0
-   release-2.1.3
-   release-2.1.2
-   release-2.1.1
-   release-2.1.0
-   release-2.0.3
-   release-2.0.2
-   release-2.0.1
-   release-2.0.0
-

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.0.0.txt
--- a/doc/ja/announce/release-2.0.0.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-py.test 2.0.0: asserts++, unittest++, reporting++, config++, docs++
-===========================================================================
-
-Welcome to pytest-2.0.0, a major new release of "py.test", the rapid
-easy Python testing tool.  There are many new features and enhancements,
-see below for summary and detailed lists.  A lot of long-deprecated code
-has been removed, resulting in a much smaller and cleaner
-implementation.  See the new docs with examples here:
-
-    http://pytest.org/2.0.0/index.html
-
-A note on packaging: pytest used to part of the "py" distribution up
-until version py-1.3.4 but this has changed now:  pytest-2.0.0 only
-contains py.test related code and is expected to be backward-compatible
-to existing test code. If you want to install pytest, just type one of::
-
-    pip install -U pytest
-    easy_install -U pytest
-
-Many thanks to all issue reporters and people asking questions or
-complaining.  Particular thanks to Floris Bruynooghe and Ronny Pfannschmidt
-for their great coding contributions and many others for feedback and help.
-
-best,
-holger krekel
-
-
-New Features
------------------------
-
-- new invocations through Python interpreter and from Python::
-
-    python -m pytest      # on all pythons >= 2.5
-
-  or from a python program::
-
-    import pytest ; pytest.main(arglist, pluginlist)
-
-  see http://pytest.org/2.0.0/usage.html for details.
-
-- new and better reporting information in assert expressions
-  if comparing lists, sequences or strings.
-
-  see http://pytest.org/2.0.0/assert.html#newreport
-
-- new configuration through ini-files (setup.cfg or tox.ini recognized),
-  for example::
-
-    [pytest]
-    norecursedirs = .hg data*  # don't ever recurse in such dirs
-    addopts = -x --pyargs      # add these command line options by default
-
-  see http://pytest.org/2.0.0/customize.html
-
-- improved standard unittest support.  In general py.test should now
-  better be able to run custom unittest.TestCases like twisted trial
-  or Django based TestCases.  Also you can now run the tests of an
-  installed 'unittest' package with py.test::
-
-    py.test --pyargs unittest
-
-- new "-q" option which decreases verbosity and prints a more
-  nose/unittest-style "dot" output.
-
-- many many more detailed improvements details
-
-Fixes
------------------------
-
-- fix issue126 - introduce py.test.set_trace() to trace execution via
-  PDB during the running of tests even if capturing is ongoing.
-- fix issue124 - make reporting more resilient against tests opening
-  files on filedescriptor 1 (stdout).
-- fix issue109 - sibling conftest.py files will not be loaded.
-  (and Directory collectors cannot be customized anymore from a Directory's
-  conftest.py - this needs to happen at least one level up).
-- fix issue88 (finding custom test nodes from command line arg)
-- fix issue93 stdout/stderr is captured while importing conftest.py
-- fix bug: unittest collected functions now also can have "pytestmark"
-  applied at class/module level
-
-Important Notes
---------------------
-
-* The usual way in pre-2.0 times to use py.test in python code was
-  to import "py" and then e.g. use "py.test.raises" for the helper.
-  This remains valid and is not planned to be deprecated.  However,
-  in most examples and internal code you'll find "import pytest"
-  and "pytest.raises" used as the recommended default way.
-
-* pytest now first performs collection of the complete test suite
-  before running any test. This changes for example the semantics of when
-  pytest_collectstart/pytest_collectreport are called.  Some plugins may
-  need upgrading.
-
-* The pytest package consists of a 400 LOC core.py and about 20 builtin plugins,
-  summing up to roughly 5000 LOCs, including docstrings. To be fair, it also
-  uses generic code from the "pylib", and the new "py" package to help
-  with filesystem and introspection/code manipulation.
-
-(Incompatible) Removals
------------------------------
-
-- py.test.config is now only available if you are in a test run.
-
-- the following (mostly already deprecated) functionality was removed:
-
-  - removed support for Module/Class/... collection node definitions
-    in conftest.py files.  They will cause nothing special.
-  - removed support for calling the pre-1.0 collection API of "run()" and "join"
-  - removed reading option values from conftest.py files or env variables.
-    This can now be done much much better and easier through the ini-file
-    mechanism and the "addopts" entry in particular.
-  - removed the "disabled" attribute in test classes.  Use the skipping
-    and pytestmark mechanism to skip or xfail a test class.
-
-- py.test.collect.Directory does not exist anymore and it
-  is not possible to provide an own "Directory" object.
-  If you have used this and don't know what to do, get
-  in contact.  We'll figure something out.
-
-  Note that pytest_collect_directory() is still called but
-  any return value will be ignored.  This allows to keep
-  old code working that performed for example "py.test.skip()"
-  in collect() to prevent recursion into directory trees
-  if a certain dependency or command line option is missing.
-
-
-see :ref:`changelog` for more detailed changes.

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.0.1.txt
--- a/doc/ja/announce/release-2.0.1.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-py.test 2.0.1: bug fixes
-===========================================================================
-
-Welcome to pytest-2.0.1, a maintenance and bug fix release of pytest,
-a mature testing tool for Python, supporting CPython 2.4-3.2, Jython
-and latest PyPy interpreters.  See extensive docs with tested examples here:
-
-    http://pytest.org/
-
-If you want to install or upgrade pytest, just type one of::
-
-    pip install -U pytest # or
-    easy_install -U pytest
-
-Many thanks to all issue reporters and people asking questions or
-complaining.  Particular thanks to Floris Bruynooghe and Ronny Pfannschmidt
-for their great coding contributions and many others for feedback and help.
-
-best,
-holger krekel
-
-Changes between 2.0.0 and 2.0.1
-----------------------------------------------
-
-- refine and unify initial capturing so that it works nicely
-  even if the logging module is used on an early-loaded conftest.py
-  file or plugin.
-- fix issue12 - show plugin versions with "--version" and
-  "--traceconfig" and also document how to add extra information
-  to reporting test header
-- fix issue17 (import-* reporting issue on python3) by
-  requiring py>1.4.0 (1.4.1 is going to include it)
-- fix issue10 (numpy arrays truth checking) by refining
-  assertion interpretation in py lib
-- fix issue15: make nose compatibility tests compatible
-  with python3 (now that nose-1.0 supports python3)
-- remove somewhat surprising "same-conftest" detection because
-  it ignores conftest.py when they appear in several subdirs.
-- improve assertions ("not in"), thanks Floris Bruynooghe
-- improve behaviour/warnings when running on top of "python -OO"
-  (assertions and docstrings are turned off, leading to potential
-  false positives)
-- introduce a pytest_cmdline_processargs(args) hook
-  to allow dynamic computation of command line arguments.
-  This fixes a regression because py.test prior to 2.0
-  allowed to set command line options from conftest.py
-  files which so far pytest-2.0 only allowed from ini-files now.
-- fix issue7: assert failures in doctest modules.
-  unexpected failures in doctests will not generally
-  show nicer, i.e. within the doctest failing context.
-- fix issue9: setup/teardown functions for an xfail-marked
-  test will report as xfail if they fail but report as normally
-  passing (not xpassing) if they succeed.  This only is true
-  for "direct" setup/teardown invocations because teardown_class/
-  teardown_module cannot closely relate to a single test.
-- fix issue14: no logging errors at process exit
-- refinements to "collecting" output on non-ttys
-- refine internal plugin registration and --traceconfig output
-- introduce a mechanism to prevent/unregister plugins from the
-  command line, see http://pytest.org/plugins.html#cmdunregister
-- activate resultlog plugin by default
-- fix regression wrt yielded tests which due to the
-  collection-before-running semantics were not
-  setup as with pytest 1.3.4.  Note, however, that
-  the recommended and much cleaner way to do test
-  parametrization remains the "pytest_generate_tests"
-  mechanism, see the docs.

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.0.2.txt
--- a/doc/ja/announce/release-2.0.2.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-py.test 2.0.2: bug fixes, improved xfail/skip expressions, speed ups
-===========================================================================
-
-Welcome to pytest-2.0.2, a maintenance and bug fix release of pytest,
-a mature testing tool for Python, supporting CPython 2.4-3.2, Jython
-and latest PyPy interpreters.  See the extensive docs with tested examples here:
-
-    http://pytest.org/
-
-If you want to install or upgrade pytest, just type one of::
-
-    pip install -U pytest # or
-    easy_install -U pytest
-
-Many thanks to all issue reporters and people asking questions
-or complaining, particularly Jurko for his insistence,
-Laura, Victor and Brianna for helping with improving
-and Ronny for his general advise.
-
-best,
-holger krekel
-
-Changes between 2.0.1 and 2.0.2
-----------------------------------------------
-
-- tackle issue32 - speed up test runs of very quick test functions
-  by reducing the relative overhead
-
-- fix issue30 - extended xfail/skipif handling and improved reporting.
-  If you have a syntax error in your skip/xfail
-  expressions you now get nice error reports.
-
-  Also you can now access module globals from xfail/skipif
-  expressions so that this for example works now::
-
-    import pytest
-    import mymodule
-    @pytest.mark.skipif("mymodule.__version__[0] == "1")
-    def test_function():
-        pass
-
-  This will not run the test function if the module's version string
-  does not start with a "1".  Note that specifying a string instead
-  of a boolean expressions allows py.test to report meaningful information
-  when summarizing a test run as to what conditions lead to skipping
-  (or xfail-ing) tests.
-
-- fix issue28 - setup_method and pytest_generate_tests work together
-  The setup_method fixture method now gets called also for
-  test function invocations generated from the pytest_generate_tests
-  hook.
-
-- fix issue27 - collectonly and keyword-selection (-k) now work together
-  Also, if you do "py.test --collectonly -q" you now get a flat list
-  of test ids that you can use to paste to the py.test commandline
-  in order to execute a particular test.
-
-- fix issue25 avoid reported problems with --pdb and python3.2/encodings output
-
-- fix issue23 - tmpdir argument now works on Python3.2 and WindowsXP
-  Starting with Python3.2 os.symlink may be supported. By requiring
-  a newer py lib version the py.path.local() implementation acknowledges
-  this.
-
-- fixed typos in the docs (thanks Victor Garcia, Brianna Laugher) and particular
-  thanks to Laura Creighton who also revieved parts of the documentation.
-
-- fix slighly wrong output of verbose progress reporting for classes
-  (thanks Amaury)
-
-- more precise (avoiding of) deprecation warnings for node.Class|Function accesses
-
-- avoid std unittest assertion helper code in tracebacks (thanks Ronny)

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.0.3.txt
--- a/doc/ja/announce/release-2.0.3.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-py.test 2.0.3: bug fixes and speed ups 
-===========================================================================
-
-Welcome to pytest-2.0.3, a maintenance and bug fix release of pytest,
-a mature testing tool for Python, supporting CPython 2.4-3.2, Jython
-and latest PyPy interpreters.  See the extensive docs with tested examples here:
-
-    http://pytest.org/
-
-If you want to install or upgrade pytest, just type one of::
-
-    pip install -U pytest # or
-    easy_install -U pytest
-
-There also is a bugfix release 1.6 of pytest-xdist, the plugin
-that enables seemless distributed and "looponfail" testing for Python.
-
-best,
-holger krekel
-
-Changes between 2.0.2 and 2.0.3
-----------------------------------------------
-
-- fix issue38: nicer tracebacks on calls to hooks, particularly early
-  configure/sessionstart ones
-
-- fix missing skip reason/meta information in junitxml files, reported
-  via http://lists.idyll.org/pipermail/testing-in-python/2011-March/003928.html
-
-- fix issue34: avoid collection failure with "test" prefixed classes
-  deriving from object.
-
-- don't require zlib (and other libs) for genscript plugin without
-  --genscript actually being used.
-
-- speed up skips (by not doing a full traceback represenation
-  internally)
-
-- fix issue37: avoid invalid characters in junitxml's output
-

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.1.0.txt
--- a/doc/ja/announce/release-2.1.0.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-py.test 2.1.0: perfected assertions and bug fixes
-===========================================================================
-
-Welcome to the release of pytest-2.1, a mature testing tool for Python,
-supporting CPython 2.4-3.2, Jython and latest PyPy interpreters.  See
-the improved extensive docs (now also as PDF!) with tested examples here:
-
-     http://pytest.org/
-
-The single biggest news about this release are **perfected assertions**
-courtesy of Benjamin Peterson.  You can now safely use ``assert``
-statements in test modules without having to worry about side effects
-or python optimization ("-OO") options.  This is achieved by rewriting
-assert statements in test modules upon import, using a PEP302 hook.
-See http://pytest.org/assert.html#advanced-assertion-introspection for
-detailed information.  The work has been partly sponsored by my company,
-merlinux GmbH.
-
-For further details on bug fixes and smaller enhancements see below.
-
-If you want to install or upgrade pytest, just type one of::
-
-    pip install -U pytest # or
-    easy_install -U pytest
-
-best,
-holger krekel / http://merlinux.eu
-
-Changes between 2.0.3 and 2.1.0
-----------------------------------------------
-
-- fix issue53 call nosestyle setup functions with correct ordering
-- fix issue58 and issue59: new assertion code fixes
-- merge Benjamin's assertionrewrite branch: now assertions
-  for test modules on python 2.6 and above are done by rewriting
-  the AST and saving the pyc file before the test module is imported.
-  see doc/assert.txt for more info.
-- fix issue43: improve doctests with better traceback reporting on
-  unexpected exceptions
-- fix issue47: timing output in junitxml for test cases is now correct
-- fix issue48: typo in MarkInfo repr leading to exception
-- fix issue49: avoid confusing error when initialization partially fails
-- fix issue44: env/username expansion for junitxml file path
-- show releaselevel information in test runs for pypy
-- reworked doc pages for better navigation and PDF generation
-- report KeyboardInterrupt even if interrupted during session startup
-- fix issue 35 - provide PDF doc version and download link from index page

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.1.1.txt
--- a/doc/ja/announce/release-2.1.1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-py.test 2.1.1: assertion fixes and improved junitxml output
-===========================================================================
-
-pytest-2.1.1 is a backward compatible maintenance release of the
-popular py.test testing tool.  See extensive docs with examples here:
-
-     http://pytest.org/
-
-Most bug fixes address remaining issues with the perfected assertions
-introduced with 2.1.0 - many thanks to the bug reporters and to Benjamin
-Peterson for helping to fix them.  Also, junitxml output now produces
-system-out/err tags which lead to better displays of tracebacks with Jenkins.
-
-Also a quick note to package maintainers and others interested: there now
-is a "pytest" man page which can be generated with "make man" in doc/.
-
-If you want to install or upgrade pytest, just type one of::
-
-    pip install -U pytest # or
-    easy_install -U pytest
-
-best,
-holger krekel / http://merlinux.eu
-
-Changes between 2.1.0 and 2.1.1
-----------------------------------------------
-
-- fix issue64 / pytest.set_trace now works within pytest_generate_tests hooks
-- fix issue60 / fix error conditions involving the creation of __pycache__
-- fix issue63 / assertion rewriting on inserts involving strings containing '%'
-- fix assertion rewriting on calls with a ** arg
-- don't cache rewritten modules if bytecode generation is disabled
-- fix assertion rewriting in read-only directories
-- fix issue59: provide system-out/err tags for junitxml output
-- fix issue61: assertion rewriting on boolean operations with 3 or more operands
-- you can now build a man page with "cd doc ; make man"
-

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.1.2.txt
--- a/doc/ja/announce/release-2.1.2.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-py.test 2.1.2: bug fixes and fixes for jython
-===========================================================================
-
-pytest-2.1.2 is a minor backward compatible maintenance release of the
-popular py.test testing tool.  pytest is commonly used for unit,
-functional- and integration testing.  See extensive docs with examples
-here:
-
-     http://pytest.org/
-
-Most bug fixes address remaining issues with the perfected assertions
-introduced in the 2.1 series - many thanks to the bug reporters and to Benjamin
-Peterson for helping to fix them.  pytest should also work better with
-Jython-2.5.1 (and Jython trunk).
-
-If you want to install or upgrade pytest, just type one of::
-
-    pip install -U pytest # or
-    easy_install -U pytest
-
-best,
-holger krekel / http://merlinux.eu
-
-Changes between 2.1.1 and 2.1.2
-----------------------------------------
-
-- fix assertion rewriting on files with windows newlines on some Python versions
-- refine test discovery by package/module name (--pyargs), thanks Florian Mayer
-- fix issue69 / assertion rewriting fixed on some boolean operations
-- fix issue68 / packages now work with assertion rewriting
-- fix issue66: use different assertion rewriting caches when the -O option is passed
-- don't try assertion rewriting on Jython, use reinterp
-

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.1.3.txt
--- a/doc/ja/announce/release-2.1.3.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-py.test 2.1.3: just some more fixes
-===========================================================================
-
-pytest-2.1.3 is a minor backward compatible maintenance release of the
-popular py.test testing tool.  It is commonly used for unit, functional-
-and integration testing.  See extensive docs with examples here:
-
-     http://pytest.org/
-
-The release contains another fix to the perfected assertions introduced
-with the 2.1 series as well as the new possibility to customize reporting
-for assertion expressions on a per-directory level.  
-
-If you want to install or upgrade pytest, just type one of::
-
-    pip install -U pytest # or
-    easy_install -U pytest
-
-Thanks to the bug reporters and to Ronny Pfannschmidt, Benjamin Peterson
-and Floris Bruynooghe who implemented the fixes.
-
-best,
-holger krekel
-
-Changes between 2.1.2 and 2.1.3
-----------------------------------------
-
-- fix issue79: assertion rewriting failed on some comparisons in boolops,
-- correctly handle zero length arguments (a la pytest '')
-- fix issue67 / junitxml now contains correct test durations
-- fix issue75 / skipping test failure on jython
-- fix issue77 / Allow assertrepr_compare hook to apply to a subset of tests

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.2.0.txt
--- a/doc/ja/announce/release-2.2.0.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-py.test 2.2.0: test marking++, parametrization++ and duration profiling
-===========================================================================
-
-pytest-2.2.0 is a test-suite compatible release of the popular
-py.test testing tool.  Plugins might need upgrades. It comes
-with these improvements:
-
-* easier and more powerful parametrization of tests:
-
-  - new @pytest.mark.parametrize decorator to run tests with different arguments
-  - new metafunc.parametrize() API for parametrizing arguments independently
-  - see examples at http://pytest.org/latest/example/parametrize.html
-  - NOTE that parametrize() related APIs are still a bit experimental
-    and might change in future releases.
-
-* improved handling of test markers and refined marking mechanism:
-
-  - "-m markexpr" option for selecting tests according to their mark
-  - a new "markers" ini-variable for registering test markers for your project
-  - the new "--strict" bails out with an error if using unregistered markers.
-  - see examples at http://pytest.org/latest/example/markers.html
-
-* duration profiling: new "--duration=N" option showing the N slowest test
-  execution or setup/teardown calls. This is most useful if you want to
-  find out where your slowest test code is.
-
-* also 2.2.0 performs more eager calling of teardown/finalizers functions
-  resulting in better and more accurate reporting when they fail
-
-Besides there is the usual set of bug fixes along with a cleanup of
-pytest's own test suite allowing it to run on a wider range of environments.
-
-For general information, see extensive docs with examples here:
-
-     http://pytest.org/
-
-If you want to install or upgrade pytest you might just type::
-
-    pip install -U pytest # or
-    easy_install -U pytest
-
-Thanks to Ronny Pfannschmidt, David Burns, Jeff Donner, Daniel Nouri, Alfredo Deza and all who gave feedback or sent bug reports.
-
-best,
-holger krekel
-
-
-notes on incompatibility
-------------------------------
-
-While test suites should work unchanged you might need to upgrade plugins:
-
-* You need a new version of the pytest-xdist plugin (1.7) for distributing
-  test runs.
-
-* Other plugins might need an upgrade if they implement
-  the ``pytest_runtest_logreport`` hook which now is called unconditionally
-  for the setup/teardown fixture phases of a test. You may choose to
-  ignore setup/teardown failures by inserting "if rep.when != 'call': return"
-  or something similar. Note that most code probably "just" works because
-  the hook was already called for failing setup/teardown phases of a test
-  so a plugin should have been ready to grok such reports already.
-
-
-Changes between 2.1.3 and 2.2.0
-----------------------------------------
-
-- fix issue90: introduce eager tearing down of test items so that
-  teardown function are called earlier.
-- add an all-powerful metafunc.parametrize function which allows to
-  parametrize test function arguments in multiple steps and therefore
-  from independent plugins and places.
-- add a @pytest.mark.parametrize helper which allows to easily
-  call a test function with different argument values.
-- Add examples to the "parametrize" example page, including a quick port
-  of Test scenarios and the new parametrize function and decorator.
-- introduce registration for "pytest.mark.*" helpers via ini-files
-  or through plugin hooks.  Also introduce a "--strict" option which
-  will treat unregistered markers as errors
-  allowing to avoid typos and maintain a well described set of markers
-  for your test suite.  See examples at http://pytest.org/latest/mark.html
-  and its links.
-- issue50: introduce "-m marker" option to select tests based on markers
-  (this is a stricter and more predictable version of "-k" in that "-m"
-  only matches complete markers and has more obvious rules for and/or
-  semantics.
-- new feature to help optimizing the speed of your tests:
-  --durations=N option for displaying N slowest test calls
-  and setup/teardown methods.
-- fix issue87: --pastebin now works with python3
-- fix issue89: --pdb with unexpected exceptions in doctest work more sensibly
-- fix and cleanup pytest's own test suite to not leak FDs
-- fix issue83: link to generated funcarg list
-- fix issue74: pyarg module names are now checked against imp.find_module false positives
-- fix compatibility with twisted/trial-11.1.0 use cases

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.2.1.txt
--- a/doc/ja/announce/release-2.2.1.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-pytest-2.2.1: bug fixes, perfect teardowns
-===========================================================================
-
-
-pytest-2.2.1 is a minor backward-compatible release of the the py.test
-testing tool.   It contains bug fixes and little improvements, including
-documentation fixes.  If you are using the distributed testing
-pluginmake sure to upgrade it to pytest-xdist-1.8.
-
-For general information see here:
-
-     http://pytest.org/
-
-To install or upgrade pytest:
-
-    pip install -U pytest # or
-    easy_install -U pytest
-
-Special thanks for helping on this release to Ronny Pfannschmidt, Jurko
-Gospodnetic and Ralf Schmitt.
-
-best,
-holger krekel
-
-
-Changes between 2.2.0 and 2.2.1
-----------------------------------------
-
-- fix issue99 (in pytest and py) internallerrors with resultlog now
-  produce better output - fixed by normalizing pytest_internalerror 
-  input arguments.
-- fix issue97 / traceback issues (in pytest and py) improve traceback output
-  in conjunction with jinja2 and cython which hack tracebacks
-- fix issue93 (in pytest and pytest-xdist) avoid "delayed teardowns":
-  the final test in a test node will now run its teardown directly
-  instead of waiting for the end of the session. Thanks Dave Hunt for
-  the good reporting and feedback.  The pytest_runtest_protocol as well
-  as the pytest_runtest_teardown hooks now have "nextitem" available 
-  which will be None indicating the end of the test run.
-- fix collection crash due to unknown-source collected items, thanks
-  to Ralf Schmitt (fixed by depending on a more recent pylib)

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.2.2.txt
--- a/doc/ja/announce/release-2.2.2.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-pytest-2.2.2: bug fixes
-===========================================================================
-
-pytest-2.2.2 (updated to 2.2.3 to fix packaging issues) is a minor
-backward-compatible release of the versatile py.test testing tool.   It
-contains bug fixes and a few refinements particularly to reporting with
-"--collectonly", see below for betails.  
-
-For general information see here:
-
-     http://pytest.org/
-
-To install or upgrade pytest:
-
-    pip install -U pytest # or
-    easy_install -U pytest
-
-Special thanks for helping on this release to Ronny Pfannschmidt
-and Ralf Schmitt and the contributors of issues.
-
-best,
-holger krekel
-
-
-Changes between 2.2.1 and 2.2.2
-----------------------------------------
-
-- fix issue101: wrong args to unittest.TestCase test function now
-  produce better output
-- fix issue102: report more useful errors and hints for when a 
-  test directory was renamed and some pyc/__pycache__ remain
-- fix issue106: allow parametrize to be applied multiple times
-  e.g. from module, class and at function level.
-- fix issue107: actually perform session scope finalization
-- don't check in parametrize if indirect parameters are funcarg names
-- add chdir method to monkeypatch funcarg
-- fix crash resulting from calling monkeypatch undo a second time
-- fix issue115: make --collectonly robust against early failure
-  (missing files/directories)
-- "-qq --collectonly" now shows only files and the number of tests in them
-- "-q --collectonly" now shows test ids 
-- allow adding of attributes to test reports such that it also works
-  with distributed testing (no upgrade of pytest-xdist needed)

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/announce/release-2.2.4.txt
--- a/doc/ja/announce/release-2.2.4.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-pytest-2.2.4: bug fixes, better junitxml/unittest/python3 compat
-===========================================================================
-
-pytest-2.2.4 is a minor backward-compatible release of the versatile
-py.test testing tool.   It contains bug fixes and a few refinements
-to junitxml reporting, better unittest- and python3 compatibility.
-
-For general information see here:
-
-     http://pytest.org/
-
-To install or upgrade pytest:
-
-    pip install -U pytest # or
-    easy_install -U pytest
-
-Special thanks for helping on this release to Ronny Pfannschmidt
-and Benjamin Peterson and the contributors of issues.
-
-best,
-holger krekel
-
-Changes between 2.2.3 and 2.2.4
------------------------------------
-
-- fix error message for rewritten assertions involving the % operator
-- fix issue 126: correctly match all invalid xml characters for junitxml
-  binary escape
-- fix issue with unittest: now @unittest.expectedFailure markers should
-  be processed correctly (you can also use @pytest.mark markers)
-- document integration with the extended distribute/setuptools test commands
-- fix issue 140: propperly get the real functions
-  of bound classmethods for setup/teardown_class
-- fix issue #141: switch from the deceased paste.pocoo.org to bpaste.net
-- fix issue #143: call unconfigure/sessionfinish always when
-  configure/sessionstart where called
-- fix issue #144: better mangle test ids to junitxml classnames
-- upgrade distribute_setup.py to 0.6.27
-

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/apiref.txt
--- a/doc/ja/apiref.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-.. _apiref:
-
-py.test リファレンスドキュメント
-================================
-
-..
-    py.test reference documentation
-    ================================================
-
-.. toctree::
-   :maxdepth: 2
-
-   builtin.txt
-   customize.txt
-   assert.txt
-   funcargs.txt
-   xunit_setup.txt
-   capture.txt
-   monkeypatch.txt
-   xdist.txt
-   tmpdir.txt
-   skipping.txt
-   mark.txt
-   recwarn.txt
-   unittest.txt
-   nose.txt
-   doctest.txt
-

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/assert.txt
--- a/doc/ja/assert.txt
+++ /dev/null
@@ -1,362 +0,0 @@
-
-..
-    The writing and reporting of assertions in tests
-    ==================================================
-
-テストのアサーションにおける書き込みとレポート
-==============================================
-
-.. _`assert with the assert statement`:
-
-``assert`` 文によるアサーション
--------------------------------
-
-..
-    Asserting with the ``assert`` statement
-    ---------------------------------------------------------
-
-..
-    ``py.test`` allows you to use the standard python ``assert`` for verifying
-    expectations and values in Python tests.  For example, you can write the
-    following::
-
-``py.test`` は、テストで期待値と実際の値を検証するのに Python 標準の ``assert`` 文が使えます。例えば、次のようにテストを作成します::
-
-    # test_assert1.py の内容
-    def f():
-        return 3
-
-    def test_function():
-        assert f() == 4
-
-..
-    to assert that your function returns a certain value. If this assertion fails
-    you will see the return value of the function call::
-
-このサンプルは、関数が特定の値を返すのをアサートします。このアサーションが失敗した場合、関数呼び出しの返り値が表示されます::
-
-    $ py.test test_assert1.py
-    =========================== test session starts ============================
-    platform linux2 -- Python 2.7.1 -- pytest-2.2.4
-    collecting ... collected 1 items
-    
-    test_assert1.py F
-    
-    ================================= FAILURES =================================
-    ______________________________ test_function _______________________________
-    
-        def test_function():
-    >       assert f() == 4
-    E       assert 3 == 4
-    E        +  where 3 = f()
-    
-    test_assert1.py:5: AssertionError
-    ========================= 1 failed in 0.01 seconds =========================
-
-..
-    py.test has support for showing the values of the most common subexpressions
-    including calls, attributes, comparisons, and binary and unary
-    operators. (See :ref:`tbreportdemo`).  This allows you to use the
-    idiomatic python constructs without boilerplate code while not losing
-    introspection information.
-
-py.test は、関数呼び出し、属性、比較、バイナリや単項演算子といった処理を含む通常の部分式の値を表示する機能があります (:ref:`tbreportdemo` を参照) 。この機能により、定型的なコードを必要とせず、Python イディオム的な概念も利用できます。その上でイントロスペクション情報を失うこともありません。
-
-..
-    However, if you specify a message with the assertion like this::
-
-但し、次のようにアサーションと一緒にメッセージを指定した場合::
-
-    assert a % 2 == 0, "value was odd, should be even"
-
-..
-    then no assertion introspection takes places at all and the message
-    will be simply shown in the traceback.
-
-そこでアサートイントロスペクションを行わず、このメッセージは単純にトレースバックで表示されます。
-
-..
-    See :ref:`assert-details` for more information on assertion introspection.
-
-アサートイントロスペクションの詳細については :ref:`assert-details` を参照してください。
-
-..
-    Assertions about expected exceptions
-    ------------------------------------------
-
-例外発生を期待するアサーション
-------------------------------
-
-..
-    In order to write assertions about raised exceptions, you can use
-    ``pytest.raises`` as a context manager like this::
-
-発生した例外のアサーションを行うには、次のようにコンテキスト マネージャーとして ``pytest.raises`` を使います::
-
-    import pytest
-    with pytest.raises(ZeroDivisionError):
-        1 / 0
-
-..
-    and if you need to have access to the actual exception info you may use::
-
-もし実際の例外の情報を調べる必要があるなら、次のように行います::
-
-    with pytest.raises(RuntimeError) as excinfo:
-        def f():
-            f()
-        f()
-
-    # excinfo.type, excinfo.value, excinfo.traceback といった関連する値を確認する
-
-..
-    If you want to write test code that works on Python 2.4 as well,
-    you may also use two other ways to test for an expected exception::
-
-Python 2.4 でも同じように動作するテストコードを書きたいなら、例外発生を期待するテストを行う別の方法が2つあります::
-
-    pytest.raises(ExpectedException, func, *args, **kwargs)
-    pytest.raises(ExpectedException, "func(*args, **kwargs)")
-
-..
-    both of which execute the specified function with args and kwargs and
-    asserts that the given ``ExpectedException`` is raised.  The reporter will
-    provide you with helpful output in case of failures such as *no
-    exception* or *wrong exception*.
-
-両方とも指定した関数へ args と kwargs を渡して実行し、引数として与えた ``ExpectedException`` が発生することをアサートします。このレポートは *no exception* または *wrong exception* といったテストに失敗したときに分かりやすい内容を表示します。
-
-.. _newreport:
-
-コンテキストに依存した内容の比較
---------------------------------
-
-..
-    Making use of context-sensitive comparisons
-    -------------------------------------------------
-
-.. versionadded:: 2.0
-
-..
-    py.test has rich support for providing context-sensitive information
-    when it encounters comparisons.  For example::
-
-py.test は、比較するときにコンテキスト依存の情報を分かりやすく表示します。例えば、::
-
-    # test_assert2.py の内容
-
-    def test_set_comparison():
-        set1 = set("1308")
-        set2 = set("8035")
-        assert set1 == set2
-
-..
-    if you run this module::
-
-このモジュールを実行すると::
-
-    $ py.test test_assert2.py
-    =========================== test session starts ============================
-    platform linux2 -- Python 2.7.1 -- pytest-2.2.4
-    collecting ... collected 1 items
-    
-    test_assert2.py F
-    
-    ================================= FAILURES =================================
-    ___________________________ test_set_comparison ____________________________
-    
-        def test_set_comparison():
-            set1 = set("1308")
-            set2 = set("8035")
-    >       assert set1 == set2
-    E       assert set(['0', '1', '3', '8']) == set(['0', '3', '5', '8'])
-    E         Extra items in the left set:
-    E         '1'
-    E         Extra items in the right set:
-    E         '5'
-    
-    test_assert2.py:5: AssertionError
-    ========================= 1 failed in 0.01 seconds =========================
-
-..
-    Special comparisons are done for a number of cases:
-
-複数のケースにおいて、特別な比較が行われます:
-
-..
-    * comparing long strings: a context diff is shown
-    * comparing long sequences: first failing indices
-    * comparing dicts: different entries
-
-* 長い文字列の比較: コンテキスト diff を表示
-* 長いシーケンスの比較: 最初に失敗したインデックス
-* ディクショナリの比較: 異なるエントリ
-
-..
-    See the :ref:`reporting demo <tbreportdemo>` for many more examples.
-
-より多くのサンプルについては :ref:`レポートのデモ <tbreportdemo>` 参照してください。
-
-..
-    Defining your own assertion comparison
-    ----------------------------------------------
-
-アサーション比較の定義
-----------------------
-
-..
-    It is possible to add your own detailed explanations by implementing
-    the ``pytest_assertrepr_compare`` hook.
-
-``pytest_assertrepr_compare`` フックを実装することで独自の詳細説明を追加できます。
-
-.. autofunction:: _pytest.hookspec.pytest_assertrepr_compare
-
-..
-    As an example consider adding the following hook in a conftest.py which
-    provides an alternative explanation for ``Foo`` objects::
-
-例として、conftest.py に次のフックを追加してみます。これは ``Foo`` オブジェクトの別の説明を提供します::
-
-   # conftest.py の内容
-   from test_foocompare import Foo
-   def pytest_assertrepr_compare(op, left, right):
-       if isinstance(left, Foo) and isinstance(right, Foo) and op == "==":
-        return ['Comparing Foo instances:',
-                  '   vals: %s != %s' % (left.val, right.val)]
-
-..
-    now, given this test module::
-
-ここで次のテストモジュールがあります::
-
-   # test_foocompare.py の内容
-   class Foo:
-       def __init__(self, val):
-            self.val = val
-
-   def test_compare():
-       f1 = Foo(1)
-       f2 = Foo(2)
-       assert f1 == f2
-
-..
-    you can run the test module and get the custom output defined in 
-    the conftest file::
-
-このテストモジュールを実行すると、conftest ファイルで定義した独自の出力内容が表示されます::
-
-   $ py.test -q test_foocompare.py
-   collecting ... collected 1 items
-   F
-   ================================= FAILURES =================================
-   _______________________________ test_compare _______________________________
-   
-       def test_compare():
-           f1 = Foo(1)
-           f2 = Foo(2)
-   >       assert f1 == f2
-   E       assert Comparing Foo instances:
-   E            vals: 1 != 2
-   
-   test_foocompare.py:8: AssertionError
-   1 failed in 0.01 seconds
-
-.. _assert-details:
-.. _`assert introspection`:
-
-高度なアサートイントロスペクション
-----------------------------------
-
-..
-    Advanced assertion introspection
-    ----------------------------------
-
-.. versionadded:: 2.1
-
-..
-    Reporting details about a failing assertion is achieved either by rewriting
-    assert statements before they are run or re-evaluating the assert expression and
-    recording the intermediate values. Which technique is used depends on the
-    location of the assert, py.test's configuration, and Python version being used
-    to run py.test.  Note that for assert statements with a manually provided
-    message, i.e. ``assert expr, message``, no assertion introspection takes place
-    and the manually provided message will be rendered in tracebacks.
-
-失敗するアサーションに関する詳細のレポートは、実行前に assert 文を書き換えるか、または assert 式を再評価して中間値を記録するかのどちらかの方法で行われます。どちらの方法を使うかは assert の位置、pytest の設定、pytest を実行するのに使われる Python バージョンに依存します。 ``assert expr, message`` のように直接コード内でメッセージを記述した assert 文は、アサートイントロスペクションが行われず、指定したメッセージがトレースバックに表示されることに注意してください。
-
-..
-    By default, if the Python version is greater than or equal to 2.6, py.test
-    rewrites assert statements in test modules. Rewritten assert statements put
-    introspection information into the assertion failure message. py.test only
-    rewrites test modules directly discovered by its test collection process, so
-    asserts in supporting modules which are not themselves test modules will not be
-    rewritten.
-
-デフォルトでは、Python バージョンが 2.6 以上の場合、py.test はテストモジュールの assert 文を書き換えます。書き換えられた assert 文は、イントロスペクション情報をアサーションの失敗メッセージに追加します。py.test は、テストコレクション処理で検出したテストモジュールのみを直接書き換えます。そのため、テストモジュールではないサポートライブラリの assert 文は書き換えられません。
-
-.. note::
-
-   ..
-       py.test rewrites test modules on import. It does this by using an import hook
-       to write a new pyc files. Most of the time this works transparently. However,
-       if you are messing with import yourself, the import hook may interfere. If
-       this is the case, simply use ``--assert=reinterp`` or
-       ``--assert=plain``. Additionally, rewriting will fail silently if it cannot
-       write new pycs, i.e. in a read-only filesystem or a zipfile.
-
-   py.test は、インポート時にテストモジュールを書き換えます。新たに pyc ファイルを書き込むためにインポートフックを使うことでこの処理を行います。この処理はほとんど透過的に行われます。但し、自分でインポートを行ってごちゃごちゃになっている場合、そのインポートフックがインターフェースになる可能性があります。このようなケースでは、単純に ``--assert=reinterp`` か ``--assert=plain`` を使ってください。さらに、新たに pyc ファイルを書き込めない場合、書き換えはサイレントモードで失敗します。例えば、読み込み専用ファイルシステムや zip ファイルで行うようなときです。
-
-..
-    If an assert statement has not been rewritten or the Python version is less than
-    2.6, py.test falls back on assert reinterpretation. In assert reinterpretation,
-    py.test walks the frame of the function containing the assert statement to
-    discover sub-expression results of the failing assert statement. You can force
-    py.test to always use assertion reinterpretation by passing the
-    ``--assert=reinterp`` option.
-
-assert 文が書き換えられない、または Python バージョン 2.6 よりも小さい場合、py.test はアサーションの再解釈を行います。アサーションの再解釈では、py.test が、assert 文の失敗する部分式を見つけるために assert 文を含む関数のフレームを辿ります。py.test にアサーションの再解釈を行うよう強制するには ``--assert=reinterp`` オプションを指定します。
-
-..
-    Assert reinterpretation has a caveat not present with assert rewriting: If
-    evaluating the assert expression has side effects you may get a warning that the
-    intermediate values could not be determined safely.  A common example of this
-    issue is an assertion which reads from a file::
-
-アサーションの再解釈は、assert 文の書き換えを行わないことの注意が必要です: それは assert 式の評価が副作用をもつ場合、中間値が安全に決定しないという警告を受け取るかもしれません。この問題の一般的な例として、ファイルを読み込むアサーションがあります::
-
-        assert f.read() != '...'
-
-..
-    If this assertion fails then the re-evaluation will probably succeed!
-    This is because ``f.read()`` will return an empty string when it is
-    called the second time during the re-evaluation.  However, it is
-    easy to rewrite the assertion and avoid any trouble::
-
-このアサーションが失敗した場合、その再評価はおそらく成功します!つまり再評価において2回目に呼び出されたときに ``f.read()`` が空の文字列を返すからです。とはいえ、このアサーションを書き換えて、そういったトラブルを避けるのは簡単です::
-
-        content = f.read()
-        assert content != '...'
-
-..
-    All assert introspection can be turned off by passing ``--assert=plain``.
-
-全てのアサートイントロスペクションを無効にするには ``--assert=plain`` を指定します。
-
-..
-    For further information, Benjamin Peterson wrote up `Behind the scenes of py.test's new assertion rewriting <http://pybites.blogspot.com/2011/07/behind-scenes-of-pytests-new-assertion.html>`_.
-
-詳細については、Benjamin Peterson が詳しくまとめた `Behind the scenes of py.test's new assertion rewriting <http://pybites.blogspot.com/2011/07/behind-scenes-of-pytests-new-assertion.html>`_ を参照してください。
-
-..
-    Add assert rewriting as an alternate introspection technique.
-
-.. versionadded:: 2.1
-   代替イントロスペクション手法として assert 書き換え機能を追加
-
-..
-   Introduce the ``--assert`` option. Deprecate ``--no-assert`` and
-   ``--nomagic``.
-
-.. versionchanged:: 2.1
-   ``--assert`` オプションを追加。 ``--no-assert`` と ``--nomagic`` を廃止。

diff -r 54a2dfe63116b5e6e0600d5bd41aba752eaa3ef5 -r 25aa56b376c11b083ccc6d49057b765bc5e4b87a doc/ja/builtin.txt
--- a/doc/ja/builtin.txt
+++ /dev/null
@@ -1,152 +0,0 @@
-
-.. _`pytest helpers`:
-
-Pytest 組み込みヘルパー機能
-===========================
-
-..
-    Pytest builtin helpers
-    ================================================
-
-..
-    builtin pytest.* functions and helping objects
-    -----------------------------------------------------
-
-組み込みの pytest.* 関数とヘルパーオブジェクト
-----------------------------------------------
-
-..
-    You can always use an interactive Python prompt and type::
-
-Python インタープリターの対話モードから次のように入力すると::
-
-    import pytest
-    help(pytest)
-
-..
-    to get an overview on the globally available helpers.
-
-グローバルに利用できるヘルパー機能の概要を把握できます。
-
-.. automodule:: pytest
-    :members:
-
-
-.. _builtinfuncargs:
-
-組み込み関数の引数
-------------------
-
-..
-    Builtin function arguments
-    -----------------------------------------------------
-
-..
-    You can ask for available builtin or project-custom
-    :ref:`function arguments <funcargs>` by typing::
-
-次のように入力して、利用できる組み込みまたはプロジェクトカスタムの :ref:`関数の引数 <funcargs>` を確認できます。
-
-    | $ py.test --fixtures
-    | ====================== test session starts =======================
-    | platform linux2 -- Python 2.7.1 -- pytest-2.2.4
-    | collected 0 items
-    | pytestconfig
-    |     pytest の config オブジェクトとコマンドラインオプションへのアクセス
-    |
-    | capsys
-    |     sys.stdout/sys.stderr への書き込み内容を取得できる
-    |     キャプチャした出力内容は ``(out, err)`` のタプルを返す
-    |     ``capsys.readouterr()`` メソッドで利用できる
-    |
-    | capfd
-    |     ファイルディスクリプタ 1 と 2 へ書き込み内容を取得できる
-    |     キャプチャした出力内容は ``(out, err)`` のタプルを返す
-    |     ``capsys.readouterr()`` メソッドで利用できる
-    |
-    | tmpdir
-    |     基本となる一時ディレクトリ配下にサブディレクトリを作成して、
-    |     テスト関数の実行毎に一意な一時ディレクトリのオブジェクトを返す
-    |     これは py.path.local のパスオブジェクトが返される
-    |
-    | monkeypatch
-    |     オブジェクト、ディクショナリ、os.environ を変更する
-    |     次のヘルパーメソッドを提供する ``monkeypatch`` オブジェクトが返される
-    |     
-    |     monkeypatch.setattr(obj, name, value, raising=True)
-    |     monkeypatch.delattr(obj, name, raising=True)
-    |     monkeypatch.setitem(mapping, name, value)
-    |     monkeypatch.delitem(obj, name, raising=True)
-    |     monkeypatch.setenv(name, value, prepend=False)
-    |     monkeypatch.delenv(name, value, raising=True)
-    |     monkeypatch.syspath_prepend(path)
-    |     monkeypatch.chdir(path)
-    |    
-    |     全ての変更はテスト関数の呼び出しが終わった後で元に戻ります
-    |     ``raising`` パラメーターは、セット/削除の操作対象がないときに
-    |     KeyError や AttributeError を発生させるかどうかを決めます
-    |
-    | recwarn
-    |     次のメソッドを提供する WarningsRecorder インスタンスを返す
-    |     
-    |     * ``pop(category=None)``: category に一致する最後の警告を返す
-    |     * ``clear()``: 警告のリストを削除する
-    |     
-    |     警告については http://docs.python.org/library/warnings.html を
-    |     参照してください
-    |
-    | ========================  in 0.00 seconds ========================
-
-..
-        $ py.test --fixtures
-        =========================== test session starts ============================
-        platform linux2 -- Python 2.7.1 -- pytest-2.2.4
-        collected 0 items
-        pytestconfig
-            the pytest config object with access to command line opts.
-        capsys
-            enables capturing of writes to sys.stdout/sys.stderr and makes
-            captured output available via ``capsys.readouterr()`` method calls
-            which return a ``(out, err)`` tuple.
-            
-        capfd
-            enables capturing of writes to file descriptors 1 and 2 and makes
-            captured output available via ``capsys.readouterr()`` method calls
-            which return a ``(out, err)`` tuple.
-            
-        tmpdir
-            return a temporary directory path object
-            which is unique to each test function invocation,
-            created as a sub directory of the base temporary
-            directory.  The returned object is a `py.path.local`_
-            path object.
-            
-        monkeypatch
-            The returned ``monkeypatch`` funcarg provides these
-            helper methods to modify objects, dictionaries or os.environ::
-            
-            monkeypatch.setattr(obj, name, value, raising=True)
-            monkeypatch.delattr(obj, name, raising=True)
-            monkeypatch.setitem(mapping, name, value)
-            monkeypatch.delitem(obj, name, raising=True)
-            monkeypatch.setenv(name, value, prepend=False)
-            monkeypatch.delenv(name, value, raising=True)
-            monkeypatch.syspath_prepend(path)
-            monkeypatch.chdir(path)
-            
-            All modifications will be undone after the requesting
-            test function has finished. The ``raising``
-            parameter determines if a KeyError or AttributeError
-            will be raised if the set/deletion operation has no target.
-            
-        recwarn
-            Return a WarningsRecorder instance that provides these methods:
-            
-            * ``pop(category=None)``: return last warning matching the category.
-            * ``clear()``: clear list of warnings
-            
-            See http://docs.python.org/library/warnings.html for information
-            on warning categories.
-            
-        
-        =============================  in 0.00 seconds =============================

This diff is so big that we needed to truncate the remainder.

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.


More information about the pytest-commit mailing list