369c711f14 Merge pull request #2971 from blueyed/fix-ZeroDivisionError
a9dd37f429 Merge pull request #2980 from nicoddemus/immutable-fix-parameters
4de433e280 Merge pull request #2983 from nicoddemus/improve-assert-2979
70f1e3b4b0 Improve getscopeitem assertion message
fdfc1946da Add CHANGELOG entry about pytest.fixture "params" being now immutable
88ed1ab648 Merge pull request #2964 from rpuntaie/master
191e8c6d9b Merge pull request #2969 from nicoddemus/null-bytes-2957
6bbd741039 Add test for #2971
0f5fb7ed05 Fix ZeroDivisionError with 0 collected tests
5f1a7330b2 Small fixes in changelog items
2a75ae46c3 Improve test that blocks setuptools plugins from being loaded
89cf943e04 Always escape null bytes when setting PYTEST_CURRENT_TEST
833f33fa0c removed comments
3dbac17d75 Merge branch 'master' of https://github.com/rpuntaie/pytest
6843d45c51 added test for #2920 fix
4a840a7c09 Fix formatting in CHANGELOG
9b7e4ab0c6 prepare pull request for #2920 fix
4ea7bbc197 fix issue #2920
4d2f05e4b9 Merge pull request #2962 from pytest-dev/fix-nbsp-in-changelog
454b60b6c5 Merge pull request #2963 from redtoad/patch-1
f6be23b68b Add changelog entry.
644fdc5237 Fix broken link to project
4b5f0d5ffa replace non-breaking space with space
9f7ba00611 Merge pull request #2958 from nicoddemus/issue-2956
796db80ca4 Only escape str-like arguments passed to warnings
d95c8a2204 Fix link to #2636 in CHANGELOG
4678cbeb91 Merge remote-tracking branch 'upstream/features'
67ad0fa364 Merge pull request #2945 from nicoddemus/release-3.3.0
6cdd851227 CHANGELOG and docs changes requested during review
c58715371c Merge pull request #2954 from blueyed/rewritten
d5f038e29a Fix spelling: s/re-writ/rewrit/g
6eeacaba3e Fix typos in CHANGELOG
6b90ad4d4b Merge pull request #2949 from eprikazc/master
e273f5399d Update github "bugs" link
0de1a65644 Update pluggy pin to pluggy>=0.5,<0.7 after pluggy-0.6 release
95de11a44e Block pytest-catchlog and issue a warning
05cfdcc8cb Revert making TerminalWriter public in TerminalReporter plugin
0ddd3e2839 Fix linting in CHANGELOG
aa9a02ec44 Preparing release version 3.3.0
e97c774f8e Remove vendoring import from tasks/__init__
f50ace7c0a Merge remote-tracking branch 'upstream/master' into release-3.3.0
49c0c599b0 Merge pull request #2944 from nicoddemus/regendoc-norm
e0d236c031 Remove gendoc normalization for '=' and '_' headers
b533c2600a Merge pull request #2858 from nicoddemus/console-progress-2657
dc574c60ef Use regex match-count syntax to improve test readability
1d26f3730f Fix docstrings in pytester
27935ebec9 Merge pull request #2943 from Perlence/fix-marks-without-description
378eb5d67b Minor formatting change in CHANGELOG
5e71ffab87 Handle marks without description
8df7ed12c1 Merge pull request #2940 from nicoddemus/rewrite-bug-2939
f05333ab75 Fix rewrite to not write past the edge of the screen
c8d52b633b Fix assertion rewrite to match module names correctly
2455f8670e Add changelog
3a5dbabf60 Add tests for progress output and docs for ``console_output_style``
3441084bd2 Add progress output for verbose mode with xdist
8b92527d7d Add re_match_lines and re_match_lines_random to pytester fixture
dab889304e Implement progress percentage reporting while running tests
7a7cb8c8c5 Require py>=1.5.0
77bd0aa02f Merge pull request #2931 from nicoddemus/deprecation-roadmap-docs
b0f558da44 Add Future/Past Releases section
ca1f4bc537 Merge pull request #2935 from asottile/capsysbinary
219b758949 Add capsysbinary fixture
6161bcff6e Merge pull request #2925 from asottile/capfdbinary
99a4a93dbc Merge pull request #2932 from nicoddemus/deprecate-add-call
99ba3c9700 Add CHANGELOG entry for #2876
c19708b193 Merge pull request #2930 from nicoddemus/pin-pluggy-0.5
1f08d990d5 Deprecate metafunc.addcall
e2c59d3282 Change pluggy._CallOutcome to pluggy._Result after update to pluggy-0.5
f9029f11af Add Deprecation Roadmap to backward compatibility document
c7be83ac47 Update pluggy pin to 0.5.*
74aaf91653 Merge pull request #2927 from nicoddemus/release-3.2.5
1aeb58b531 Merge pull request #2928 from nicoddemus/python-requires
7b3febd314 Merge pull request #2924 from nicoddemus/merge-master-into-features
e87ff07370 Prevent pip from installing pytest in unsupported Python versions
a220a40350 Preparing release version 3.2.5
dd6c534468 Remove py<1.5 restriction
4a0aea2deb Add missing entry to CHANGELOG for 3.2.4
8f90812481 Add capfdbinary fixture
3b3bf9f53d Merge remote-tracking branch 'upstream/master' into merge-master-into-features
54cea3d178 Small formatting changes in CHANGELOG
9628c71210 Merge pull request #2921 from nicoddemus/release-3.2.4
a0ad9e31da Preparing release version 3.2.4
22cff038f8 Merge pull request #2916 from nicoddemus/bin-py-1.5
685387a43e Merge pull request #2127 from malinoff/fix-2124
d26c1e3ad9 Pin py<1.5 as 1.5 drops py26 and py33 support
a6f2d2d2c9 Rename FixtureDef.finalizer to FixtureDef.finalizers
6d3fe0b826 Explicitly clear finalizers list in finalize to ensure cleanup
bdad345f99 Fix passing request to finish() in FixtureDef
063335a715 Add changelog entries for #2124
f074fd9ac6 Merge remote-tracking branch 'upstream/features' into malinoff/fix-2124
6550b9911b pytest_fixture_post_finalizer now receives a request argument
258031afe5 Merge remote-tracking branch 'upstream/master' into malinoff/fix-2124
259b86b6ab Merge pull request #2776 from cryporchild/fix-missing-nodeid-with-pyargs
f0f2d2b861 Merge branch 'master' into fix-missing-nodeid-with-pyargs
d1af369800 Merge pull request #2913 from nicoddemus/merge-master-into-features
b671c5a8bf Merge pull request #2914 from nicoddemus/addfinalizer-refactor
f320686fe0 Make SubRequest.addfinalizer an explicit method
742f9cb825 Merge pull request #2911 from RonnyPfannschmidt/remove-nodeinfo
99496d9e5b Merge pull request #2910 from RonnyPfannschmidt/scopenode-sanitize-specials
983a09a2d4 Merge remote-tracking branch 'upstream/master' into merge-master-into-features
66fbebfc26 Merge pull request #2894 from nicoddemus/fix-linting-errors
0108f262b1 Fix typo in CHANGELOG
76f3be452a remove unused _pytest.runner.NodeInfo class
c47dcaa713 switch a special case in scope node lookup to a general one
b2b1eb262f Merge pull request #2906 from nicoddemus/larger-parametrize-section
9fce430c89 Merge pull request #2907 from nicoddemus/lazy-fixture
e114feb458 Mention pytest-lazy-fixture plugin in the proposal for parametrize_with_fixtures
c09f69df2a Make the "examples" section more prominent in the docs
3900879a5c Mark test_py2_unicode as xfail in PyPy2 on Windows
7b1cc55add Merge pull request #2903 from pagles/docs-3.6
d904981bf3 Rename 2903.trivial to 2903.doc
f13333afce Create changelog entry
fad1fbe381 List python 3.6 in the documented supported versions
c33074c8b9 Merge pull request #2641 from RonnyPfannschmidt/introduce-attrs
b11640c1eb Fix linting E722: do not use bare except
03829fde8a Fix linting E741: ambiguous variable name
e351976ef4 Merge remote-tracking branch 'upstream/features' into RonnyPfannschmidt/introduce-attrs
b18a9deb4c Merge pull request #2892 from nicoddemus/merge-master-into-features
2e2f72156a Merge pull request #2893 from fmichea/patch-1
22e9b006da Add fragment per PR's guidelines.
802585cb66 Clarify language of proposal for parametrized fixtures
d7e8eeef56 Merge pull request #2878 from RonnyPfannschmidt/collector-makeitem-deprecate
e58e8faf47 Add CHANGELOG entry for attrs module dependency
7d43225c36 Merge pull request #2877 from RonnyPfannschmidt/extract-extract-parameterset
460cae02b0 Small formatting fix in CHANGELOG
f3a119c06a Merge upstream/master into features
d1aa553f73 add mocked integrationtest for the deprecationwarning of makeitem
cd747c48a4 Merge pull request #2874 from nicoddemus/fix-py27-xdist-envs-2843
07b2b18a01 introduce attrs as dependency and use it
766de67392 Fix linting error in deprecated.py
821f9a94d8 deprecate the public internal PyCollector.makeitem method
26019b33f8 Merge pull request #2882 from thisch/doctest_lineno
cb30848e5a Merge pull request #2880 from samueldg/capture-result-namedtuple
d00e2da6e9 Merge pull request #2881 from dawran6/2658
2f993af54a Fix context output handling for doctests
af5e9238c8 Document pytest.param
8e178e9f9b Add myself to AUTHORS list
8e28815d44 Add changelog entry for issue #2879
b27dde24d6 Use a nametuple for `readouterr()` results
4a436f2255 move responsibility for parameterset extraction into parameterset class
27cea340f3 Remove trailing whitespace
c3ba9225ef Change directory for py27 xdist-related envs
111d640bdb Merge pull request #2873 from stephenfin/doc/skipping-entire-files
734c435d00 Merge pull request #2870 from Perlence/rewrite-python-37-docstring
27bb2eceb4 Add comment about why we remove docstrings on test_assertrewrite
383239cafc doc: Include collector config in the skip doc
fd7bfa30d0 Put imports on the last line unless there are other exprs
3427d27d5a Try to get docstring from module node
def471b975 Merge pull request #2869 from nicoddemus/merge-master-into-features
f743e95cfc Merge pull request #2791 from OfirOshir/features
4e581b637f Use zip and map from six
6b86b0dbfe Fix additional linting issues
0b540f98b1 Merge pull request #2864 from bilderbuchi/fix-1505
bdab29fa3d Merge pull request #2867 from Perlence/ini-markers-whitespace
6821d36ca5 Merge remote-tracking branch 'upstream/master' into merge-master-into-features
5631a86296 Merge pull request #2862 from tom-dalton-fanduel/issue-2836-fixture-collection-bug
52aadcd7c1 Strip whitespace from markers in INI config
f5e72d2f5f Unused import / lint
a5ac19cc5e Merge branch 'issue-2836-fixture-collection-bug' of github.com:tom-dalton-fanduel/pytest into issue-2836-fixture-collection-bug
14e3a5fcb9 Move the generic separator to a constant
7b608f976d Merge pull request #2865 from nicoddemus/contributing-docs
fe560b7192 Make CONTRIBUTING and PR template more consistent regarding doc contributions
b61cbc4fba Merge pull request #2859 from OwenTuz/issue-2692-document-setup-teardown-mismatch-in-unittest-integration
a3ec3df0c8 Add E722 and E741 flake errors to the ignore list
e23af009f9 Introduce a dedicated section about conftest.py
531e0dcaa3 Merge pull request #2863 from lancelote/patch-1
dc5f33ba5c Remove typo @ in assignment
655ab0bf8b Address more review comments, fix massive bug I reintroduced in the node-splitting code :-/
a7199fa8ab Docstring typo
d714c196a5 Shorter code, longer docstring
ee7e1c94d2 Remove redundant if, tidy if-body
de9d116a49 Added Tom Dalton to AUTHORS
f003914d4b Add changelog entry for #2836
1e6dc6f8e5 Working (I think) fix for #2836
c03612f729 Test now looks for real expected output
29fa9d5bff Add failing test
3cdbb1854f #2692: Document setup/teardown behaviour when using unittest-based suites
083084fcbc Merge pull request #2842 from ceridwen/features
f7387e45ea Fix linting
3da28067f3 Replace introspection in compat.getfuncargnames() with inspect/funcsigs.signature
5c71151967 Add more text to the 2.6 and 3.3 announcement
3f9f4be070 Merge pull request #2845 from jespino/fix/2832
4cb60dac3d Merge pull request #2850 from bilderbuchi/docs-911
8c7974af01 Merge pull request #2848 from bilderbuchi/fix-538
e81b275eda Update formatting in CHANGELOG
537fc3c315 Merge pull request #2824 from dirk-thomas/pytest_addopts_before_initini
46cc9ab77c Add documentation about python -m pytest invocation.
2d08005039 Merge pull request #2847 from meawoppl/patch-1
baadd569e8 Clarify the documentation of fixture scopes. Closes #538.
11b391ff49 Update mark.py
00d3abe6dc Adding Failed exception to manage maxfail behavior
71c76d96d3 Merge pull request #2834 from aysonje/ignore-setup
3676da594c Merge pull request #2841 from pgiraud/patch-1
843872b501 Improve formatting in 502.feature file
a4fd5cdcb5 Fix auto-use fixture doc
ae4e596b31 Merge pull request #2840 from MarSoft/patch-2
cfdebb3ba4 Fix typo in parametrization doc
eaf38c7239 call path.read(), add tests, add news fragment
b29a9711c4 ignore valid setup.py during --doctest-modules
c750a5beec Merge pull request #2794 from thisch/catchlog
df37cdf51f Merge pull request #2808 from georgeyk/allow-module-level-skip
af75ca435b Fix some coding-style issues in the logging plugin
8aed5fecd9 Remove test_logging_initialized_in_test
f3261d9418 Move logging docu into own rst file
775f4a6f2f Fix flake8 issue
502652ff02 Add preliminary documentation for logging-plugin
0e83511d6d Rename name of registered logging plugin
815dd19fb4 Remove unicode literal compat code
1f3ab118fa Remove usage of get_logger_obj
0ec72d0745 Improve get_option_ini and get_actual_log_level
69f3bd8336 Add changelog entry for catchlog plugin
10a3b9118b Use a relative cache_dir in test because of how arguments are parsed on Windows
ce8c829945 add test for #2824
ed7aa074aa add changelog file for #2824
66e9a79472 get PYTEST_ADDOPTS before calling _initini
1480aed781 Merge pull request #2823 from hugovk/features-rm-2.6
be0e2132b7 Update authors [CI skip]
7113c76f0d Remove unused import
ef732fc51d Remove code for unsupported Python versions
dd45f8ba6c Merge pull request #2822 from RonnyPfannschmidt/nomore-py26
c486598440 remove some support code for old python versions
059455b45d Merge pull request #2773 from RonnyPfannschmidt/fix-markeval-2767
73ff53c742 remove eol python from the ci config
88366b393c start the removal of python 2.6/3.3 support
9b0ce535c9 Merge pull request #2801 from nicoddemus/capture-fixture
8a6bdb282f fix changelog entry
46e30435eb Merge pull request #2819 from leezu/fix_kwargs_fixtures
e86ba41a32 Add testcase for #2819
e89abe6a40 Defensive fallback in case of kwargs not being present
48b5c13f73 Add changelog for #2819
c24ffa3b4c Fix pytest.parametrize when argnames are specified as kwarg
459cc40192 skipping: cleanup
e3b73682b2 flake8 fix
8480075f01 resuffle markevaluator internal structure
9ad2b75038 skipping: replace _evalskip with a more consistent _skipped_by_mark
a33650953a remove unused import
667e70f555 switch out the placeholder MarkEvaluator in unittest plugin
761d552814 Merge pull request #2815 from xuanluong/issue-1997-document-xpass
4bc6ecb8a5 Add mention of xpass in skip/xfail documentation
0668a6c6d3 Add myself to authors file
03ce0adb79 Fix: handle CollectReport in folded_skips function
e7a4d3d8cf Merge remote-tracking branch 'upstream/master' into features
9ee0a1f5c3 Merge pull request #2813 from nicoddemus/release-3.2.3
6b91bc88de Preparing release version 3.2.3
61eb20df71 Merge pull request #2810 from nicoddemus/issue-2809
df6d5cd4e7 Use ascii_escaped to escape unicode warnings
fbb9e9328b Fix warning about non-ascii warnings even when they are ascii
9824499396 Add 2808.feature changelog entry
59f66933cd Update documentation example of pytest.skip(allow_module_level=True)
c1aa63c0bb Fix docstring alignment and typos
e4a6e52b81 Update skipping documentation to include usage of allow_module_level kwarg
06307be15d Add initial tests using skip with allow_module_level kwarg
79d3353081 Add allow_module_level kwarg to skip helper
6690b8a444 Merge pull request #2807 from xuanluong/issue-1442-mention-not--k-help
7093d8f65e Add example of -k 'not test' in help text
f9589f7b64 Resume output capturing after capsys/capfd.disabled() context manager
794d4585d3 Remove unnecessary complexity in _check_initialpaths_for_relpath().
d132c502e6 Merge pull request #2804 from nicoddemus/terminal-reporter-tw-2803
3b30c93f73 Deprecate TerminalReporter._tw
c0c859ce99 Merge pull request #2799 from blueyed/cleanup-tox.ini
22f338d74d Refactor some names for better understanding and consistency
9919269ed0 Allow to use capsys and capfd in other fixtures
87596714bf minor: cleanup tox.ini
296ac5c476 Add thisch to AUTHORS
ad21d5cac4 Remove pytest-capturelog backward compat code
2559ec8bdb use 'formatter' kwarg of catching_logs
207f153ec1 Remove logging_at_level ctx manager
3a4011585f catching_logs: Remove usage of 'closing' ctx manager
57f66a455a catching_logs: Remove unused 'filter' kwarg
e41fd52e8c Introduce live_logs context manager
08f6b5f4ea Use pytest.hookimpl instead of pytest.mark.hookwrapper
d13e17cf51 Don't modify the 'config' object in __init__
f1f6109255 Remove _catchlog_ prefix
87b8dc5afb Move 'config' handling from pytest_configure to __init__
fc965c1dc5 Remove outdated docstring
a1bd54e4ea Clean-up LogCaptureHandler
36cceeb10e Set type of log_print ini-variable to 'bool'
3e71a50403 Remove unneeded sys import from unittest
98209e92ee Remove superfluous whitespace in docstring
1bea7e6985 Cleanup pytest_addoption
1ba219e0da Adapt (logging) unittest
a8e3effb6c Upgrade py
ca46f4fe2a Remove conftest
5130f5707f Fix name clash
6607478b23 Add unittests for LoggingPlugin (excluding perf tests)
8eafbd05ca Merge the pytest-catchlog plugin
de0d19ca09 Merge pull request #2790 from nicoddemus/merge-master-into-features
d96869ff66 fixing cr
966391c77e Merge pull request #2789 from Avira/master
9c8847a0cb Merge pull request #2792 from Avira/fix-tox-docs-link
58aaabbb10 fix tox documentation link
b57a84d065 updating bugfix changelog
c89827b9f2 updating import plugin error test in order to make sure it also checks that the original traceback has been shown to the users
062a0e3e68  If an exception happens while loading a plugin, PyTest no longer hides the original traceback.  In python2 it will show the original traceback with a new message that explains in which plugin.  In python3 it will show 2 canonized exceptions, the original exception while loading the plugin in addition to an exception that PyTest throws about loading a plugin.
2802135741 fix 'DoctestItem' object has no attribute '_fixtureinfo'
a2da5a691a Update tox and appveyor environments to use py36 by default
afe7966683 Fix call to outcome.get_result now that outcome.result is deprecated
3ebfb881c9 Merge remote-tracking branch 'upstream/master' into features
bf77daa2ee Merge pull request #2785 from nicoddemus/py36
9933635cf7 Change to py36 as main environment for Python 3 environments in tox
ac5c5cc1ef Merge pull request #2750 from evanunderscore/fix-filescompleter
810320f591 Small fixes to development_guide: title and label names
25d2acbdb2 Merge pull request #2760 from nicoddemus/labels
52c134aed3 Add development guide to docs
14b6380e5f Fix #2775 - running pytest with "--pyargs" will result in Items with empty "parent.nodeid" if run from a different root directory
70cdfaf661 Merge pull request #2754 from nicoddemus/xfail_strict
abfd9774ef Remove xfail mark from passing test in py26
e57cc55719 Merge pull request #2766 from xuanluong/issue-1548-docs-multiple-calls-metafunc-parametrize
696c702da7 Update documentation on multiple calls of metafunc.parametrize
bee2c864d8 Merge pull request #2765 from xuanluong/pass-callable-to-marker-typo
e27a0d69aa Rename changelog file to PR id number
15222ceca2 Fix typo in example of passing a callable to markers
3c1ca03b9c Merge pull request #2763 from jhamman/docs/skipif_class_warning
25ed4edbc7 Merge pull request #2764 from xuanluong/issue-2758-fix-mark-decorator-equality
1e93089165 [bugfix] Checking MarkDecorator equality returns False for non-MarkDecorator object
b2a8e06e4f add warning to skipping docs re marker inheritance
9273e11f21 Merge branch 'master' into features
09349c344e Merge pull request #2757 from nicoddemus/release-3.2.2
6cf515b164 Fix crash in FastFilesCompleter with no prefix
6967f3070e Merge pull request #2711 from massich/mimic_raises_signature_in_warns
a0c6758202 Add changelog
80d165475b Add documentation
aa6a67044f Add match_regex functionality to warns
c52f87ede3 Preparing release version 3.2.2
549f5c1a47 Merge pull request #2736 from xuanluong/issue-2604-documents-mark.with_args
3f8ff7f090 [DOC] Add examples for mark.with_args
b55a4f805f Merge pull request #2744 from nicoddemus/pluggy-master
d01f08e96f Merge branch 'features' into pluggy-master
ad36407747 Merge pull request #2700 from nicoddemus/staticmethods-fixtures
e1f2254fc2 Merge pull request #2734 from RonnyPfannschmidt/simplify-string-safening
10d43bd3bf Set xfail_strict=True in pytest's own test suite
f825b4979b Merge remote-tracking branch 'upstream/master' into features
3d70727021 Improve wording in changelog entry
1fc185b640 Add comment about possible future refactoring in the fixture mechanism
7d59b2e350 Fix call to outcome.force_result
d9992558fc Refactor tox.ini so pluggymaster envs share definitions
d1f71b0575 Merge pull request #2752 from tarcisiofischer/issue-2751-fix-flaky-testdir
de6b41e318 Update changelog and AUTHORS files, following the CONTRIBUTING guidelines
8d1903fed3 Avoid creating arbitrary filenames for tmpdir on Testdir's constructor
13eac944ae restore ascii escaping for python 3.3/3.4
d8ecca5ebd Add test to design warns signature in TDD mimicking raises signature
9bbf14d0f6 Create explicit 'pluggymaster' env definitions
c42d966a40 Change all pytest report options to the more concise '-ra' in tox.ini
3dc0da9339 Remove __multicall__ warning and usages in testing
11ec6aeafb Add test environment using pluggy from master branch
9d373d83ac Merge pull request #2741 from nicoddemus/pytester-makepyfile
181bd60bf9 Merge pull request #2742 from nicoddemus/resultlog-deprecation
3288c9a110 Improve user guidance regarding ``--resultlog`` deprecation
221797c609 Encode utf-8 byte strings in pytester's makefile
5e00549ecc Merge pull request #2735 from fgmacedo/fgm-fix-reprfuncargs-toterminal
b770a32dc8 Merge pull request #2707 from cybergrind/fix_baseexception
f9157b1b6b Improve CHANGELOG entry to be more user-friendly
f4e811afc0 Merge remote-tracking branch 'upstream/master' into cybergrind/fix_baseexception
59cdef92be fixes #2731 ReprFuncArgs with mixed unicode and utf-8 args
78a027e128 simplyfy ascii escaping by using backslashreplace error handling
709b8b65a4 Merge pull request #2721 from josepht/patch-1
0824076e11 Merge pull request #2710 from massich/raises_match_doc
488bbd2aeb Merge pull request #2719 from tgoodlet/stop_vendoring_pluggy
312891daa6 Add a trivial changelog entry
fe415e3ff8 Use latest patch release
ff35c17ecf Drop wrapper module; import directly
67161ee9f8 Add changelog item for PR #2721.
1c891d7d97 Fix typo in goodpractices.rst
9ab83083d1 Update docs
756db2131f Drop vendoring from packaging
cb700208e8 Drop vendoring task
333a9ad7fa Stop vendoring pluggy
12b1bff6c5 `compat.safe_getattr` now catches OutcomeExceptions too
657976e98a update raises documentation regarding regex match
a993add783 Allow tests declared as @staticmethod to use fixtures
539523cfee Merge pull request #2697 from nicoddemus/match-kw-version
f18780ed8a Update docs: ``match`` keyword was introduced in 3.1
806d47b4d4 Merge pull request #2691 from anhiga/trivial_error
bfc9f61482 Update the number of plugins in index.rst
2a99d82c3b Fixed error in 'Good Practices' code snippet
5c0feb2877 Merge pull request #2680 from prokaktus/skipping-same-module
9b2753b302 Merge pull request #2687 from nicoddemus/use-py36-ci
5f17caa156 Merge pull request #2675 from RonnyPfannschmidt/mark-callspeck
e9bfccdf2d Merge pull request #2678 from jespino/fix/2676
7b5d26c1a8 Use py36 as preferred Python 3 interpreter for CI testing
98bf5fc9be Fold skipped tests with global pytestmark variable
362b1b3c4f Use tox release candidates in CI
5c0c1977e3 Merge pull request #2682 from pelme/getfuncargvalue-fix
39331856ed Use the correct stacklevel for getfuncargvalue() deprecation warning.
dc9154e8ff Add default values documentation for python_files, python_classes and python_functions
021fba4e84 Update number of plugins on README and poiint to plugincompat link
eb462582af fix #2675 - store marks correctly in callspecs
fd84c886ee Merge pull request #2671 from nicoddemus/release-3.2.1
e6020781f6 Merge pull request #2653 from felipedau/slow-sharing-note
acd3c4fbc4 Update changelog for #2653
c847b83d56 Use `pytest_collection_modifyitems()` in the run/skip option example
45d2962e97 Preparing release version 3.2.1
8b322afcdb Make generated doc in simple.rst more reliable
523bfa6151 Merge pull request #2667 from nicoddemus/py36-windows-workaround-error
cc0f2473eb Fix windows console workaround error with non-standard io-streams
76c55b31c6 Merge pull request #2630 from srinivasreddy/2591
a0101f024e remove os.sep as it behaves differently linux and windows.
d5f4496bdf Merge pull request #2656 from nicoddemus/unittest-features
37353a854e Implement suggestions by Raphael
12e60956de Merge pull request #2655 from nicoddemus/terminal-collecting-glitch
15cdf137d5 Document which pytest features work with `unittest`
9e62a31b63 Merge pull request #2650 from srinivasreddy/2642
2e33d9b35e Add changelog entry for using six for portability
dc563e4954 convert py module references to six module
ad52f714a9 Fix small terminal glitch when collecting a single test item
8969bd43c9 Merge pull request #2646 from nicoddemus/issue-2644
7703dc921c Only skip null bytes before setting the environment variable
1deac2e210 Properly escape test names when setting PYTEST_CURRENT_TEST environment variable
02da156351 Merge pull request #2645 from alex/patch-1
84061233ef Tiny rst syntax fix
40254b64e5 Merge branch 'master' into features
0a15edd573 Merge branch 'release-3.2.0'
51ebad76f2 Fix merge instruction after a minor/major release
d2bca93109 Update grammar in changelog as requested
6e7547244b Merge pull request #2636 from RonnyPfannschmidt/remove-preinit
333ec8ba5a Merge pull request #2638 from RonnyPfannschmidt/function-definition
dcaeef7c10 take review comments into account
8a2e6a8d51 Fix linting
74d536314f pytester: make pytest fullpath a constant
ceb016514b remove dead code - Node._memoizedcall
e90f876b34 remove the last own implementation of pytest_namespace
c68a89b4a7 remove preinit, its no longer needed
07dd1ca7b8 Preparing release version 3.2.0
f1467f8f03 Merge remote-tracking branch 'upstream/master' into features
763c580a2a Merge pull request #2576 from maiksensi/feat/raise-not-implemented-for-lt-gt-in-approx
e1aed8cb17 Merge pull request #2490 from RonnyPfannschmidt/fix-580
713f7636e1 Merge pull request #2632 from jmoldow/pep_0415_suppress_exception_context
4cd8727379 Merge pull request #2617 from wence-/fix/nondeterministic-fixtures
5e0e038fec Merge pull request #2625 from nicoddemus/historical-notes
2e61f702c0 Support PEP-415's Exception.__suppress_context__
8c2319168a Rephrase the bit about unittest migration to pytest
768edde899 Merge pull request #2624 from nicoddemus/lf-report-after-collection
be401bc2f8 fix linting issues
06a49338b2 make Test Outcomes inherit from BaseException instead of exception
7a12acb6a1 Fix linting
5acb64be90 Add versionadded tag to pytest_report_collectionfinish hook
75e6f7717c Use new hook to report accurate tests skipped in --lf and --ff
17121960b4 Merge pull request #2621 from nicoddemus/cumulative-cache
7082320f3f Apply modifications requested in review
6fe7069cbb Move historical notes to their own doc
d46006f791 Fixes in "contact" doc
f770f16294 Replace deprecated "config.option.<name>" usages from docs
eb1bd3449e xfail and skipped tests are removed from the "last-failed" cache
22212c4d61 Add xfail specific tests
62810f61b2 Make cache plugin always remember failed tests
e97fd5ec55 Merge pull request #2623 from nicoddemus/post-collection-report-hook
17c544e793 Introduce new pytest_report_collectionfinish hook
ddf1751e6d Merge pull request #2613 from nicoddemus/features
3d89905114 Merge remote-tracking branch 'upstream/master' into features
1a9bc141a5 Merge pull request #2620 from mihaic/multiple-issues-in-changelog
10ded399d8 Show multiple issue links in CHANGELOG entries
f047e078e2 Mention new (py26) ordereddict dependency in changelog and docs
f8bd693f83 Add ordereddict to install_requires for py26
a546a612bd Fix nondeterminism in fixture collection order
dd294aafb3 Merge pull request #2557 from blueyed/EncodedFile-name
b39f957b88 Add test of issue #920
2c2cf81d0a Merge pull request #2580 from andras-tim/fix-runpytest-subprocess
80f4699572 approx raises TypeError in Python 2 for comparison operators other than != and ==
57a232fc5a Remove out of scope change
1851f36beb Add PR requirements changelog and authors
f0936d42fb Fix linter errors
d3ab1b9df4 Add user documentation
0603d1d500 capture: ensure name of EncodedFile being a string
79097e84e2 Merge pull request #2615 from blueyed/revisit_contributing.rst
1a42e26586 Improve changelog wording to be more user-oriented
595ecd23fd Merge pull request #2548 from blueyed/skip-fix-lineno
949a1406f0 Revisit CONTRIBUTING.rst
71947cb4f0 Merge pull request #2546 from blueyed/better-skip-not-allowed-error
869eed9898 Fix lineno offset in show_skipped
72531f30c0 Improve error message for CollectError with skip/skipif
73c6122f35 Merge remote-tracking branch 'upstream/master' into features
70d9f8638f Merge pull request #2610 from AgriConnect/doctest-lineno
d40d77432c Add test case for DoctestItem.reportinfo()
e44284c125 Merge pull request #2611 from segevfiner/patch-1
dea671f8ba Add changelog for #2610
cdaa720bc4 Merge remote-tracking branch 'upstream/master' into doctest-lineno
d0ecfdf00f Delete trailing whitespace
81ad185f0d Merge pull request #2595 from nicoddemus/docs-rootdir-pythonpath
d90bef44cc Update changelog file for #2510
df12500661 Create 2611.bugfix
43544a431c Early import colorama so that it get's the correct terminal
0aa2480e6a Fix travis build after change from "precise" to "trusty"
6473a81b8b Merge pull request #2608 from nicoddemus/contributing-update
af2c153324 Report lineno from doctest
309152d9fd Merge pull request #2599 from nicoddemus/turn-warnings-into-errors
d5bb2004f9 Fix travis build after change from "precise" to "trusty"
bda07d8b27 Ignore socket warnings on windows for trial tests
0726d9a09f Turn warnings into errors in pytest's own test suite
61219da0e2 Update PR guide and add a "short" version
1b732fe361 Merge pull request #2606 from kalekundert/simplify-numpy
b35554ca2b Merge pull request #2607 from kalekundert/remove-code-dup
7e0553267d Remove unused import.
ebc7346be4 Raise TypeError for types that can't be compared to arrays.
a3b35e1c4b Remove `raises` and `approx` from `python.py`.
4c45bc9971 Add the numpy tests back into tox.ini
495f731760 Simplify how comparisons with numpy arrays work.
50764d9ebb Avoid interactive pdb when pytest tests itself - fix #2023
6461dc9fc6 Merge pull request #2600 from RonnyPfannschmidt/mark_explicit_params
1cf826624e Merge pull request #2602 from blueyed/doc-fix-filterwarnings
97e5a3c889 Fix help for filterwarnings ini option
65b2de13a3 fix #2540, introduce mark.with_args
3d24485cae Clarify PYTHONPATH changes and ``rootdir`` roles
ccc4b3a501 Merge pull request #2596 from nicoddemus/autopep-tox
cbceef2008 Merge pull request #2598 from nicoddemus/filterwarnings-mark
7341da1bc1 Introduce pytest.mark.filterwarnings
3c28a8ec1a Improve formatting/grammar of changelog entries
22f54784c2 Add "fix-lint" tox environment to fix linting errors
abb5d20841 Merge branch 'master' into features
da12c52347 Fix: do not load hypothesis during test_logging_initialized_in_test
9e3e58af60 Merge pull request #2594 from nicoddemus/fix-flake8-errors
56e6b4b501 Merge pull request #2578 from Llandy3d/2375
d44565f385 Merge remote-tracking branch 'upstream/master' into fix-flake8-errors
24da938321 Fix additional flake8 errors
26ee2355d9 Merge remote-tracking branch 'upstream/features' into fix-flake8-errors
c92760dca8 Merge branch 'fix-flake8-issues'
61d4345ea4 Merge pull request #2593 from hackebrot/extend-pytester-docs-for-testing-plugin-code
1ac02b8a3b Add plugin code
d06d97a7ac Remove unnecessary comma from docs
e73a2f7ad9 Add changelog entry changelog/971.doc
91b4b229aa Update documentation for testing plugin code
2840634c2c Fix typo and improve comment about cookiecutter-template
eb79fa7825 Merge pull request #2590 from nicoddemus/current-test-var
d7f182ac4f Remove SETUPTOOLS_SCM_PRETEND_VERSION during linting
2d4f1f022e Introduce PYTEST_CURRENT_TEST environment variable
2c03000b96 Merge pull request #2585 from RonnyPfannschmidt/fix-2573
62556bada6 remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage
637e566d05 Separate all options for running/selecting tests into sections
3a1c9c0e45 Clarify in the docs how PYTEST_ADDOPTS and addopts ini option work together
0e559c978f Merge pull request #2587 from nicoddemus/remove-impl-file
bd96b0aabc Remove _pytest/impl file
7b1870a94e Fix flake8 in features branch
4fd92ef9ba Merge branch 'fix-flake8-issues' into features
ac3f2207bb Merge pull request #2575 from MartinAltmayer/master
b2a5ec3b94 updated meta
b49e8baab3 Fixed E731 flake8 errors
15610289ac Fixed E712 flake8 errors
5ae59279f4 Fixed E704 flake8 errors
bf259d3c93 Fixed E702 flake8 errors
85141a419f Fixed E701 flake8 errors
7d2ceb7872 Fixed E501 flake8 errors
b9e318866e Fixed E402 flake8 errors
45ac863069 Fixed E401 flake8 errors
7248b759e8 Fixed E303 flake8 errors
b840622819 Fixed E302 flake8 errors
17a21d540b Fixed E301 flake8 errors
9bad9b53d8 Fixed E293 flake8 errors
4730c6d99d Fixed E272 flake8 errors
c9a081d1a3 Fixed E271 flake8 errors
195a816522 Fixed E265 flake8 errors
eae8b41b07 Fixed E262 flake8 errors
8f3eb6dfc7 Fixed E261 flake8 errors
b226454582 Fixed E251 flake8 errors
4c24947785 Fixed E241 flake8 errors
617e510b6e Fixed E231 flake8 errors
4b22f270a3 Fixed E226 flake8 errors
2e8caefcab Fixed E225 flake8 errors
3fabc4d219 Fixed E222 flake8 errors
f640e0cb04 Fixed E221 flake8 errors
ebb6d0650b Fixed E203 flake8 errors
ba0a4d0b2e Fixed E202 flake8 errors
1ff54ba205 Fixed E201 flake8 errors
df54bf0db5 Fixed E131 flake8 errors
1c935db571 Fixed E129 flake8 errors
cf97159009 Fixed E128 flake8 errors
57438f3efe Fixed E127 flake8 errors
e855a79dd4 Fixed E126 flake8 errors
92e2cd9c68 Fixed E125 flake8 errors
051d76a63f Fixed E124 flake8 errors
4b20b9d8d9 Fixed E123 flake8 errors
425665cf25 Fixed E122 flake8 errors
0be97624b7 Fixed E121 flake8 errors
64a4b9058c Fixed E113 flake8 errors
8de49e8742 Fixed E111 flake8 errors
6146ac97d9 Fixed E101 flake8 errors
6af2abdb53 Fixed flake8 warnings
796ffa5123 reformatted tox.ini
ba9a76fdb3 Provides encoding attribute on CaptureIO
cc39f41c53 Add myself to AUTHORS as required by the PR help text.
2a979797ef Add a changelog entry.
e5169a026a #2574: --fixtures, --fixtures-per-test keep indentation of docstring
3578f4e405 Merge pull request #2571 from ahartoto/master
97fdc9a7fe Ensure final collected line doesn't include artifacts
771cedd3da Merge pull request #2567 from nicoddemus/add-report-section-docs
81cec9f5e3 Merge pull request #2563 from pv/yield-warn-spam
1485a3a902 Merge pull request #2566 from jmsdvl/iss2518
f16c3b9568 Merge pull request #2569 from nicoddemus/backwards-sidebar
e6b9a81ccf Add a link to our backwards compatibility policy to our side-bar
67fca04050 update docs and note; add virtualenv collection tests
73b07e1439 Add docs for Item.add_report_section in the docs
b32cfc88da use presence of activate script rather than sys.prefix to determine if a dir is a virtualenv
676c4f970d trim trailing ws
c2d49e39a2 add news item
89c73582ca ignore the active python installation unless told otherwise
d9aaab7ab2 Merge remote-tracking branch 'upstream/master' into features
9e0b19cce2 Merge pull request #2561 from jmsdvl/iss2533
a87f6f84cc Merge pull request #2559 from RockBomber/features
8a7d98fed9 Make YIELD_TEST warning less spammy
cdd788085d add news fragment to changelog folder
80595115b0 replace all _escape_strings to _ascii_escaped
bd52eebab4 changelog for ini option cache_dir
91418eda3b docs for ini option cache_dir
7a9fc69435 tests for ini option cache_dir
f471eef661 ini option cache_dir
ef62b86335 Merge pull request #2492 from kalekundert/features
7cd03d7611 Merge pull request #2554 from nicoddemus/pytest-configure-order
3667086acc Clarify pytest_configure hook call order
db24a3b0fb Merge pull request #2552 from nicoddemus/strict-help-message
221f42c5ce Change --strict help message to clarify it deals with unregistered markers
7a1a439049 Use `cls` instead of `ApproxNumpyBase`.
b62aef3372 Merge branch 'master' into features
c111e9dac3 Avoid making multiple ApproxNumpy types.
8524a57075 Add "approx" to all the repr-strings.
b63f6770a1 Preparing release version 3.1.3
8a8687122d Add wheel to tasks/requirements.txt: required for package creation
7277fbdb20 Fix SMTP port in fixture docs
6908d93ba1 Merge pull request #2475 from ant31/master
c578418791 Add changelog for triple leading '/' problem.
0303d95a53 Merge pull request #2531 from waisbrot/staticmethods
9b9fede5be allow staticmethods to be detected as test functions
9b51fc646c Merge pull request #2526 from nicoddemus/merge-master-into-features
6eeab45a8f Merge pull request #2525 from nicoddemus/deprecate-old-style
16df4da1f7 Fix exclude_path check
3de93657bd Merge remote-tracking branch 'upstream/master' into merge-master-into-features
1906f8c565 Merge pull request #2524 from RonnyPfannschmidt/fix-2427
655d44b413 Add changelog entry explicitly deprecating old-style classes from pytest API
0d0b01bded introduce deprecation warnings for legacy parametersets, fixes #2427
6e2b5a3f1b Merge pull request #2523 from RonnyPfannschmidt/vendoring-tasks
b3bf7fc496 add tasks for updating vendored libs
bb659fcffe Merge pull request #2521 from nicoddemus/show-trivial-changelog
6de19ab7ba Show "trivial" category in CHANGELOG
bab18e10eb Merge pull request #2517 from RonnyPfannschmidt/mark-expose-nontransfered
8d5f2872d3 minor code style fix
b0b6c355f7 fixup changelog, thanks Bruno
23d016f114 address review comments
22b7701431 Merge pull request #2480 from nicoddemus/issue-2469-deprecated-call-ctx
1d926011a4 add deprecation warnings for using markinfo attributes
ff8dbd0ad8 Add tracebackhide to function call form of deprecated_call
5e832017d5 Merge pull request #2487 from nicoddemus/recursion-error-2486
c791895c93 changelog addition
19b12b22e7 store pristine marks on function.pytestmark
64ae6ae25d extract application of marks and legacy markinfos
bdec2c8f9e move marker transfer to _pytest.mark
4a62102b57 Merge pull request #2511 from nicoddemus/addfinalizer-docs
f2ba8d70b9 Fix typo and add suggestion from review
afe847ecdc fixture docs: highlight difference between yield and addfinalizer methods
9597e674d9 Use sets to compare dictionary keys.
d6000e5ab1 Remove py36 from .travis.yml
4d02863b16 Remove a dict-comprehension.
5d2496862a Only test numpy with py27 and py35.
50769557e8 Skip the numpy doctests.
b41852c93b Use `autofunction` to document approx.
8badb47db6 Implement suggestions from code review.
8c3c4307db Merge pull request #2503 from nicoddemus/remove-manifest-check
731c35fcab Remove MANIFEST.in and related lint check
31b971d79d Merge pull request #2488 from nicoddemus/issue-links-changelog
4e57a39067 Merge pull request #2468 from nicoddemus/collection-report-2464
af0344e940 Merge pull request #2500 from nicoddemus/issue-2434-doctest-modules
97367cf773 Remove obsolete comment from rewrite.py
336cf3e1f5 Merge pull request #2496 from rmfitzpatrick/pytest2440_handle_subrequest_finalizer_exceptions
4e4ebbef5a Improve test to ensure the expected function is re-raised
b09d60c60a Fix decode error in Python 2 for doctests in docstrings
0908f40e43 Merge pull request #2499 from hackebrot/update-license-dates
0e73724e58 Add changelog/2499.trivial
9970dea8c1 Update copyright date in doc pages
218af42325 Update copyright date in LICENSE and README.rst
6fa7b16482 Merge pull request #2497 from pkch/firstresult
4a992bafdb Changelog
21137cf8c5 Add firstresult=True to the hook docs
5a856b6e29 handle and reraise subrequest finalizer exceptions
89292f08dc Add a changelog entry.
8c22aee256 Resolve merge conflict due to approx being moved.
9f3122fec6 Add support for numpy arrays (and dicts) to approx.
9bd8907716 Merge pull request #2489 from RonnyPfannschmidt/move-python-api
f8b2277413 changelog fragment
6be57a3711 move python api helpers out of the python module
36251e0db4 move approx to own file
f0541b685b Improve CHANGELOG formatting a bit
536f1723ac Add issue links in the CHANGELOG entries
8bb589fc5d Fix internal error when trying to detect the start of a recursive traceback.
467c526307 Merge remote-tracking branch 'upstream/master' into features
b2d7c26d80 Merge pull request #2483 from nicoddemus/release-3.1.2
7cbf265bb5 Preparing release version 3.1.2
917b9a8352 Merge pull request #2476 from nicoddemus/fix-2459-numpy-comparison
2127a2378a Fix internal error with recursive tracebacks with that frames contain objects that can't be compared
d2db6626cf Merge pull request #2466 from nicoddemus/remove-unicode-warning
620ba5971f deprecated_call context manager captures warnings already raised
c67bf9d82a Merge remote-tracking branch 'upstream/master' into features
57e2ced969 Merge pull request #2473 from ApaDoctor/docs-fixes
80944e32ad Add CHANGELOG entry
54a90e9555 docs: Create links for objects to show the api
9d41eaedbf Issue UnicodeWarning only for non-ascii unicode
46d157fe07 Fix collection report when collecting a single test item
87e4a28351 Fix incorrect collected items report when specifying tests on the command-line
5ee9793c99 Fix CHANGELOG issue id
1863b7c7b2 Merge pull request #2462 from segevfiner/py36-windowsconsoleio-workaround
01ed6dfc3b Added a changelog entry for the WindowsConsoleIO workaround
59b3693988 Fixed wrong if in the WindowsConsoleIO workaround
05796be21a A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture
f826b23f58 Merge pull request #2458 from segevfiner/fix-required-options-help
9abff7f72f Add a docstring to HelpAction
f74f14f038 Fix --help with required options
bcbad5b1af Merge pull request #2140 from pelme/issue2121
5d785e415e Merge pull request #2454 from nicoddemus/xfail-docs
409d2f1d54 Make it clear that pytest.xfail stops the test
9adf513c4b Merge remote-tracking branch 'upstream/master' into features
cca4de20cf Merge pull request #2450 from nicoddemus/release-3.1.1
c98ad2a0a0 Install py 1.4.33 that contains the fnmatch py.std import fix.
5de203195c Add changelog for #2121
021e843427 Fixed #2121 Use `py.path`s fnmatch. This fixes an issue where python_files handled properly when rewriting assertions.
ac9c8fcdab Failing test for issue #2121
3871810d1c Merge pull request #2451 from nicoddemus/update-release-howto
281fcd5a58 Update HOWTORELEASE
2fd7626046 Preparing release version 3.1.1
0540d72c87 Add extra space between changelog items
1dee443c2b Merge pull request #2445 from nicoddemus/warnings-remove-filter
32e2642233 No longer override existing warning filters during warnings capture
454426cba5 Merge pull request #2446 from nicoddemus/issue-2441
f96a1d89c5 pytest.deprecated_call now captures PendingDeprecationWarning in context manager form
ee0844dbd8 Merge pull request #2431 from RonnyPfannschmidt/towncrier
b74c626026 switch changelog management to towncrier
4e6e29dbee Merge pull request #2442 from nicoddemus/merge-master-into-features
6117930642 Merge pull request #2438 from nicoddemus/issue-2434
7bb06b6dad Merge pull request #2439 from nicoddemus/warnings-docs
7950c26a8e Add Hui Wang to AUTHORS list
836dc451f4 Fix unicode issue while running doctests in Python 2
8df3e55a31 Merge pull request #2437 from coldnight/master
53add4435f Add ChangeLog
d7a5c5716f Add UnicodeWarning for unicode warnings in Python2
313a884459 Warn that warning-capture can break existing suites in the docs and CHANGELOG
c39689da41 Correct warnings with unicode message.
17f64704c2 Merge remote-tracking branch 'upstream/features'
f9953fbe7c Merge pull request #2425 from nicoddemus/publish-task
0ea80eb63c Merge pull request #2428 from The-Compiler/param-id-docs
38ebf8dd10 Merge pull request #2429 from The-Compiler/regenschauer
04b1583d10 Merge pull request #2426 from The-Compiler/fix-changelog
d9b93674c3 Make --cache-show output deterministic
7d6bde2496 Add docs for id= with pytest.param
bd065a12bb Fix up 3.1 changelog
f9df750025 Update 3.1.0 release date
d343f9497c Merge branch 'release-3.1'
5192191c38 Create task for publishing a release
69343310c6 Merge pull request #2422 from pytest-dev/refactor-config
c9c2c34b44 Remove unused parameter
9beeef970e Parse the filename in the generator expression
43aa037ebd Reindent
2abf2070f2 Collapse nested for loops into a generator expression
ce0ff0040f Reindent and add docstring
6d2e11b7d1 Extract method for _mark_plugins_for_rewrite
9b48613baa Preparing release version 3.1.0
0ff7f5d0c6 Prepare CHANGELOG for version 3.1.0
36cf89a2de Merge remote-tracking branch 'upstream/master' into features
3a4d37248d Merge pull request #2414 from nicoddemus/revert-new-style-classes
637550b249 Merge pull request #2418 from axil/master
598aefc686 small fix in an example from the docs
7af0e6bda1 Merge pull request #2415 from flub/training
f7247dc99d Remove past training
d86c89e193 Revert refactor of old-style to new-style classes
e484f4760f Merge pull request #2412 from pytest-dev/pytest-book-ref
70bcd1fb7b Add a reference to Python testing book to talks docs
6f407ef308 Merge pull request #2411 from nicoddemus/automate-pre-release
feab3ba70f Implement tasks to improve release automation
00e7ee532e Fix minor regendoc issues
fe49c78f32 Merge remote-tracking branch 'upstream/master' into release-3.1
3c41349fe1 Merge pull request #2406 from RonnyPfannschmidt/regendoc-reduce-version-noise
bd708068ab Merge branch 'features' into regendoc-reduce-version-noise
783670b84e Merge pull request #2274 from dmand/feat/junitxml/suite-name-option
03753ca201 intermediate state after attempt with the plain env, DONT MERGE
456925b604 Merge pull request #2395 from RonnyPfannschmidt/consider-all-modules
f39f416c5d Improve tests a bit
d1e44d16e7 regenerate docs from the pytest env
2ab8d12fe3 Update changelog and add usage info
c9282f9e94 Transition to using ini option for suite name
bcfa6264f1 Update AUTHORS list
204db4d1e2 Update Changelog
fe7d89f033 Add '--junit-suite-name' CLI option
c765fa6d04 add regendoc normaliz for pytest --version
f1c4e2c032 regendoc: reduce version noise by replacing minor/patch with placeholders
a92e397011 add changelog for fixing #2391
b6125d9a13 Merge pull request #2397 from nicoddemus/announce-task
66ba3c3aa4 Introduce a task to generate the announcement file for releases
7ee2db23df Merge pull request #2396 from johndgiese/patch-1
52c67af63c Clarify opening paragraph of parameterization docs
8bcf88ec12 try to consider all modules after registration as plugin
daca618012 Merge pull request #2389 from nicoddemus/merge-master-into-features
f3b359f5b8 Merge remote-tracking branch 'upstream/master' into merge-master-into-features
3fc917a261 Merge pull request #2385 from nicoddemus/anaconda-badge
814ea9d62c Merge pull request #2387 from nicoddemus/trial-errors
630cca2fba Fix py35-trial environment
bfd2563b3a Merge pull request #2386 from robin0371/show-correct-msg
60b8339166 Issue #2383 - Show the correct error message when collect "parametrize" func with wrong args and add test for this case.
34f488757f Add badge for anaconda package version
cccb2cc92b Merge pull request #1834 from RonnyPfannschmidt/setuptools-scm-take-2
d7d2249d99 Merge pull request #2378 from szuliq/patch-1
a280e43949 fix import error
f0533194ed Update fixture.rst
a9b44c4529 Update docs
e02cb6d7ce restore setuptools_scm write_to usage
314d4afa57 Merge pull request #2367 from nicoddemus/py36-official-travis
25371ddbfd Merge pull request #2315 from RonnyPfannschmidt/namespace-hook
80225ce72c Merge pull request #2374 from Kodiologist/getmodpath-file-ext
4242bf6262 use unknown to specify unknown versions
dcefb287fc Try not to assume a module's file extension is .py
2cf422733c restore linting, drop _pytest._version for check-manifest
c0a51f5662 restore check-manifst functionality
31e6fe8f52 HOWTORELEASE.tst: use restructuredtext autonumbering
c3aee4b1e6 second take at setuptools_scm
581b463b60 Merge pull request #2372 from nicoddemus/pytest-dont-rewrite-docs
90be44c812 Document PYTEST_DONT_REWRITE
80cabca21a Merge pull request #2292 from nicoddemus/defer-hook-checking
cac82e71d8 Improve item.warn handling of fslocation parameter
6e2bbe88b1 Test against py36 official release for consistency with other python versions
d9a2e70155 Change LsofFdLeakChecker to emit a warning instead of failing when detecting leaked FDs
7dfdfa5813 Merge pull request #2359 from pytest-dev/fix-2343
7d4ac14a31 Fix #2343: Replace version checks by constants.
731776702d Fix hook name in LsofFdLeakChecker
0baf5e1499 Fix test that expected "unknown hook" error on stderr
83c508eea3 Verify hooks after collection completes
78ac1bf5d1 Merge pull request #2350 from nicoddemus/future-imports-rewrite
02da278894 Merge pull request #2357 from ojii/lastfailed-failedfirst
1125786e78 Improve --lf/--ff test as commented during review
08d83a5c6a updated changelog and authors files
0ab85e7a9c Changed behavior if --lf and --ff are both used.
47a2a77cb4 Merge pull request #2354 from shobute/patch-1
21f1c2b03f Update fixtures.py
8c69d5c939 Merge pull request #1940 from skylarjhdownes/master
f2300fbab2 Fix links in docs
45852386e5 Fix small typo in docs
5462697924 Small formatting fixes to nose.rst
639c592f31 Add missing link in CHANGELOG
f7caa56a6b moved documentation of conftest.py hack to nose.rst
3aa4fb62d6 Merge branch 'master' into master
c734a2d8d5 Merge pull request #2352 from pytest-dev/fix-search-docs
44a3db3dc6 Pin sphinx to 1.4 when generating docs to workaround search issues on RTD
1b5f898dc5 Ensure rewritten modules don't inherit __future__ flags from pytest
83b241b449 Merge pull request #2347 from reutsharabani/features
24ac923938 Add CHANGELOG entry
333ce9849d added acceptance test for unicode plugin names
417b54abed added option to unicode plugin name
144d90932e Merge pull request #2337 from nicoddemus/2336-unicode-tb
a542ed48a2 Convert using utf-8 instead of ascii in safe_str()
58ac4faf0c Fix exception formatting while importing test modules
afb1778294 put in a singular namespace hook to work around the strange issue
ebeba79be3 remove the namespace hook from mark after the param feature merge
6165939b0d fix rebase mistakes
efe03400d8 fixup nose/pytest plugins
c9ab421398 fix python2 only import loop failure
147bb8aea5 correct setting pytest.config
7cdefce656 fix up oversights
4d31ea8316 add a comment explaining the modimport tests
bb750a7945 add missed file
92f6ab1881 fix all singular internal module imports and add a test for them
809c36e1f6 add a changelog note for pytest_namespace
23bc9815c4 remove pytest_namespace from _pytest.fixtures
ae234786ea remove pytest_namespace from _pytest.python
99c8f2d403 remove pytest_namespace from _pytest.main
61f418a267 hollow out pytest_namespace in _pytest.fixtures
9b58d6eaca prepare a own pytest.collect fake module in oder to remove the nested builtin namespaces
839c936153 _pytest.mark: fix unconfigure after bad configure, still potential bug
7d797b7dbf add a note about the deprecation of the pytest_namespace hook
9b755f6ec6 remove pytest_namespace from _pytest.skipping
90788defb2 remove pytest_namespace from _pytest.mark and fix latent pytest nesting bug
6a02cdbb35 remove pytest_namespace from _pytest/runner.py
c74103f395 remove pytest_namespace from recwarn and fixture decorators
794fd5658c remove pytest_namespace from _pytest/debugging.py
fab9b993f8 remove pytest_namespace from _pytest.freeze_support
5818e65cf3 remove pytest_namespace from _pytest/assertion
2a130daae6 Merge pull request #2072 from nicoddemus/integrate-pytest-warnings
0c1c2580d0 Add CHANGELOG entry
74b54ac0ec Fix errors related to warnings raised on pypy test environment
2c730743f1 Fix errors related to warnings raised by xdist
916d272c44 Fix test on linux
eabe3eed6b Add docs for the warnings functionality
fa56114115 Clean up warnings generated by pytest's own suite
d027f760c0 Avoid displaying the same warning multiple times for an item
3373e02eae Add __future__ imports to warnings module
9f85584656 Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings
de8607deb2 Merge pull request #1921 from RonnyPfannschmidt/marked-value
e8a1b36c82 add changelog
6cfe087261 Merge pull request #2320 from pawelad/2239/exit-code-docs
8b57aaf944 Added 'Paweł Adamczak' to AUTHORS
d58bc14645 Added 'Possible exit codes' section to docs (#2239)
e368fb4b29 implement pytest.param
a122ae85e9 Merge pull request #2316 from nicoddemus/add-future-imports
4d947077bb Fix test in py26 that expected a floor division error message
e5021dc9dc Replace py.builtin.print_() calls by builtin print() function
42a5d6bdfa Add __future__ imports to all pytest modules
7684b3af7b Recommend using py36 for testing on CONTRIBUTING
78194093af Improve warning representation in terminal plugin and fix tests
be5db6fa22 Capture warnings around the entire runtestprotocol
0baed781fe Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings
337f891d78 Fixed tests
5482dfe0f3 Merge pull request #2303 from nicoddemus/recwarn-refactor
75ec893d75 Merge pull request #2297 from nicoddemus/init-files-docs
76df77418d Merge pull request #2313 from nicoddemus/DontReadFromInput-exceptions
55b891ddd0 Merge pull request #2312 from nicoddemus/merge-master-into-features-post-3.0.7
aad4946fb6 Move CHANGELOG entry for #2276 to 3.0.8
9062fbb9cc Add AUTHORS & CHANGELOG
dc6890709e Change ValueError to io.UnsupportedOperation in capture.py. Resolves issue #2276
272aba98e2 Mention the src layout as recommended practice
6c9011c12f Merge branch 'master' into merge-master-into-features-post-3.0.7
fa15ae7545 Post 3.0.7 release handling
5056d8cbe8 Merge pull request #2304 from nicoddemus/release-3.0.7
4a9348324d Add more information to test-layout docs as discussed during PR
5e52a4dda4 Merge pull request #2307 from nicoddemus/clarify-record-xml-property
92b49d246e Clarify that record_xml_property is experimental, not junitxml
90c934e25e Include release 3.0.7 announce in index.rst
3c07072bfd Fix test_recwarn in Python 3.6
d58780f9a6 Update regendoc
b1ab2ca963 Bump to version 3.0.7 and update CHANGELOG
22864b75ee Refactor recwarn to use warnings.catch_warnings instead of custom code
d1ea7c8cc8 Merge pull request #2301 from nicoddemus/merge-master-into-features
1e0cf5ce4d Merge remote-tracking branch 'upstream/master' into merge-master-into-features
581857aab6 Fix typo
841f731707 Attempt to clarify the confusion regarding __init__ files and unique test names
906b40fbb2 Merge pull request #2289 from fbjorn/fix-trailing-whitespace-in-terminal
cee578e327 Fix trailing whitespace in terminal output
29383d477d Merge pull request #2288 from nodakai/patch-1
e05ff0338a assert.rst: typographical correction
272afa9422 Display node ids and the warnings generated by it
bddb922f7b Rename internal option to disable_warnings
de09023e45 Also capture warnings during setup/teardown
e24081bf76 Change warning output
b28749eb92 Merge pull request #2284 from omerhadari/bugfix-unprintable-assertion-errors
07623e78ce Merge pull request #2286 from pytest-dev/disable-py37-travis
dd25ae7f33 added in the correct alphabitcal order
02dc545311 added in the correct alphabitcal order
b61dcded37 Allow py37-nightly to fail on Travis
f71467f5b1 added link to changelog
6aaf7ae18b added to authors and changelog
6a52fe1650 fixed internal error on unprintable raised AssertionErrors
0c94f517a1 Merge pull request #2236 from KKoukiou/junitxml-change-schema
26e50f1162 junitxml: adjust junitxml output file to comply with JUnit xsd
5721d8aed1 Merge pull request #2249 from pfhayes/anydbmfix
3aac3d0a00 Merge branch 'master' into anydbmfix
3e3f20380e Merge pull request #2277 from nicoddemus/yield-fixture-docs-2262
bb5f200ed7 Improve docs for yield-fixture and with statement a bit
0f3d7acdc4 Merge pull request #2266 from asottile/capture_v2
8b598f00e9 Make pytester use pytest's capture implementation
6ba3475448 Make capsys more like stdio streams in python3.  Resolves #1407.
0a89db2739 Merge pull request #2271 from KKoukiou/double-tag
d3a6be4130 junitxml: Fix double system-out tags per testcase
6680cb9100 Merge pull request #2264 from asottile/simplify_travis
44ad369c17 Merge pull request #2263 from nicoddemus/revert-pluggy
5fd010c4c3 Simplify travis.yml with tox environment variables
82785fcd40 Use warnings.catch_warnings instead of WarningsRecorder
a7643a5fbe Merge branch 'features' into integrate-pytest-warnings
f1900bbea6 Revert subclassing explicitly from object introduced by accident in #2260
21a09f0895 Merge pull request #2261 from vmuriart/doc-report_header
a88017cf26 Add note documenting #2257
58d7f4e048 Correct typo
abd6ad3751 Merge pull request #2260 from MichalTHEDUDE/feature/NewStyleClasses-2147
fb0b90646e New-style classes implemented for python 2.7 - #2147
9c809f5ad0 Merge pull request #2255 from scop/spelling
27f12ed0c3 Merge pull request #2254 from scop/py36-escseq
0a26132232 Merge pull request #2241 from nicoddemus/override-python-files
da828aac05 Merge pull request #2253 from The-Compiler/norecursedirs
8f98ac5ae8 Fix typo in docs "textures" -> "fixtures"
ede4e9171f Spelling fixes
eeb6603d71 Python 3.6 invalid escape sequence deprecation fixes
231e2f9a90 Merge pull request #2252 from nicoddemus/fixture-visibility-docs
c4d974460c Improve pytest_plugins docs
91c6bef77a Add venv to the default norecursedirs
6b5566db66 Update changelog
49289fed52 Fix docs
00ec30353b Update docs as requested
58ce3a9e8c Safer sys.modules delete
427bf42a52 Merge pull request #2247 from flub/flub/training
b536fb7ace Mention next training event.
9eb1d73951 --override-ini now correctly overrides some fundamental options like "python_files"
3d9c5cf19f Merge pull request #2225 from mbyt/allow_skipping_unittests_with_pdb_active
6a097aa0f1 Merge branch 'master' into allow_skipping_unittests_with_pdb_active
a4fb971c1f Merge pull request #2235 from bluetech/dont-execute-properties
3a0a0c2df9 Ignore errors raised from descriptors when collecting fixtures
87fb689ab1 Remove an unneeded `except KeyboardInterrupt`
ccf9877447 Merge pull request #2232 from vidartf/patch-1
a4d2a5785b Merge pull request #2142 from barneygale/xfail_without_condition_getglobals
832c89dd5f Test for `pytest.mark.xfail` with non-Python Item
1a88a91c7a Update authors/history
bad261279c Do not asssume `Item.obj` in 'skipping' plugin
208fae5bf0 Merge pull request #2227 from Kriechi/raises-info
abbff681ba Fix '{0}' format for py26
43662ce789 allow error message matching in pytest.raises
ad56cd8027 extract a _handle_skip method, secure PY2 branch
176c680e19 Merge branch 'master' into allow_skipping_unittests_with_pdb_active
da5a3dba87 Merge pull request #2226 from nicoddemus/raise-stop-iteration
e1c5314d80 Replace 'raise StopIteration' usages in the code by 'return's in accordance to PEP-479
36b6f17727 fixing code-style, keep flake8 happy
d1c725078a Allow to skip unittests if --pdb active
3b47cb45e6 Merge pull request #2222 from RonnyPfannschmidt/features
3f30c22894 fix changelog merge mistake
713bdc1f9f merge master into features
0931fe2c89 Merge pull request #2221 from pytest-dev/ionelmc-patch-1
34e98bce0a Merge pull request #2198 from unsignedint/make-parametrize-enhancement
c8032a9bbb Fix reference.
d98d122e81 Discourage users from using this all the time.
beb77c1a38 Fix release date for 3.0.6
d076e4158f Merge pull request #2216 from vmuriart/patch-1
902fd2ff6a Add py37-nightly to travis
839aa963a1 Add py36 identifier
400b0779f9 Merge pull request #2213 from RonnyPfannschmidt/release-3.0.6
c9f327dc87 bump version to next dev
0e64cd045c take off author_email after pypi rejects
22da561ae5 fix copy+paste error, its supposed to be 3.0.6
449b88c640 rerun regendoc with correct install
34b898b47e generate the release announcement
01eaf9db51 fix the xfail docstring typo at the actual docstring + regendoc
4d0c635252 regendoc
55f21bd2b9 bump version
c39d846c1b Merge pull request #2215 from RonnyPfannschmidt/fix-doctesting/devpi-bug
403122281a fix devpi test for doctesting env
0e58c3fa80 updates for PR review #2198
c848d0a771 Pass parameter name to `make_parametrize_id` hook function
15a3b57ec7 Merge pull request #2120 from RonnyPfannschmidt/fix-2118
6a96b464ab update changelog as suggested
7b4afd8946 remove unused import
1a2d6388ac Merge pull request #2211 from nicoddemus/trial-envs
3766060893 Merge branch 'master' into trial-envs
4082f4024a comment out compatproperty deprecations
e0c48b4fe7 Merge pull request #2212 from nicoddemus/pytester-rewrite
7b4368f3f4 Merge pull request #2184 from eli-b/parseoutcomes-explicit-failure
88f7befabb Merge pull request #2209 from RonnyPfannschmidt/bugfix-2208/get_real_func_loop_limit
c477f09177 Assert statements of the pytester plugin again benefit from assertion rewriting
2574da8d32 Fix pytester internal plugin to work correctly with latest versions of zope.interface
250597d468 get_real_func: use saferepr when formatting the error message
123289a88e fixes #2208 by introducing a iteration limit
d15724f74f Merge pull request #2204 from nicoddemus/linux-marker-doc
61fa91f3d0 Fix marker example on "linux" platform
125e89b7f8 Merge pull request #2194 from rjprins/remove-reinterp-from-docs
46a9861d29 Remove mention of --assert=reinterp in documentation
3dfdbaf490 Merge pull request #2186 from nicoddemus/pytest-plugins-env-rewrite
7cd7c283dd Refactor plugin specs handling into an isolated function
043aadeaf2 Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite
e18b2a427a Fail assert_outcomes() on missing terminal report Currently if the terminal report of testdir.runpytest() is missing, assert_outcomes() on its output fails because parseoutcomes() returns an unexpected value (None). It's better to fail parseoutcomes() directly.
ff309b3584 Merge pull request #2182 from pombredanne/patch-1
aa82db9fe2 Ensure the LICENSE is included in built wheels
6c011f43e9 Merge pull request #2179 from mandeep/new-style-classes
e412ea1d5a Added name to AUTHORS and change to CHANGELOG
d4afa1554b Refactored old style classes to new style classes
64cb67b703 Merge pull request #2174 from nicoddemus/appveyor-py36
7559400183 Add py36 to test on AppVeyor
9477f598d8 Merge pull request #2173 from jeffwidman/patch-1
6d81c684cc Switch monkeypatch fixture to yield syntax
3494dd06fe Remove duplicate target in rst
9e9547a9e4 Simplify condition
7930a8373d Newline for flake8
0bd8159b60 Add a test when multiple classes are specified in warns
56d1858ea2 Remove duplicate '@lesteve' link from CHANGELOG
6fd0394c63 pytest.warns checks for subclass relationship
8f1450114f Merge pull request #2167 from fogo/parametrize-ids-silent-failure
b769e41d8f Merge pull request #2170 from gogoengie/broken-links
ef903460b1 Fix broken links
df409a0c0e Fix CHANGELOG.rst
8db9915374 Update AUTHORS, CHANGELOG
3d18c9c1c6 'xfail' markers without a condition no longer rely on the underlying `Item` deriving from `PyobjMixin`
a9193a1531 No longer silently ignore errors in parametrize callable ids
78f03888f4 Merge pull request #2168 from jwilk/spelling
03a7a2cd3e Fix typos
964ccb93bb Merge pull request #2163 from nicoddemus/merge-master-into-features
402fbe503a Merge branch 'master' into merge-master-into-features
7592c5b491 Sort issues and user references in CHANGELOG
091148f843 Merge pull request #2136 from hroncok/i2132
718f0b0255 Merge pull request #2130 from malinoff/fix-2129
b4295aa19e Merge pull request #2144 from sscherfke/patch-1
7d259401cd Merge pull request #2161 from nicoddemus/silence-trial-on-ci
515fb09995 Move module error compatibility code to _pytest.compat
088b742d40 Merge pull request #2149 from pelme/issue2148
6b24ce2a9d Test Python 3.6 on Travis CI
1680eeb3a3 Tests: Check for ModuleNotFoundError on Python 3.6+
0bb8a4a36d Fixed #2148 - parse directory names properly when args contains ::.
f7a1d369c3 Allow trial environments to fail on CI for now
316406291d Merge pull request #2150 from lesteve/add-caught-warnings-info-when-warns-fail
a27c824fd0 Merge pull request #2146 from lwm/minor-docs-fixup
fc74eb332b Merge pull request #2128 from nicoddemus/pytest-m
bfada968d3 Update AUTHORS and CHANGELOG.rst
c5f0b751f4 Improve error message when pytest.warns fail
a63b34c685 Switch to item fspath
f94189b48b Fix wrong fixture name. Closes #2143.
3f5edc705a Explicitly add setuptools to install_requires
caee5ce489 Avoid importing asyncio directly because that in turn initializes logging (#8)
1312b83866 Add CHANGELOG entry for #2129
45eb9b566c Move compat tests to a single file using testdir
3a59acf69f Use inspect to properly detect generators. Fixes #2129
81c9bdcd0b Mention that Python also adds CWD to sys.path using python -m
522d59e844 Use session.config.hook instead of ihook. Fixes #2124
da40bcf97f Merge pull request #2119 from nicoddemus/changelog-dates
a4a30ae4a2 Merge pull request #2123 from oscarh/documentation-issue-687
f42a954cb3 Also update yield teardown for Issue #687
9c285dfc1d fix #2118 - rework Node._getcustomclass and Node compat properties
8afca5d0fa Add release dates to CHANGELOG entry
3a0a1d2de3 Bump version to 3.0.6.dev0
6a52afc8c9 Merge pull request #2116 from nicoddemus/release-3.0.5
f592c7746a Regendocs for 3.0.5
31f114e51f Add release announcement for 3.0.5
833acb9d3c Finalize CHANGELOG for 3.0.5
0febd855e1 Bump version to 3.0.5
3c81f83602 Merge pull request #2113 from nicoddemus/approx-repr-unicode
57c4489916 Use a simple ``+-`` ASCII string in the string representation of pytest.approx In Python 2
5365f7c9ca Merge pull request #2112 from ismail-s/patch-1
1f0401ab62 Fix minor typo
7480342710 Fix typo in docstring of register_assert_rewrite
db62f160e1 Merge pull request #2073 from nicoddemus/fix-hookproxy-cache
81528ea81f Remove hook proxy cache
64193add91 Merge pull request #2110 from nicoddemus/rewrite-warning-pytest-plugins
bc0f7e6243 Fix false-positive assert rew…