b5a94d8e6c 
								
							 
						 
						
							
							
								
								Write rewritten code using file.write(marshal.dumps())  
							
							... 
							
							
							
							This works around the fact that some libraries might monkey patch
the file object, so the previous approach of marshal.dump(co, file)
breaks because file is not a built-in file object anymore.
Fix  #3503  
							
						 
						
							2018-05-25 17:24:23 -03:00  
				
					
						
							
							
								 
						
							
								65bc43dc56 
								
							 
						 
						
							
							
								
								Merge pull request  #3505  from Avira/tox-lowercase  
							
							... 
							
							
							
							Fix tox spelling (all lower case). 
							
						 
						
							2018-05-25 17:07:12 -03:00  
				
					
						
							
							
								 
						
							
								c55635d42a 
								
							 
						 
						
							
							
								
								Fix tox spelling (all lower case).  
							
							
							
						 
						
							2018-05-25 09:54:03 +02:00  
				
					
						
							
							
								 
						
							
								93fdad28aa 
								
							 
						 
						
							
							
								
								Merge pull request  #3499  from jeffreyrack/3491-junit-logging  
							
							... 
							
							
							
							3491 - Fixed a bug where stdout and stderr were logged twice by junitxml for xfail tests. 
							
						 
						
							2018-05-24 20:50:16 -03:00  
				
					
						
							
							
								 
						
							
								48215fdcb9 
								
							 
						 
						
							
							
								
								Merge pull request  #3500  from RonnyPfannschmidt/fix-3498-unittest-marks  
							
							... 
							
							
							
							fix  #3498  - correctly consider marks on unittest classes 
						
							2018-05-24 13:51:17 -03:00  
				
					
						
							
							
								 
						
							
								bc25d51b2f 
								
							 
						 
						
							
							
								
								Re-word changelog  
							
							
							
						 
						
							2018-05-24 07:27:40 -03:00  
				
					
						
							
							
								 
						
							
								5a0c9aca63 
								
							 
						 
						
							
							
								
								correctly instantiate fixtureinfo for unittest tests,  fixes   #3498  
							
							
							
						 
						
							2018-05-24 10:29:42 +02:00  
				
					
						
							
							
								 
						
							
								da2c2e8492 
								
							 
						 
						
							
							
								
								more debugging for  #3498  
							
							
							
						 
						
							2018-05-24 09:58:36 +02:00  
				
					
						
							
							
								 
						
							
								74cfdc5feb 
								
							 
						 
						
							
							
								
								add failing test for  #3498  
							
							
							
						 
						
							2018-05-24 07:30:38 +02:00  
				
					
						
							
							
								 
						
							
								b4e0265622 
								
							 
						 
						
							
							
								
								Removed whitespace from empty line.  
							
							
							
						 
						
							2018-05-23 20:15:28 -07:00  
				
					
						
							
							
								 
						
							
								210ad22dbe 
								
							 
						 
						
							
							
								
								Updating changelog text  
							
							
							
						 
						
							2018-05-23 19:43:06 -07:00  
				
					
						
							
							
								 
						
							
								6c519b1280 
								
							 
						 
						
							
							
								
								Fixed a bug where stdout and stderr were logged twice by junitxml.  
							
							
							
						 
						
							2018-05-23 19:34:45 -07:00  
				
					
						
							
							
								 
						
							
								afde9f07f7 
								
							 
						 
						
							
							
								
								Update number of tests in email template  
							
							
							
						 
						
							2018-05-23 08:06:27 -03:00  
				
					
						
							
							
								 
						
							
								b4cd010d71 
								
							 
						 
						
							
							
								
								Merge pull request  #3495  from nicoddemus/release-3.6.0  
							
							... 
							
							
							
							Release 3.6.0 
							
						 
						
							2018-05-23 07:51:30 -03:00  
				
					
						
							
							
								 
						
							
								45e7703133 
								
							 
						 
						
							
							
								
								Move mark revamp note to the top of the CHANGELOG  
							
							
							
						 
						
							2018-05-22 21:12:51 -03:00  
				
					
						
							
							
								 
						
							
								d70e910b65 
								
							 
						 
						
							
							
								
								Preparing release version 3.6.0  
							
							
							
						 
						
							2018-05-23 00:07:48 +00:00  
				
					
						
							
							
								 
						
							
								c55db1faac 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into release-3.6.0  
							
							
							
						 
						
							2018-05-23 00:03:58 +00:00  
				
					
						
							
							
								 
						
							
								16583a6d43 
								
							 
						 
						
							
							
								
								Add missing libs to tasks/requirements.txt  
							
							
							
						 
						
							2018-05-23 00:03:47 +00:00  
				
					
						
							
							
								 
						
							
								7985eff5b4 
								
							 
						 
						
							
							
								
								Merge pull request  #3497  from hroncok/approx_compat_import  
							
							... 
							
							
							
							Import Mapping and Sequence from compat in python_api::approx 
							
						 
						
							2018-05-22 20:57:29 -03:00  
				
					
						
							
							
								 
						
							
								5072226f69 
								
							 
						 
						
							
							
								
								Import Mapping and Sequence from compat in python_api::approx  
							
							... 
							
							
							
							Related to https://github.com/pytest-dev/pytest/issues/3339 
Fixes a DeprecationWarning on Python 3.7
Adds Mapping to compat 
							
						 
						
							2018-05-22 22:25:15 +02:00  
				
					
						
							
							
								 
						
							
								6c8d46d8ea 
								
							 
						 
						
							
							
								
								Merge pull request  #3487  from tgoodlet/detect_pytest_hook_prefix  
							
							... 
							
							
							
							Detect `pytest_` prefixed hooks 
							
						 
						
							2018-05-22 21:36:58 +02:00  
				
					
						
							
							
								 
						
							
								7d0c9837ce 
								
							 
						 
						
							
							
								
								Merge pull request  #3459  from RonnyPfannschmidt/mark-iter-name-filter  
							
							... 
							
							
							
							introduce name filtering for marker iteration again 
							
						 
						
							2018-05-21 13:24:39 -03:00  
				
					
						
							
							
								 
						
							
								8e17e32253 
								
							 
						 
						
							
							
								
								Merge pull request  #3492  from timhughes/patch-1  
							
							... 
							
							
							
							fix typo in docs 
							
						 
						
							2018-05-20 15:51:03 -03:00  
				
					
						
							
							
								 
						
							
								f0b855369c 
								
							 
						 
						
							
							
								
								fix typo  
							
							
							
						 
						
							2018-05-20 19:14:06 +01:00  
				
					
						
							
							
								 
						
							
								4aa7ebaf52 
								
							 
						 
						
							
							
								
								Merge pull request  #3490  from nicoddemus/merge-master-into-features  
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2018-05-19 11:36:11 +02:00  
				
					
						
							
							
								 
						
							
								486b786cb2 
								
							 
						 
						
							
							
								
								Add trivial changelog entry  
							
							
							
						 
						
							2018-05-18 12:02:50 -04:00  
				
					
						
							
							
								 
						
							
								674879976f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-05-18 12:30:08 -03:00  
				
					
						
							
							
								 
						
							
								d4065a9166 
								
							 
						 
						
							
							
								
								Detect `pytest_` prefixed hooks  
							
							... 
							
							
							
							`pluggy` is deprecating the `implprefix` argument in the next major
release so implement this detection in our derived plugin manager.
Relates to pytest-dev/pluggy#145  
							
						 
						
							2018-05-17 20:38:54 -04:00  
				
					
						
							
							
								 
						
							
								e7f75f69f2 
								
							 
						 
						
							
							
								
								Small grammar fix in CHANGELOG  
							
							
							
						 
						
							2018-05-17 21:20:43 -03:00  
				
					
						
							
							
								 
						
							
								5be85a1f55 
								
							 
						 
						
							
							
								
								Merge changelog marks refactoring changelog entries as discussed in review  
							
							
							
						 
						
							2018-05-17 21:18:12 -03:00  
				
					
						
							
							
								 
						
							
								bb626fe8a7 
								
							 
						 
						
							
							
								
								Fix typo in mark.rst  
							
							
							
						 
						
							2018-05-17 16:06:00 -03:00  
				
					
						
							
							
								 
						
							
								45faaeca7a 
								
							 
						 
						
							
							
								
								Merge pull request  #3480  from nicoddemus/deprecated-deadlne-hypothesis  
							
							... 
							
							
							
							Attempt to fix CI problems related to Hypothesis 
							
						 
						
							2018-05-17 20:18:27 +02:00  
				
					
						
							
							
								 
						
							
								11fb384efb 
								
							 
						 
						
							
							
								
								Fix link to skipif tutorial in ref docs  
							
							
							
						 
						
							2018-05-17 10:15:47 -03:00  
				
					
						
							
							
								 
						
							
								5edad01d4e 
								
							 
						 
						
							
							
								
								Merge pull request  #3476  from avirlrma/master  
							
							... 
							
							
							
							change doc copyright year to range and auto update year 
							
						 
						
							2018-05-16 17:53:23 -03:00  
				
					
						
							
							
								 
						
							
								f5361a302c 
								
							 
						 
						
							
							
								
								Use a more recent hypothesis version on CI  
							
							
							
						 
						
							2018-05-16 07:35:02 -03:00  
				
					
						
							
							
								 
						
							
								94e62dfc50 
								
							 
						 
						
							
							
								
								Increase hypothesis deadline  
							
							... 
							
							
							
							The value is pretty close to the new default that will come out in
future hypothesis versions, which is generating a deprecation error
on CI.
Using a loose deadline because CI boxes are not reliable in how much
CPU power they have available 
							
						 
						
							2018-05-16 07:34:53 -03:00  
				
					
						
							
							
								 
						
							
								afe4800daf 
								
							 
						 
						
							
							
								
								Fix deprecation notice in Node.get_marker  
							
							
							
						 
						
							2018-05-15 21:47:40 -03:00  
				
					
						
							
							
								 
						
							
								2cd159e8c5 
								
							 
						 
						
							
							
								
								Add section on how to update marks and add ref to the deprecation notice  
							
							
							
						 
						
							2018-05-15 21:35:27 -03:00  
				
					
						
							
							
								 
						
							
								718ba83600 
								
							 
						 
						
							
							
								
								Small adjustment to the CHANGELOG  
							
							
							
						 
						
							2018-05-15 21:02:05 -03:00  
				
					
						
							
							
								 
						
							
								1b2f4f4483 
								
							 
						 
						
							
							
								
								Small rewording to the CHANGELOG  
							
							
							
						 
						
							2018-05-15 21:01:37 -03:00  
				
					
						
							
							
								 
						
							
								f68bab06b4 
								
							 
						 
						
							
							
								
								Reword the changelog  
							
							
							
						 
						
							2018-05-15 18:24:14 -03:00  
				
					
						
							
							
								 
						
							
								a4425cb4af 
								
							 
						 
						
							
							
								
								Merge pull request  #3469  from scop/dropthedot  
							
							... 
							
							
							
							#dropthedot 
							
						 
						
							2018-05-15 08:00:28 -03:00  
				
					
						
							
							
								 
						
							
								01d2d81d1f 
								
							 
						 
						
							
							
								
								Merge pull request  #3468  from scop/spelling  
							
							... 
							
							
							
							Spelling and grammar fixes 
							
						 
						
							2018-05-15 07:59:56 -03:00  
				
					
						
							
							
								 
						
							
								f14e097635 
								
							 
						 
						
							
							
								
								added changelog and added my name to the authors  
							
							
							
						 
						
							2018-05-15 12:54:48 +05:30  
				
					
						
							
							
								 
						
							
								a59f677d93 
								
							 
						 
						
							
							
								
								change doc copyright year to range and auto update year  
							
							
							
						 
						
							2018-05-15 12:48:04 +05:30  
				
					
						
							
							
								 
						
							
								36614b0a3d 
								
							 
						 
						
							
							
								
								Fix formatting in CHANGELOG entry  
							
							
							
						 
						
							2018-05-14 09:56:36 -03:00  
				
					
						
							
							
								 
						
							
								b4370c08b9 
								
							 
						 
						
							
							
								
								#dropthedot  
							
							
							
						 
						
							2018-05-13 12:09:47 +02:00  
				
					
						
							
							
								 
						
							
								aa51fcb2b6 
								
							 
						 
						
							
							
								
								Spelling and grammar fixes  
							
							
							
						 
						
							2018-05-13 12:06:09 +02:00  
				
					
						
							
							
								 
						
							
								4914135fdf 
								
							 
						 
						
							
							
								
								introduce name filtering for marker iteration again  
							
							
							
						 
						
							2018-05-11 21:48:15 +02:00  
				
					
						
							
							
								 
						
							
								84b37e1b57 
								
							 
						 
						
							
							
								
								Merge pull request  #3452  from nicoddemus/fix-flaky-xdist-test  
							
							... 
							
							
							
							Attempt to fix flaky test on Python 2 
							
						 
						
							2018-05-05 20:18:06 +02:00