|  Thomas Hisch | 0ce8b910ca | Only call _setup_cli_logging in __init__ Supersedes #4719 | 2019-02-06 07:03:40 +01:00 | 
				
					
						|  Ronny Pfannschmidt | a9457345ee | Merge pull request #4715 from nicoddemus/fix-changelog-typo Fix typo in CHANGELOG | 2019-02-04 13:53:48 +01:00 | 
				
					
						|  Bruno Oliveira | 726e165932 | Fix typo in CHANGELOG | 2019-02-04 08:38:48 -02:00 | 
				
					
						|  Anthony Sottile | 2264db7f4a | Merge pull request #4682 from arel/parameterize-conditional-raises-document-only Document parametrizing conditional raises | 2019-02-02 13:15:26 -08:00 | 
				
					
						|  Arel Cordero | 7ec1a1407a | Incorporating feedback from asottile | 2019-02-02 01:57:17 +00:00 | 
				
					
						|  Bruno Oliveira | 7dbe40092d | Merge pull request #4703 from nicoddemus/setup-class-inheritance-4700 Fix setUpClass being called in subclasses that were skipped | 2019-02-01 16:32:27 -02:00 | 
				
					
						|  Bruno Oliveira | e53563ebbe | Merge pull request #4706 from hackebrot/add-xfail-note-to-4.2.0-changelog Update changelog to reflect spelling change of xfail | 2019-02-01 10:35:46 -02:00 | 
				
					
						|  Raphael Pierzina | c2c9b27771 | Update changelog to reflect spelling change of xfail in teststatus report Resolve #4705 | 2019-02-01 13:15:35 +01:00 | 
				
					
						|  Bruno Oliveira | c3d7340542 | Fix setUpClass being called in subclasses that were skipped Fix #4700 | 2019-01-31 20:24:11 -02:00 | 
				
					
						|  Bruno Oliveira | 7dcd9bf5ad | Merge pull request #4696 from nicoddemus/release-4.2.0 Release 4.2.0 | 2019-01-30 19:37:00 -02:00 | 
				
					
						|  Bruno Oliveira | fa979a4290 | Preparing release version 4.2.0 | 2019-01-30 14:25:38 -02:00 | 
				
					
						|  Bruno Oliveira | e2a15c79e7 | Merge pull request #4692 from nicoddemus/merge-master-into-features Merge master into features | 2019-01-30 14:16:09 -02:00 | 
				
					
						|  Bruno Oliveira | 02962fabda | Merge remote-tracking branch 'upstream/features' into merge-master-into-features | 2019-01-30 09:37:46 -02:00 | 
				
					
						|  Bruno Oliveira | b77d168d58 | Merge remote-tracking branch 'upstream/master' into merge-master-into-features | 2019-01-30 09:37:29 -02:00 | 
				
					
						|  Bruno Oliveira | c0e6543b5a | Fix pytest_report_teststatus call to pass new config object (#4691) | 2019-01-30 09:36:54 -02:00 | 
				
					
						|  Bruno Oliveira | b96e162131 | Merge pull request #4693 from asottile/flake8_3_7_0 fixes for flake8 3.7 | 2019-01-30 09:18:09 -02:00 | 
				
					
						|  Bruno Oliveira | 1dc16ad77b | Merge pull request #4690 from nicoddemus/deprecated-python-summary Show deprecation message when running under Python 2.7 and 3.4 | 2019-01-30 09:07:59 -02:00 | 
				
					
						|  Anthony Sottile | acece23697 | pre-commit autoupdate | 2019-01-29 21:13:32 -08:00 | 
				
					
						|  Anthony Sottile | e5f823a3a7 | fixes for flake8 3.7 | 2019-01-29 21:11:15 -08:00 | 
				
					
						|  Bruno Oliveira | b41dc03930 | Merge pull request #4691 from nicoddemus/config-terminal-summary-hook Add config to pytest_terminal_summary hook | 2019-01-29 21:11:37 -02:00 | 
				
					
						|  Bruno Oliveira | ade5f2c8c5 | Merge remote-tracking branch 'upstream/master' into merge-master-into-features | 2019-01-29 19:36:56 -02:00 | 
				
					
						|  Bruno Oliveira | 3e0e819158 | Merge pull request #4280 from blueyed/trace-quit pdb: improve quitting from debugger | 2019-01-29 19:14:20 -02:00 | 
				
					
						|  Bruno Oliveira | eb92e57509 | Show deprecation message when running under Python 2.7 and 3.4 Fix #4627 | 2019-01-29 19:02:41 -02:00 | 
				
					
						|  Bruno Oliveira | 7ad499ad76 | Merge pull request #4681 from RonnyPfannschmidt/fix-4680-tmppath-is-tmpdir Fix 4680 - `tmp_path` and `tmpdir` now share the same temporary directory | 2019-01-29 19:00:56 -02:00 | 
				
					
						|  Ronny Pfannschmidt | 2d7582bd92 | flip around basetemp folder reset to see if it  helps on windows | 2019-01-29 18:58:00 +01:00 | 
				
					
						|  Bruno Oliveira | 7e8e593a45 | Add CHANGELOG entry for #4691 | 2019-01-29 15:52:45 -02:00 | 
				
					
						|  Bruno Oliveira | 6c3b86369f | Add config to pytest_terminal_summary hook The docs stated that this hook got the 'config' parameter in 3.5, but the docs
wre probably changed by mistake. | 2019-01-29 15:41:13 -02:00 | 
				
					
						|  Bruno Oliveira | 6aba60ab08 | Merge pull request #4688 from nicoddemus/add-config-to-hooks Add config to pytest_report_teststatus | 2019-01-28 21:45:58 -02:00 | 
				
					
						|  Bruno Oliveira | d720312df0 | Add CHANGELOG entry for #4688 | 2019-01-28 19:03:19 -02:00 | 
				
					
						|  Bruno Oliveira | 5b09eb1d74 | Add config parameter to pytest_report_teststatus hook | 2019-01-28 19:00:50 -02:00 | 
				
					
						|  Bruno Oliveira | 5119abe498 | Merge pull request #4683 from nicoddemus/skip-unicode Handle unittest.SkipTest exception with non-ascii characters | 2019-01-28 15:50:53 -02:00 | 
				
					
						|  Bruno Oliveira | 1c5009c3fb | Handle unittest.SkipTest exception with non-ascii characters Fix #4669 | 2019-01-28 12:50:04 -02:00 | 
				
					
						|  Arel Cordero | 8a1afe4213 | Including note on using nullcontext in Python 3.7+ | 2019-01-28 13:31:08 +00:00 | 
				
					
						|  Arel Cordero | fd4289dae0 | Adding `does_not_raise` to documentation only | 2019-01-27 16:42:10 +00:00 | 
				
					
						|  Arel Cordero | 977adf1354 | Improving sphinx docs based on feedback | 2019-01-27 16:41:23 +00:00 | 
				
					
						|  Arel Cordero | c1fe07276c | Adding changelog entries for `does_not_raise` | 2019-01-27 16:41:10 +00:00 | 
				
					
						|  Arel Cordero | c166b80a8c | Documenting raises/does_not_raise + parametrize | 2019-01-27 16:40:49 +00:00 | 
				
					
						|  Arel Cordero | afe9fd5ffd | Adds `does_not_raise` context manager Addressing issues #4324 and #1830 | 2019-01-27 16:40:35 +00:00 | 
				
					
						|  Ronny Pfannschmidt | 5567c772cd | quick&dirty fix fixture tests that rely on tmppath fixture structure | 2019-01-27 14:19:23 +01:00 | 
				
					
						|  Ronny Pfannschmidt | c75bd08807 | ensure tmp_path is always a realpath | 2019-01-27 14:08:43 +01:00 | 
				
					
						|  Ronny Pfannschmidt | f7d7555521 | fix #4680 - ensure tmpdir and tmp_path are the same | 2019-01-27 13:05:34 +01:00 | 
				
					
						|  Anthony Sottile | 16f8cdac95 | Merge pull request #4678 from nicoddemus/raises-docs Improve pytest.raises 'message' deprecation docs | 2019-01-26 19:01:21 -08:00 | 
				
					
						|  Bruno Oliveira | 9905a73ae0 | Merge pull request #4511 from jhunkeler/junit-strict Toggle JUnit behavior with INI option | 2019-01-24 20:54:32 -02:00 | 
				
					
						|  Bruno Oliveira | 51dd738b1a | Merge pull request #4673 from kown7/count-tests Count tests | 2019-01-24 20:46:29 -02:00 | 
				
					
						|  Bruno Oliveira | 067f2c6148 | Improve pytest.raises 'message' deprecation docs Based on recent discussions in #3974 | 2019-01-24 20:41:18 -02:00 | 
				
					
						|  Kristoffer Nordstroem | e2cd2cd409 | vanity commit | 2019-01-24 23:18:21 +01:00 | 
				
					
						|  Bruno Oliveira | 37aab5dd6b | Add CHANGELOG entry for #4660 | 2019-01-24 20:07:21 -02:00 | 
				
					
						|  Bruno Oliveira | 7ddfc04793 | Merge pull request #4665 from nicoddemus/group-warnings-by-message Group warnings by message instead of by test id | 2019-01-24 20:00:27 -02:00 | 
				
					
						|  Bruno Oliveira | 7b10474fed | Merge pull request #4668 from wimglenn/issues/4667 short report summary to use report teststatus data | 2019-01-24 19:59:52 -02:00 | 
				
					
						|  wim glenn | 8cf097635e | Fixed one weird test that creates a class instead of using mocks.. ¯\_(ツ)_/¯ | 2019-01-24 12:59:36 -06:00 |