Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								463e6572c5
								
							
						 | 
						
							
							
								
								Merge branch 'master' into merge-master-into-features
							
							
							
							
							
							
							
							Preparing for 3.0 
							
						 | 
						
							2016-08-17 22:39:23 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								707b6b5e3f
								
							
						 | 
						
							
							
								
								Revert all invocation-fixtures code
							
							
							
							
							
							
							
							Due to a serious regression found in #1794, it was decided to pull off
invocation features from 3.0 so it can be (hopefully) re-introduced
in 3.1 
							
						 | 
						
							2016-08-17 08:12:55 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								277b6d3974
								
							
						 | 
						
							
							
								
								Sort fixture names when a fixture lookup error occurs
							
							
							
							
							
						 | 
						
							2016-08-02 19:45:31 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								553dc2600f
								
							
						 | 
						
							
							
								
								Strip invocation-scope suffix when displaying fixture lookup error
							
							
							
							
							
						 | 
						
							2016-08-01 20:34:56 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								aa145fa83e
								
							
						 | 
						
							
							
								
								Add 'invocation' scope option to fixture docstring
							
							
							
							
							
						 | 
						
							2016-07-29 12:47:30 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								76fbc6379f
								
							
						 | 
						
							
							
								
								Fix deprecated directive in docstring
							
							
							
							
							
						 | 
						
							2016-07-29 12:39:48 -03:00 | 
						
					
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 | 
						
							
							
							
							
							
								
							
							
								510a6083ba
								
							
						 | 
						
							
							
								
								Merge pull request #1758 from nicoddemus/deprecated-module
							
							
							
							
							
							
							
							Add deprecation module to centralize deprecation messages and bits of… 
							
						 | 
						
							2016-07-28 22:36:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								c2864aba3d
								
							
						 | 
						
							
							
								
								Merge branch 'master' into merge-master
							
							
							
							
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/monkeypatch.py
#	_pytest/python.py 
							
						 | 
						
							2016-07-25 19:06:29 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								6c8b0a28e1
								
							
						 | 
						
							
							
								
								Add deprecation module to centralize deprecation messages and bits of code
							
							
							
							
							
						 | 
						
							2016-07-25 18:14:39 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								4f2bf965cb
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures
							
							
							
							
							
						 | 
						
							2016-07-20 21:16:27 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								20f97c3041
								
							
						 | 
						
							
							
								
								Small documentation improvements
							
							
							
							
							
						 | 
						
							2016-07-20 20:22:28 -03:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								3cfebdd7c5
								
							
						 | 
						
							
							
								
								funcarg_prefix_warning: remove newline
							
							
							
							
							
							
							
							Followup to https://github.com/pytest-dev/pytest/pull/1718. 
							
						 | 
						
							2016-07-13 18:33:24 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								15e97a7c78
								
							
						 | 
						
							
							
								
								Add punctuation to funcarg_prefix_warning
							
							
							
							
							
						 | 
						
							2016-07-12 23:49:09 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								458ecae1df
								
							
						 | 
						
							
							
								
								Replace all usages of "pytest_funcarg__" for @pytest.fixture
							
							
							
							
							
						 | 
						
							2016-07-11 22:21:52 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								ad4125dc0d
								
							
						 | 
						
							
							
								
								Deprecate "pytest_funcarg__" prefix to declare fixtures
							
							
							
							
							
							
							
							Fixes #1684 
							
						 | 
						
							2016-07-11 22:21:50 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								0ca06962e9
								
							
						 | 
						
							
							
								
								Improve docs
							
							
							
							
							
						 | 
						
							2016-07-11 20:33:16 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								fb4da00a32
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures
							
							
							
							
							
						 | 
						
							2016-07-11 20:09:13 -03:00 | 
						
					
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 | 
						
							
							
							
							
							
								
							
							
								8c49561470
								
							
						 | 
						
							
							
								
								split most fixture related code into own plugin
							
							
							
							
							
						 | 
						
							2016-07-09 20:36:00 +02:00 |