Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								e393a73890
								
							
						 | 
						
							
							
								
								Small change to test if pushing directly to master is disabled
							
							
							
							
							
						 | 
						
							2019-05-24 12:11:15 -03:00 | 
						
					
				
					
						
							
							
								 
								Thomas Hisch
							
						 | 
						
							
							
							
							
							
								
							
							
								bed3918cbc
								
							
						 | 
						
							
							
								
								Revert "logging: Simple impl of multline pretty printing"
							
							
							
							
							
							
							
							This reverts commit 31dfbb4668. 
							
						 | 
						
							2019-05-24 09:11:03 +02:00 | 
						
					
				
					
						
							
							
								 
								Thomas Hisch
							
						 | 
						
							
							
							
							
							
								
							
							
								31dfbb4668
								
							
						 | 
						
							
							
								
								logging: Simple impl of multline pretty printing
							
							
							
							
							
						 | 
						
							2019-05-24 09:09:09 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								b4d75ad31d
								
							
						 | 
						
							
							
								
								Merge pull request #5091 from blueyed/showhelp-ini-options
							
							
							
							
							
							
							
							Improve output of ini options in --help 
							
						 | 
						
							2019-05-23 21:10:43 -03:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								ec6d0fa4d7
								
							
						 | 
						
							
							
								
								Merge pull request #5268 from blueyed/harden-test
							
							
							
							
							
							
							
							tests: harden test_nonascii_text 
							
						 | 
						
							2019-05-24 01:51:35 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								fa8a658458
								
							
						 | 
						
							
							
								
								Merge pull request #4908 from blueyed/pdb-pm-enter-hook
							
							
							
							
							
							
							
							pdb: trigger pytest_enter_pdb hook with post-mortem 
							
						 | 
						
							2019-05-24 01:50:24 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								66f20b6f5e
								
							
						 | 
						
							
							
								
								Fix invalid Python file encoding "utf8" (#5252)
							
							
							
							
							
							
							
							Fix invalid Python file encoding "utf8" 
							
						 | 
						
							2019-05-23 20:24:23 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								6ba5e3c071
								
							
						 | 
						
							
							
								
								tests: fix test_trace_after_runpytest (#5245)
							
							
							
							
							
							
							
							tests: fix test_trace_after_runpytest 
							
						 | 
						
							2019-05-23 19:58:33 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								b900b4155f
								
							
						 | 
						
							
							
								
								importorskip: display/include ImportError (#5269)
							
							
							
							
							
							
							
							importorskip: display/include ImportError 
							
						 | 
						
							2019-05-23 19:25:34 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								364ae5d723
								
							
						 | 
						
							
							
								
								changelog: Fix typo (#5304)
							
							
							
							
							
							
							
							changelog: Fix typo 
							
						 | 
						
							2019-05-23 14:16:49 -03:00 | 
						
					
				
					
						
							
							
								 
								David Röthlisberger
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								84c7fef836
								
							
						 | 
						
							
							
								
								changelog: Fix typo
							
							
							
							
							
						 | 
						
							2019-05-23 16:48:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								aaea4e52ef
								
							
						 | 
						
							
							
								
								Fix whitespace in FUNDING.yml
							
							
							
							
							
						 | 
						
							2019-05-23 12:44:55 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								0cacdadc97
								
							
						 | 
						
							
							
								
								Create FUNDING.yml
							
							
							
							
							
							
							
							Following instructions from:
* https://tidelift.com/subscription/how-to-connect-tidelift-with-github
* https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository#displaying-a-sponsor-button-in-your-repository 
							
						 | 
						
							2019-05-23 12:36:46 -03:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								6c56070df1
								
							
						 | 
						
							
							
								
								Merge pull request #5278 from blueyed/disable-python-plugin
							
							
							
							
							
							
							
							Allow disabling of python plugin 
							
						 | 
						
							2019-05-23 15:52:19 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								f9f41e69a8
								
							
						 | 
						
							
							
								
								reportopts: A: put "Pp" in front
							
							
							
							
							
						 | 
						
							2019-05-23 09:40:16 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								b2ce6f3200
								
							
						 | 
						
							
							
								
								Improve output of ini options in --help
							
							
							
							
							
							
							
							Do not cut long help texts, but wrap them the same way as argparse wraps
the other help items. 
							
						 | 
						
							2019-05-23 09:33:07 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								e0b584d048
								
							
						 | 
						
							
							
								
								CaptureFixture: do not crash in _suspend when not started
							
							
							
							
							
							
							
							This happened in test_pdb_with_caplog_on_pdb_invocation. 
							
						 | 
						
							2019-05-23 09:09:53 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								a0ff5deabf
								
							
						 | 
						
							
							
								
								pdb: trigger pytest_enter_pdb hook with post-mortem
							
							
							
							
							
							
							
							This is required for pytest-pdb to be called with `--pdb`.
TODO:
- [ ] test
- [ ] pass mode to hook, e.g. "post_mortem" in this case? 
							
						 | 
						
							2019-05-23 09:09:53 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								97b85a17ae
								
							
						 | 
						
							
							
								
								changelog [ci skip]
							
							
							
							
							
						 | 
						
							2019-05-23 08:38:54 +02:00 | 
						
					
				
					
						
							
							
								 
								Anthony Sottile
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								de7ba5958b
								
							
						 | 
						
							
							
								
								Merge pull request #5294 from akiomik/fix-disable_test_id_escaping-option
							
							
							
							
							
							
							
							Fix `disable_test_id_escaping_and_forfeit_all_rights_to_community_support` option when using a list of test IDs 
							
						 | 
						
							2019-05-21 15:14:45 -07:00 | 
						
					
				
					
						
							
							
								 
								Akiomi Kamakura
							
						 | 
						
							
							
							
							
							
								
							
							
								8a498700da
								
							
						 | 
						
							
							
								
								Add tests for #5286
							
							
							
							
							
						 | 
						
							2019-05-22 03:56:52 +09:00 | 
						
					
				
					
						
							
							
								 
								Anthony Sottile
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								45c894b73f
								
							
						 | 
						
							
							
								
								Merge pull request #5297 from nicoddemus/tidelift-contents
							
							
							
							
							
							
							
							Add link to tidelift to the main docs 
							
						 | 
						
							2019-05-21 08:18:07 -07:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								65342db7a4
								
							
						 | 
						
							
							
								
								Update fixture.rst (#5295)
							
							
							
							
							
							
							
							Update fixture.rst 
							
						 | 
						
							2019-05-21 11:57:15 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								d391274f39
								
							
						 | 
						
							
							
								
								Add link to tidelift to the main docs
							
							
							
							
							
							
							
							As commented in:
https://github.com/pytest-dev/pytest/pull/5240#issuecomment-494175451 
							
						 | 
						
							2019-05-21 11:12:07 -03:00 | 
						
					
				
					
						
							
							
								 
								oleg-yegorov
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								c5fa1d1c3e
								
							
						 | 
						
							
							
								
								Update fixture.rst
							
							
							
							
							
							
							
							add a missing import 
							
						 | 
						
							2019-05-21 09:40:31 +03:00 | 
						
					
				
					
						
							
							
								 
								Akiomi Kamakura
							
						 | 
						
							
							
							
							
							
								
							
							
								a304dbb519
								
							
						 | 
						
							
							
								
								Fix `disable_test_id_escaping_and_forfeit_all_rights_to_community_support` option when using a list of test IDs
							
							
							
							
							
						 | 
						
							2019-05-21 09:48:22 +09:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								d19df5efa2
								
							
						 | 
						
							
							
								
								importorskip: display/include ImportError
							
							
							
							
							
							
							
							This can provide useful information, e.g.
> could not import 'pyrepl.readline': curses library not found 
							
						 | 
						
							2019-05-20 14:13:33 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								6663cb054c
								
							
						 | 
						
							
							
								
								Fix documentation of pytest.raises(match=...) (#5288)
							
							
							
							
							
							
							
							Fix documentation of pytest.raises(match=...) 
							
						 | 
						
							2019-05-19 12:29:02 -03:00 | 
						
					
				
					
						
							
							
								 
								Tim Hoffmann
							
						 | 
						
							
							
							
							
							
								
							
							
								b27e40cbf1
								
							
						 | 
						
							
							
								
								Fix documentation of pytest.raises(match=...)
							
							
							
							
							
						 | 
						
							2019-05-19 16:01:48 +02:00 | 
						
					
				
					
						
							
							
								 
								Anthony Sottile
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								ee52a8a5f8
								
							
						 | 
						
							
							
								
								Merge pull request #5287 from clickthisnick/chore-fix-misspellings
							
							
							
							
							
							
							
							Fix one misspelling in changelog 
							
						 | 
						
							2019-05-18 15:30:35 -07:00 | 
						
					
				
					
						
							
							
								 
								MyComputer
							
						 | 
						
							
							
							
							
							
								
							
							
								8f04bd003c
								
							
						 | 
						
							
							
								
								Fix misspellings
							
							
							
							
							
						 | 
						
							2019-05-18 17:11:23 -04:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								93fd9debe3
								
							
						 | 
						
							
							
								
								Allow disabling of python plugin
							
							
							
							
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/5277. 
							
						 | 
						
							2019-05-17 18:17:14 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								ff428bfee1
								
							
						 | 
						
							
							
								
								tests: harden test_nonascii_text
							
							
							
							
							
						 | 
						
							2019-05-17 18:06:32 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								0f7c7a99bf
								
							
						 | 
						
							
							
								
								Merge pull request #5281 from nicoddemus/merge-master-into-features
							
							
							
							
							
							
							
							Merge master into features (make CI green again) 
							
						 | 
						
							2019-05-17 16:58:16 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								041ea3704b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features
							
							
							
							
							
						 | 
						
							2019-05-16 20:10:44 -03:00 | 
						
					
				
					
						
							
							
								 
								Anthony Sottile
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								d94b4b031f
								
							
						 | 
						
							
							
								
								Merge pull request #5271 from nicoddemus/lone-surrogate-jython-5256
							
							
							
							
							
							
							
							Handle lone surrogate unicode character not being representable in Jython 
							
						 | 
						
							2019-05-16 15:02:08 -07:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								e253029ad0
								
							
						 | 
						
							
							
								
								Handle lone surrogate unicode character not being representable in Jython
							
							
							
							
							
							
							
							No tests for this because we don't test with Jython currently.
Fix #5256 
							
						 | 
						
							2019-05-16 17:59:31 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								43617a8c47
								
							
						 | 
						
							
							
								
								Disable PyPy on Azure (#5274)
							
							
							
							
							
							
							
							Disable PyPy on Azure 
							
						 | 
						
							2019-05-16 17:57:32 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								56bf7446f6
								
							
						 | 
						
							
							
								
								Disable pypy2 and pypy3 on Azure [travis skip]
							
							
							
							
							
							
							
							Related to #5279 
							
						 | 
						
							2019-05-16 12:20:17 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								8e42c5b7db
								
							
						 | 
						
							
							
								
								Make it clear that small typos in docs don't require a CHANGELOG entry (#5276)
							
							
							
							
							
							
							
							Make it clear that small typos in docs don't require a CHANGELOG entry 
							
						 | 
						
							2019-05-16 12:15:15 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								0571e1ee8e
								
							
						 | 
						
							
							
								
								Make it clear that small typos in docs don't require a CHANGELOG entry
							
							
							
							
							
							
							
							From: https://github.com/pytest-dev/pytest/pull/5273#issuecomment-493076587 
							
						 | 
						
							2019-05-16 10:54:50 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								b0a6161d41
								
							
						 | 
						
							
							
								
								Fixed double `be` word on monkeypatch docs page. (#5273)
							
							
							
							
							
							
							
							Fixed double `be` word on monkeypatch docs page. 
							
						 | 
						
							2019-05-16 10:53:08 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								06fa2bc0b8
								
							
						 | 
						
							
							
								
								Re-enable pypy3 to see how it fares on Azure
							
							
							
							
							
						 | 
						
							2019-05-16 08:10:53 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								8abd4aec6e
								
							
						 | 
						
							
							
								
								Remove customization of (python.exe) from Azure [skip travis]
							
							
							
							
							
							
							
							This is no longer needed it seems 
							
						 | 
						
							2019-05-16 08:07:59 -03:00 | 
						
					
				
					
						
							
							
								 
								Nikita Krokosh
							
						 | 
						
							
							
							
							
							
								
							
							
								858010e214
								
							
						 | 
						
							
							
								
								Fixed double `be` word on monkeypatch docs page.
							
							
							
							
							
						 | 
						
							2019-05-16 18:22:41 +10:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								96424272a1
								
							
						 | 
						
							
							
								
								Improve mark docs (#5265)
							
							
							
							
							
							
							
							Improve mark docs 
							
						 | 
						
							2019-05-15 20:52:21 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								e44a2ef653
								
							
						 | 
						
							
							
								
								Apply suggestions from code review
							
							
							
							
							
							
							
							Co-Authored-By: Daniel Hahler <github@thequod.de> 
							
						 | 
						
							2019-05-15 20:45:22 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								c6e3ff3ce5
								
							
						 | 
						
							
							
								
								Mention "-m" in the main mark docs
							
							
							
							
							
						 | 
						
							2019-05-15 20:45:22 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								a31098a74e
								
							
						 | 
						
							
							
								
								Move section about mark revamp and iteration to historical notes
							
							
							
							
							
							
							
							This has been in place for a long time now, since 3.6. 
							
						 | 
						
							2019-05-15 20:45:22 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								7e8044f9b8
								
							
						 | 
						
							
							
								
								Revamp the mark section in the docs
							
							
							
							
							
							
							
							Add an introductory section about how to register marks,
including doing so programatically (#5255). 
							
						 | 
						
							2019-05-15 20:45:22 -03:00 |