Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e6ea9edffe 
								
							 
						 
						
							
							
								
								Merge pull request  #6673  from sscherfke/features  
							
							 
							
							... 
							
							
							
							Reverse / fix meaning of "+/-" in error diffs 
							
						 
						
							2020-02-12 15:05:38 -03:00  
						
					 
				
					
						
							
							
								 
								Stefan Scherfke
							
						 
						
							 
							
							
							
							
								
							
							
								d59adc61f9 
								
							 
						 
						
							
							
								
								Reverse / fix meaning of "+/-" in error diffs  
							
							 
							
							... 
							
							
							
							The convention is "assert result is expected".  Pytest's error diffs now
reflect this. "-" means that sth. expected is missing in the result and
"+" means that there are unexpected extras in the result.
Fixes : #3333  
							
						 
						
							2020-02-10 21:12:37 +01:00  
						
					 
				
					
						
							
							
								 
								Vladyslav Rachek
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9e262038c8 
								
							 
						 
						
							
							
								
								[parametrize] enforce explicit argnames declaration ( #6330 )  
							
							 
							
							... 
							
							
							
							Every argname used in `parametrize` either must
be declared explicitly in the python test function, or via
`indirect` list
Fix  #5712  
							
						 
						
							2020-02-06 20:20:25 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								b5b6e051ed 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							 
							
							
							
						 
						
							2020-01-30 02:29:02 +01:00  
						
					 
				
					
						
							
							
								 
								sdementen
							
						 
						
							 
							
							
							
							
								
							
							
								d848a20563 
								
							 
						 
						
							
							
								
								Extend the incremental marker for parametrize  
							
							 
							
							... 
							
							
							
							The incremental marker is adapted to handle properly test classes with parametrize defined at class level.
Fix  #3125  
							
						 
						
							2020-01-29 08:25:17 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								09bdbffbde 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							 
							
							... 
							
							
							
							Conflicts:
	src/_pytest/_code/code.py
	src/_pytest/main.py 
							
						 
						
							2020-01-24 23:44:50 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								b63cb18776 
								
							 
						 
						
							
							
								
								doc: remove costlysetup example  
							
							 
							
							... 
							
							
							
							It is not included with docs, and
`example/costlysetup/sub_a/test_quick.py::test_quick` sleeps for 5s,
slowing down `doctesting` unnecessarily. 
							
						 
						
							2020-01-23 12:23:30 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								93b74d28d2 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into mm  
							
							 
							
							... 
							
							
							
							Conflicts:
 * 	src/_pytest/_code/code.py
 * 	src/_pytest/main.py
 * 	testing/python/metafunc.py
 * 	testing/test_parseopt.py
 * 	testing/test_pytester.py 
							
						 
						
							2020-01-22 11:03:45 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								6a26ac4125 
								
							 
						 
						
							
							
								
								Preparing release version 5.3.4  
							
							 
							
							
							
						 
						
							2020-01-20 13:53:31 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								56dc301c50 
								
							 
						 
						
							
							
								
								Preparing release version 5.3.3  
							
							 
							
							
							
						 
						
							2020-01-16 18:55:41 -05:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								853889e5db 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into mm  
							
							 
							
							
							
						 
						
							2019-12-14 10:45:44 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								10fcac7f90 
								
							 
						 
						
							
							
								
								Preparing release version 5.3.2  
							
							 
							
							
							
						 
						
							2019-12-13 08:51:15 -03:00  
						
					 
				
					
						
							
							
								 
								Christoph Bülter
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								623b3982b0 
								
							 
						 
						
							
							
								
								Update doc/en/example/markers.rst  
							
							 
							
							... 
							
							
							
							Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com> 
							
						 
						
							2019-12-05 16:59:08 +01:00  
						
					 
				
					
						
							
							
								 
								Christoph Buelter
							
						 
						
							 
							
							
							
							
								
							
							
								ac5929eef3 
								
							 
						 
						
							
							
								
								Update docs about case-insensitive expression matching  
							
							 
							
							
							
						 
						
							2019-12-05 14:13:22 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								59f95b7f59 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into mm  
							
							 
							
							
							
						 
						
							2019-12-03 11:07:34 -03:00  
						
					 
				
					
						
							
							
								 
								Ran Benita
							
						 
						
							 
							
							
							
							
								
							
							
								d2d7b97a70 
								
							 
						 
						
							
							
								
								Remove outdated py2py3 example  
							
							 
							
							
							
						 
						
							2019-12-02 21:16:15 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								05008f6b55 
								
							 
						 
						
							
							
								
								Preparing release version 5.3.1  
							
							 
							
							
							
						 
						
							2019-11-25 14:32:37 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								15ffe63204 
								
							 
						 
						
							
							
								
								update  doc examples **untested**  
							
							 
							
							
							
						 
						
							2019-11-23 21:54:11 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4b16b93cf5 
								
							 
						 
						
							
							
								
								Preparing release version 5.3.0  
							
							 
							
							
							
						 
						
							2019-11-19 12:43:51 -03:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								c9a96cdee8 
								
							 
						 
						
							
							
								
								Preparing release version 5.2.4  
							
							 
							
							
							
						 
						
							2019-11-15 13:26:56 -08:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e856638ba0 
								
							 
						 
						
							
							
								
								Preparing release version 5.2.3 ( #6190 )  
							
							 
							
							... 
							
							
							
							Preparing release version 5.2.3 
							
						 
						
							2019-11-14 18:17:28 -03:00  
						
					 
				
					
						
							
							
								 
								Michael Shields
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								bd68c2a3dc 
								
							 
						 
						
							
							
								
								Update advice about _called_from_test.  
							
							 
							
							... 
							
							
							
							Instead of giving an example of using sys and then, at the end,
advising not to use sys, just give a correct example. This is
especially helpful since mypy 0.740 has started (correctly) complaining
about sys._called_from_pytest not being present. 
							
						 
						
							2019-11-14 19:44:27 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5e8c47faad 
								
							 
						 
						
							
							
								
								Preparing release version 5.2.3  
							
							 
							
							
							
						 
						
							2019-11-14 11:12:06 -03:00  
						
					 
				
					
						
							
							
								 
								Albert Tugushev
							
						 
						
							 
							
							
							
							
								
							
							
								18786992bb 
								
							 
						 
						
							
							
								
								Update doc to use contextlib2.nullcontext  
							
							 
							
							... 
							
							
							
							nullcontext has been backported in contextlib2==0.6.0 
							
						 
						
							2019-10-19 15:09:37 +07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								068ef90b92 
								
							 
						 
						
							
							
								
								Preparing release version 5.2.0  
							
							 
							
							
							
						 
						
							2019-09-28 21:18:37 -04:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								409cc2946a 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							 
							
							
							
						 
						
							2019-09-21 16:22:48 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1a9f4a51cb 
								
							 
						 
						
							
							
								
								Preparing release version 5.1.3  
							
							 
							
							
							
						 
						
							2019-09-18 10:11:59 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								6918d07560 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into aklajnert/1682-dynamic-scope  
							
							 
							
							
							
						 
						
							2019-09-18 07:44:18 -03:00  
						
					 
				
					
						
							
							
								 
								aklajnert
							
						 
						
							 
							
							
							
							
								
							
							
								10bf6aac76 
								
							 
						 
						
							
							
								
								Implemented the dynamic scope feature.  
							
							 
							
							
							
						 
						
							2019-08-31 18:12:24 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								e56544cb58 
								
							 
						 
						
							
							
								
								Preparing release version 5.1.2  
							
							 
							
							
							
						 
						
							2019-08-30 12:43:47 -03:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								b135f5af8d 
								
							 
						 
						
							
							
								
								Preparing release version 5.1.1  
							
							 
							
							
							
						 
						
							2019-08-20 11:30:36 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								eaf7ce9a99 
								
							 
						 
						
							
							
								
								Preparing release version 5.1.0  
							
							 
							
							
							
						 
						
							2019-08-15 20:00:09 -04:00  
						
					 
				
					
						
							
							
								 
								mei-li
							
						 
						
							 
							
							
							
							
								
							
							
								f4a84a8dfd 
								
							 
						 
						
							
							
								
								reword a parametrize example sentence  
							
							 
							
							
							
						 
						
							2019-08-15 18:12:18 +02:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								3eb4973065 
								
							 
						 
						
							
							
								
								remove %s formatting from docs  
							
							 
							
							
							
						 
						
							2019-08-12 00:09:53 -06:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								7560a7b808 
								
							 
						 
						
							
							
								
								trivial doc change  
							
							 
							
							
							
						 
						
							2019-08-07 21:49:30 -06:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								78de9d4677 
								
							 
						 
						
							
							
								
								replace implicit code tag with colon .replace("::\n\n.. code-block", ":\n\n.. code-block")  
							
							 
							
							
							
						 
						
							2019-08-06 16:20:06 -07:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								23a0b532db 
								
							 
						 
						
							
							
								
								Revert "remove implicit code tags .replace("::\n\n.. code-block", "\n\n.. code-block")"  
							
							 
							
							... 
							
							
							
							This reverts commit 9fce0bdd88 . 
							
						 
						
							2019-08-06 16:18:06 -07:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								9fce0bdd88 
								
							 
						 
						
							
							
								
								remove implicit code tags .replace("::\n\n.. code-block", "\n\n.. code-block")  
							
							 
							
							
							
						 
						
							2019-08-06 15:46:57 -07:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								5f95dce956 
								
							 
						 
						
							
							
								
								ran blacken-docs  
							
							 
							
							
							
						 
						
							2019-08-06 13:34:58 -07:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								75d0b899bb 
								
							 
						 
						
							
							
								
								ran pyupgrade-docs again  
							
							 
							
							
							
						 
						
							2019-08-06 13:33:21 -07:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								7f90e74e02 
								
							 
						 
						
							
							
								
								label code blocks  
							
							 
							
							
							
						 
						
							2019-08-06 13:25:54 -07:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								cf7761f91f 
								
							 
						 
						
							
							
								
								ran pyupgrade-docs  
							
							 
							
							
							
						 
						
							2019-08-06 12:40:27 -07:00  
						
					 
				
					
						
							
							
								 
								Xixi Zhao
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								2959fb3198 
								
							 
						 
						
							
							
								
								Doc fix: remove redundant parentheses.  
							
							 
							
							
							
						 
						
							2019-07-30 16:18:22 +08:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f163b37f6a 
								
							 
						 
						
							
							
								
								Run regen  
							
							 
							
							
							
						 
						
							2019-07-23 10:00:35 -04:00  
						
					 
				
					
						
							
							
								 
								Wojtek Erbetowski
							
						 
						
							 
							
							
							
							
								
							
							
								d23fbab188 
								
							 
						 
						
							
							
								
								Add autouse fixture order information ( #3404 ).  
							
							 
							
							... 
							
							
							
							A case with a fixture use both as an autouse and explititly
was raised. This case sounds too narrow to add to documentation
(and could be misleading for people learning pytest with explicitely
using an autouse fixture). At the same time there was no documentation
on the autouse vs regular fixture order, therefore this commit adds
such an information. Code sample grew and it was extracted to the file. 
							
						 
						
							2019-07-13 11:43:47 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								bb29f31d22 
								
							 
						 
						
							
							
								
								Preparing release version 5.0.1  
							
							 
							
							
							
						 
						
							2019-07-04 20:01:16 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Moore
							
						 
						
							 
							
							
							
							
								
							
							
								1b0e8d73d5 
								
							 
						 
						
							
							
								
								Substituted 'yml' to '.yaml' in relevant files  
							
							 
							
							
							
						 
						
							2019-07-02 23:49:06 -07:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								58bfc7736f 
								
							 
						 
						
							
							
								
								Use shutil.which to avoid distutils+imp warning  
							
							 
							
							
							
						 
						
							2019-06-28 14:44:49 -07:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								55d2fe076f 
								
							 
						 
						
							
							
								
								Use importlib instead of imp in demo  
							
							 
							
							
							
						 
						
							2019-06-28 14:40:10 -07:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								fd2f320485 
								
							 
						 
						
							
							
								
								Preparing release version 5.0.0  
							
							 
							
							
							
						 
						
							2019-06-28 14:39:53 -07:00