diff --git a/.gitignore b/.gitignore
index 79e1c6765..2b7c267b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ include/
*.pyc
*.pyo
*.swp
-*.html
*.class
*.orig
*~
diff --git a/CHANGELOG b/CHANGELOG
index 7fb5dbbdb..e5df87f8c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,28 +19,28 @@ Unreleased
2.5.0
-----------------------------------
-- dropped python2.5 from automated release testing of pytest itself
- which means it's probably going to break soon (but still works
+- dropped python2.5 from automated release testing of pytest itself
+ which means it's probably going to break soon (but still works
with this release we believe).
- simplified and fixed implementation for calling finalizers when
- parametrized fixtures or function arguments are involved. finalization
+ parametrized fixtures or function arguments are involved. finalization
is now performed lazily at setup time instead of in the "teardown phase".
- While this might sound odd at first, it helps to ensure that we are
+ While this might sound odd at first, it helps to ensure that we are
correctly handling setup/teardown even in complex code. User-level code
should not be affected unless it's implementing the pytest_runtest_teardown
hook and expecting certain fixture instances are torn down within (very
unlikely and would have been unreliable anyway).
-- PR90: add --color=yes|no|auto option to force terminal coloring
+- PR90: add --color=yes|no|auto option to force terminal coloring
mode ("auto" is default). Thanks Marc Abramowitz.
- fix issue319 - correctly show unicode in assertion errors. Many
thanks to Floris Bruynooghe for the complete PR. Also means
we depend on py>=1.4.19 now.
-- fix issue396 - correctly sort and finalize class-scoped parametrized
- tests independently from number of methods on the class.
+- fix issue396 - correctly sort and finalize class-scoped parametrized
+ tests independently from number of methods on the class.
- refix issue323 in a better way -- parametrization should now never
cause Runtime Recursion errors because the underlying algorithm
@@ -49,18 +49,18 @@ Unreleased
to problems for more than >966 non-function scoped parameters).
- fix issue290 - there is preliminary support now for parametrizing
- with repeated same values (sometimes useful to to test if calling
+ with repeated same values (sometimes useful to to test if calling
a second time works as with the first time).
- close issue240 - document precisely how pytest module importing
- works, discuss the two common test directory layouts, and how it
+ works, discuss the two common test directory layouts, and how it
interacts with PEP420-namespace packages.
- fix issue246 fix finalizer order to be LIFO on independent fixtures
- depending on a parametrized higher-than-function scoped fixture.
+ depending on a parametrized higher-than-function scoped fixture.
(was quite some effort so please bear with the complexity of this sentence :)
Thanks Ralph Schmitt for the precise failure example.
-
+
- fix issue244 by implementing special index for parameters to only use
indices for paramentrized test ids
@@ -78,9 +78,9 @@ Unreleased
filtering with simple strings that are not valid python expressions.
Examples: "-k 1.3" matches all tests parametrized with 1.3.
"-k None" filters all tests that have "None" in their name
- and conversely "-k 'not None'".
+ and conversely "-k 'not None'".
Previously these examples would raise syntax errors.
-
+
- fix issue384 by removing the trial support code
since the unittest compat enhancements allow
trial to handle it on its own
@@ -88,7 +88,7 @@ Unreleased
- don't hide an ImportError when importing a plugin produces one.
fixes issue375.
-- fix issue275 - allow usefixtures and autouse fixtures
+- fix issue275 - allow usefixtures and autouse fixtures
for running doctest text files.
- fix issue380 by making --resultlog only rely on longrepr instead
@@ -114,20 +114,20 @@ Unreleased
(it already did neutralize pytest.mark.xfail markers)
- refine pytest / pkg_resources interactions: The AssertionRewritingHook
- PEP302 compliant loader now registers itself with setuptools/pkg_resources
+ PEP302 compliant loader now registers itself with setuptools/pkg_resources
properly so that the pkg_resources.resource_stream method works properly.
Fixes issue366. Thanks for the investigations and full PR to Jason R. Coombs.
- pytestconfig fixture is now session-scoped as it is the same object during the
- whole test run. Fixes issue370.
+ whole test run. Fixes issue370.
- avoid one surprising case of marker malfunction/confusion::
-
+
@pytest.mark.some(lambda arg: ...)
def test_function():
- would not work correctly because pytest assumes @pytest.mark.some
- gets a function to be decorated already. We now at least detect if this
+ would not work correctly because pytest assumes @pytest.mark.some
+ gets a function to be decorated already. We now at least detect if this
arg is an lambda and thus the example will work. Thanks Alex Gaynor
for bringing it up.
@@ -138,11 +138,11 @@ Unreleased
although it's not needed by pytest itself atm. Also
fix caching. Fixes issue376.
-- fix issue221 - handle importing of namespace-package with no
+- fix issue221 - handle importing of namespace-package with no
__init__.py properly.
- refactor internal FixtureRequest handling to avoid monkeypatching.
- One of the positive user-facing effects is that the "request" object
+ One of the positive user-facing effects is that the "request" object
can now be used in closures.
- fixed version comparison in pytest.importskip(modname, minverstring)
@@ -152,7 +152,7 @@ Unreleased
- fix verbose reporting for @mock'd test functions
-Changes between 2.4.1 and 2.4.2
+v2.4.2
-----------------------------------
- on Windows require colorama and a newer py lib so that py.io.TerminalWriter()
@@ -178,19 +178,19 @@ Changes between 2.4.1 and 2.4.2
- remove attempt to "dup" stdout at startup as it's icky.
the normal capturing should catch enough possibilities
- of tests messing up standard FDs.
+ of tests messing up standard FDs.
-- add pluginmanager.do_configure(config) as a link to
+- add pluginmanager.do_configure(config) as a link to
config.do_configure() for plugin-compatibility
-Changes between 2.4.0 and 2.4.1
+v2.4.1
-----------------------------------
- When using parser.addoption() unicode arguments to the
"type" keyword should also be converted to the respective types.
thanks Floris Bruynooghe, @dnozay. (fixes issue360 and issue362)
-- fix dotted filename completion when using argcomplete
+- fix dotted filename completion when using argcomplete
thanks Anthon van der Neuth. (fixes issue361)
- fix regression when a 1-tuple ("arg",) is used for specifying
@@ -199,7 +199,7 @@ Changes between 2.4.0 and 2.4.1
- merge doc typo fixes, thanks Andy Dirnberger
-Changes between 2.3.5 and 2.4
+v2.4
-----------------------------------
known incompatibilities:
@@ -246,12 +246,12 @@ new features:
- make "import pdb ; pdb.set_trace()" work natively wrt capturing (no
"-s" needed anymore), making ``pytest.set_trace()`` a mere shortcut.
-- fix issue181: --pdb now also works on collect errors (and
- on internal errors) . This was implemented by a slight internal
- refactoring and the introduction of a new hook
+- fix issue181: --pdb now also works on collect errors (and
+ on internal errors) . This was implemented by a slight internal
+ refactoring and the introduction of a new hook
``pytest_exception_interact`` hook (see next item).
-- fix issue341: introduce new experimental hook for IDEs/terminals to
+- fix issue341: introduce new experimental hook for IDEs/terminals to
intercept debugging: ``pytest_exception_interact(node, call, report)``.
- new monkeypatch.setattr() variant to provide a shorter
@@ -269,7 +269,7 @@ new features:
phase of a node.
- simplify pytest.mark.parametrize() signature: allow to pass a
- CSV-separated string to specify argnames. For example:
+ CSV-separated string to specify argnames. For example:
``pytest.mark.parametrize("input,expected", [(1,2), (2,3)])``
works as well as the previous:
``pytest.mark.parametrize(("input", "expected"), ...)``.
@@ -294,10 +294,10 @@ new features:
Bug fixes:
-- fix issue358 - capturing options are now parsed more properly
+- fix issue358 - capturing options are now parsed more properly
by using a new parser.parse_known_args method.
-- pytest now uses argparse instead of optparse (thanks Anthon) which
+- pytest now uses argparse instead of optparse (thanks Anthon) which
means that "argparse" is added as a dependency if installing into python2.6
environments or below.
@@ -338,7 +338,7 @@ Bug fixes:
- fix issue323 - sorting of many module-scoped arg parametrizations
- make sessionfinish hooks execute with the same cwd-context as at
- session start (helps fix plugin behaviour which write output files
+ session start (helps fix plugin behaviour which write output files
with relative path such as pytest-cov)
- fix issue316 - properly reference collection hooks in docs
@@ -346,7 +346,7 @@ Bug fixes:
- fix issue 306 - cleanup of -k/-m options to only match markers/test
names/keywords respectively. Thanks Wouter van Ackooy.
-- improved doctest counting for doctests in python modules --
+- improved doctest counting for doctests in python modules --
files without any doctest items will not show up anymore
and doctest examples are counted as separate test items.
thanks Danilo Bellini.
@@ -356,7 +356,7 @@ Bug fixes:
mode. Thanks Jason R. Coombs.
- fix junitxml generation when test output contains control characters,
- addressing issue267, thanks Jaap Broekhuizen
+ addressing issue267, thanks Jaap Broekhuizen
- fix issue338: honor --tb style for setup/teardown errors as well. Thanks Maho.
@@ -365,10 +365,10 @@ Bug fixes:
- better parametrize error messages, thanks Brianna Laugher
- pytest_terminal_summary(terminalreporter) hooks can now use
- ".section(title)" and ".line(msg)" methods to print extra
+ ".section(title)" and ".line(msg)" methods to print extra
information at the end of a test run.
-Changes between 2.3.4 and 2.3.5
+v2.3.5
-----------------------------------
- fix issue169: respect --tb=style with setup/teardown errors as well.
@@ -419,7 +419,7 @@ Changes between 2.3.4 and 2.3.5
- fix bug where using capsys with pytest.set_trace() in a test
function would break when looking at capsys.readouterr()
-- allow to specify prefixes starting with "_" when
+- allow to specify prefixes starting with "_" when
customizing python_functions test discovery. (thanks Graham Horler)
- improve PYTEST_DEBUG tracing output by puting
@@ -433,10 +433,10 @@ Changes between 2.3.4 and 2.3.5
- fix issue266 - accept unicode in MarkEvaluator expressions
-Changes between 2.3.3 and 2.3.4
+v2.3.4
-----------------------------------
-- yielded test functions will now have autouse-fixtures active but
+- yielded test functions will now have autouse-fixtures active but
cannot accept fixtures as funcargs - it's anyway recommended to
rather use the post-2.0 parametrize features instead of yield, see:
http://pytest.org/latest/example/parametrize.html
@@ -451,9 +451,9 @@ Changes between 2.3.3 and 2.3.4
can write: -k "name1 or name2" etc. This is a slight incompatibility
if you used special syntax like "TestClass.test_method" which you now
need to write as -k "TestClass and test_method" to match a certain
- method in a certain test class.
+ method in a certain test class.
-Changes between 2.3.2 and 2.3.3
+v2.3.3
-----------------------------------
- fix issue214 - parse modules that contain special objects like e. g.
@@ -485,10 +485,10 @@ Changes between 2.3.2 and 2.3.3
- fix issue127 - improve documentation for pytest_addoption() and
add a ``config.getoption(name)`` helper function for consistency.
-Changes between 2.3.1 and 2.3.2
+v2.3.2
-----------------------------------
-- fix issue208 and fix issue29 use new py version to avoid long pauses
+- fix issue208 and fix issue29 use new py version to avoid long pauses
when printing tracebacks in long modules
- fix issue205 - conftests in subdirs customizing
@@ -518,7 +518,7 @@ Changes between 2.3.1 and 2.3.2
- add tox.ini to pytest distribution so that ignore-dirs and others config
bits are properly distributed for maintainers who run pytest-own tests
-Changes between 2.3.0 and 2.3.1
+v2.3.1
-----------------------------------
- fix issue202 - fix regression: using "self" from fixture functions now
@@ -531,7 +531,7 @@ Changes between 2.3.0 and 2.3.1
- link to web pages from --markers output which provides help for
pytest.mark.* usage.
-Changes between 2.2.4 and 2.3.0
+v2.3.0
-----------------------------------
- fix issue202 - better automatic names for parametrized test functions
@@ -572,7 +572,7 @@ Changes between 2.2.4 and 2.3.0
- pluginmanager.register(...) now raises ValueError if the
plugin has been already registered or the name is taken
-- fix issue159: improve http://pytest.org/latest/faq.html
+- fix issue159: improve http://pytest.org/latest/faq.html
especially with respect to the "magic" history, also mention
pytest-django, trial and unittest integration.
@@ -603,14 +603,14 @@ Changes between 2.2.4 and 2.3.0
you can use startdir.bestrelpath(yourpath) to show
nice relative path
- - allow plugins to implement both pytest_report_header and
+ - allow plugins to implement both pytest_report_header and
pytest_sessionstart (sessionstart is invoked first).
- don't show deselected reason line if there is none
- py.test -vv will show all of assert comparisations instead of truncating
-Changes between 2.2.3 and 2.2.4
+v2.2.4
-----------------------------------
- fix error message for rewritten assertions involving the % operator
@@ -627,17 +627,17 @@ Changes between 2.2.3 and 2.2.4
- fix issue #144: better mangle test ids to junitxml classnames
- upgrade distribute_setup.py to 0.6.27
-Changes between 2.2.2 and 2.2.3
+v2.2.3
----------------------------------------
- fix uploaded package to only include neccesary files
-Changes between 2.2.1 and 2.2.2
+v2.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
+- 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.
@@ -652,11 +652,11 @@ Changes between 2.2.1 and 2.2.2
- allow adding of attributes to test reports such that it also works
with distributed testing (no upgrade of pytest-xdist needed)
-Changes between 2.2.0 and 2.2.1
+v2.2.1
----------------------------------------
- fix issue99 (in pytest and py) internallerrors with resultlog now
- produce better output - fixed by normalizing pytest_internalerror
+ 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
@@ -664,25 +664,25 @@ Changes between 2.2.0 and 2.2.1
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
+ 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)
-Changes between 2.1.3 and 2.2.0
+v2.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
+- add an all-powerful metafunc.parametrize function which allows to
parametrize test function arguments in multiple steps and therefore
- from indepdenent plugins and palces.
+ from indepdenent plugins and palces.
- 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
+- 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
+ 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 exaples at http://pytest.org/latest/mark.html
@@ -691,12 +691,12 @@ Changes between 2.1.3 and 2.2.0
(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
+- 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 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
@@ -704,7 +704,7 @@ Changes between 2.1.3 and 2.2.0
- simplify junitxml output code by relying on py.xml
- add support for skip properties on unittest classes and functions
-Changes between 2.1.2 and 2.1.3
+v2.1.3
----------------------------------------
- fix issue79: assertion rewriting failed on some comparisons in boolops
@@ -713,7 +713,7 @@ Changes between 2.1.2 and 2.1.3
- fix issue75 / skipping test failure on jython
- fix issue77 / Allow assertrepr_compare hook to apply to a subset of tests
-Changes between 2.1.1 and 2.1.2
+v2.1.2
----------------------------------------
- fix assertion rewriting on files with windows newlines on some Python versions
@@ -723,7 +723,7 @@ Changes between 2.1.1 and 2.1.2
- fix issue66: use different assertion rewriting caches when the -O option is passed
- don't try assertion rewriting on Jython, use reinterp
-Changes between 2.1.0 and 2.1.1
+v2.1.1
----------------------------------------------
- fix issue64 / pytest.set_trace now works within pytest_generate_tests hooks
@@ -736,7 +736,7 @@ Changes between 2.1.0 and 2.1.1
- fix issue61: assertion rewriting on boolean operations with 3 or more operands
- you can now build a man page with "cd doc ; make man"
-Changes between 2.0.3 and 2.1.0.DEV
+v2.1.0
----------------------------------------------
- fix issue53 call nosestyle setup functions with correct ordering
@@ -756,7 +756,7 @@ Changes between 2.0.3 and 2.1.0.DEV
- report KeyboardInterrupt even if interrupted during session startup
- fix issue 35 - provide PDF doc version and download link from index page
-Changes between 2.0.2 and 2.0.3
+v2.0.3
----------------------------------------------
- fix issue38: nicer tracebacks on calls to hooks, particularly early
@@ -776,7 +776,7 @@ Changes between 2.0.2 and 2.0.3
- fix issue37: avoid invalid characters in junitxml's output
-Changes between 2.0.1 and 2.0.2
+v2.0.2
----------------------------------------------
- tackle issue32 - speed up test runs of very quick test functions
@@ -788,17 +788,17 @@ Changes between 2.0.1 and 2.0.2
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
+ 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
+ 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
@@ -821,14 +821,14 @@ Changes between 2.0.1 and 2.0.2
- 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
+- 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)
-Changes between 2.0.0 and 2.0.1
+v2.0.1
----------------------------------------------
- refine and unify initial capturing so that it works nicely
@@ -837,7 +837,7 @@ Changes between 2.0.0 and 2.0.1
- allow to omit "()" in test ids to allow for uniform test ids
as produced by Alfredo's nice pytest.vim plugin.
- fix issue12 - show plugin versions with "--version" and
- "--traceconfig" and also document how to add extra information
+ "--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)
@@ -867,17 +867,17 @@ Changes between 2.0.0 and 2.0.1
- 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
+- 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
+ 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
+ the recommended and much cleaner way to do test
parametraization remains the "pytest_generate_tests"
mechanism, see the docs.
-Changes between 1.3.4 and 2.0.0
+v2.0.0
----------------------------------------------
- pytest-2.0 is now its own package and depends on pylib-2.0
@@ -922,7 +922,7 @@ Changes between 1.3.4 and 2.0.0
- add ability to use "class" level for cached_setup helper
- fix strangeness: mark.* objects are now immutable, create new instances
-Changes between 1.3.3 and 1.3.4
+v1.3.4
----------------------------------------------
- fix issue111: improve install documentation for windows
@@ -931,7 +931,7 @@ Changes between 1.3.3 and 1.3.4
- fix issue115: unify internal exception passthrough/catching/GeneratorExit
- fix issue118: new --tb=native for presenting cpython-standard exceptions
-Changes between 1.3.2 and 1.3.3
+v1.3.3
----------------------------------------------
- fix issue113: assertion representation problem with triple-quoted strings
@@ -946,7 +946,7 @@ Changes between 1.3.2 and 1.3.3
(thanks Armin Ronacher for reporting)
- remove trailing whitespace in all py/text distribution files
-Changes between 1.3.1 and 1.3.2
+v1.3.2
----------------------------------------------
New features
@@ -1021,7 +1021,7 @@ Bug fixes / Maintenance
- fix homedir detection on Windows
- ship distribute_setup.py version 0.6.13
-Changes between 1.3.0 and 1.3.1
+v1.3.1
---------------------------------------------
New features
@@ -1093,7 +1093,7 @@ Fixes / Maintenance
(and internally be more careful when presenting unexpected byte sequences)
-Changes between 1.2.1 and 1.3.0
+v1.3.0
---------------------------------------------
- deprecate --report option in favour of a new shorter and easier to
@@ -1158,7 +1158,7 @@ Changes between 1.2.1 and 1.3.0
- added links to the new capturelog and coverage plugins
-Changes between 1.2.1 and 1.2.0
+v1.2.0
---------------------------------------------
- refined usage and options for "py.cleanup"::
@@ -1197,7 +1197,7 @@ Changes between 1.2.1 and 1.2.0
- fix plugin links
-Changes between 1.2 and 1.1.1
+v1.1.1
---------------------------------------------
- moved dist/looponfailing from py.test core into a new
@@ -1281,7 +1281,7 @@ Changes between 1.2 and 1.1.1
- fix docs, fix internal bin/ script generation
-Changes between 1.1.1 and 1.1.0
+v1.1.0
---------------------------------------------
- introduce automatic plugin registration via 'pytest11'
@@ -1300,7 +1300,7 @@ Changes between 1.1.1 and 1.1.0
- try harder to have deprecation warnings for py.compat.* accesses
report a correct location
-Changes between 1.1.0 and 1.0.2
+v1.0.2
---------------------------------------------
* adjust and improve docs
@@ -1385,7 +1385,7 @@ Changes between 1.1.0 and 1.0.2
* simplified internal localpath implementation
-Changes between 1.0.1 and 1.0.2
+v1.0.2
-------------------------------------------
* fixing packaging issues, triggered by fedora redhat packaging,
@@ -1393,7 +1393,7 @@ Changes between 1.0.1 and 1.0.2
* added a documentation link to the new django plugin.
-Changes between 1.0.0 and 1.0.1
+v1.0.1
-------------------------------------------
* added a 'pytest_nose' plugin which handles nose.SkipTest,
@@ -1427,13 +1427,13 @@ Changes between 1.0.0 and 1.0.1
* simplified multicall mechanism and plugin architecture,
renamed some internal methods and argnames
-Changes between 1.0.0b9 and 1.0.0
+v1.0.0
-------------------------------------------
* more terse reporting try to show filesystem path relatively to current dir
* improve xfail output a bit
-Changes between 1.0.0b8 and 1.0.0b9
+v1.0.0b9
-------------------------------------------
* cleanly handle and report final teardown of test setup
@@ -1467,7 +1467,7 @@ Changes between 1.0.0b8 and 1.0.0b9
* item.repr_failure(excinfo) instead of item.repr_failure(excinfo, outerr)
-Changes between 1.0.0b7 and 1.0.0b8
+v1.0.0b8
-------------------------------------------
* pytest_unittest-plugin is now enabled by default
@@ -1496,7 +1496,7 @@ Changes between 1.0.0b7 and 1.0.0b8
* tweaked doctest output for docstrings in py modules,
thanks Radomir.
-Changes between 1.0.0b3 and 1.0.0b7
+v1.0.0b7
-------------------------------------------
* renamed py.test.xfail back to py.test.mark.xfail to avoid
@@ -1521,7 +1521,7 @@ Changes between 1.0.0b3 and 1.0.0b7
* make __name__ == "__channelexec__" for remote_exec code
-Changes between 1.0.0b1 and 1.0.0b3
+v1.0.0b3
-------------------------------------------
* plugin classes are removed: one now defines
@@ -1538,7 +1538,7 @@ Changes between 1.0.0b1 and 1.0.0b3
well with function arguments.
-Changes between 0.9.2 and 1.0.0b1
+v1.0.0b1
-------------------------------------------
* introduced new "funcarg" setup method,
@@ -1562,7 +1562,7 @@ Changes between 0.9.2 and 1.0.0b1
XXX lots of things missing here XXX
-Changes between 0.9.1 and 0.9.2
+v0.9.2
-------------------------------------------
* refined installation and metadata, created new setup.py,
@@ -1595,10 +1595,10 @@ Changes between 0.9.1 and 0.9.2
* there now is a py.__version__ attribute
-Changes between 0.9.0 and 0.9.1
+v0.9.1
-------------------------------------------
-This is a fairly complete list of changes between 0.9 and 0.9.1, which can
+This is a fairly complete list of v0.9.1, which can
serve as a reference for developers.
* allowing + signs in py.path.svn urls [39106]
diff --git a/doc/en/_static/sphinxdoc.css b/doc/en/_static/sphinxdoc.css
deleted file mode 100644
index ab8ab5dce..000000000
--- a/doc/en/_static/sphinxdoc.css
+++ /dev/null
@@ -1,339 +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.
- *
- */
-
-@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 240px 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: 210px;
- 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.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 --git a/doc/en/_templates/globaltoc.html b/doc/en/_templates/globaltoc.html
new file mode 100644
index 000000000..f764729fd
--- /dev/null
+++ b/doc/en/_templates/globaltoc.html
@@ -0,0 +1,17 @@
+
+ pytest is a mature full-featured Python testing tool that helps
+ you write better programs.
+
diff --git a/doc/en/_themes/.gitignore b/doc/en/_themes/.gitignore
new file mode 100644
index 000000000..66b6e4c2f
--- /dev/null
+++ b/doc/en/_themes/.gitignore
@@ -0,0 +1,3 @@
+*.pyc
+*.pyo
+.DS_Store
diff --git a/doc/en/_themes/LICENSE b/doc/en/_themes/LICENSE
new file mode 100644
index 000000000..8daab7ee6
--- /dev/null
+++ b/doc/en/_themes/LICENSE
@@ -0,0 +1,37 @@
+Copyright (c) 2010 by Armin Ronacher.
+
+Some rights reserved.
+
+Redistribution and use in source and binary forms of the theme, with or
+without modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+* The names of the contributors may not be used to endorse or
+ promote products derived from this software without specific
+ prior written permission.
+
+We kindly ask you to only use these themes in an unmodified manner just
+for Flask and Flask-related products, not for unrelated projects. If you
+like the visual style and want to use it for your own projects, please
+consider making some larger changes to the themes (such as changing
+font faces, sizes, colors or margins).
+
+THIS THEME IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS THEME, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/doc/en/_themes/README b/doc/en/_themes/README
new file mode 100644
index 000000000..b3292bdff
--- /dev/null
+++ b/doc/en/_themes/README
@@ -0,0 +1,31 @@
+Flask Sphinx Styles
+===================
+
+This repository contains sphinx styles for Flask and Flask related
+projects. To use this style in your Sphinx documentation, follow
+this guide:
+
+1. put this folder as _themes into your docs folder. Alternatively
+ you can also use git submodules to check out the contents there.
+2. add this to your conf.py:
+
+ sys.path.append(os.path.abspath('_themes'))
+ html_theme_path = ['_themes']
+ html_theme = 'flask'
+
+The following themes exist:
+
+- 'flask' - the standard flask documentation theme for large
+ projects
+- 'flask_small' - small one-page theme. Intended to be used by
+ very small addon libraries for flask.
+
+The following options exist for the flask_small theme:
+
+ [options]
+ index_logo = '' filename of a picture in _static
+ to be used as replacement for the
+ h1 in the index.rst file.
+ index_logo_height = 120px height of the index logo
+ github_fork = '' repository name on github for the
+ "fork me" badge
diff --git a/doc/en/_themes/flask/layout.html b/doc/en/_themes/flask/layout.html
new file mode 100644
index 000000000..a46d8b87e
--- /dev/null
+++ b/doc/en/_themes/flask/layout.html
@@ -0,0 +1,25 @@
+{%- extends "basic/layout.html" %}
+{%- block extrahead %}
+ {{ super() }}
+ {% if theme_touch_icon %}
+
+ {% endif %}
+
+
+{% endblock %}
+{%- block relbar2 %}{% endblock %}
+{% block header %}
+ {{ super() }}
+ {% if pagename == 'index' %}
+