Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d343f9497c 
								
							 
						 
						
							
							
								
								Merge branch 'release-3.1'  
							
							 
							
							
							
						 
						
							2017-05-22 19:10:06 -03:00  
						
					 
				
					
						
							
							
								 
								Jason R. Coombs
							
						 
						
							 
							
							
							
							
								
							
							
								c9c2c34b44 
								
							 
						 
						
							
							
								
								Remove unused parameter  
							
							 
							
							
							
						 
						
							2017-05-20 04:39:45 -04:00  
						
					 
				
					
						
							
							
								 
								Jason R. Coombs
							
						 
						
							 
							
							
							
							
								
							
							
								9beeef970e 
								
							 
						 
						
							
							
								
								Parse the filename in the generator expression  
							
							 
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
						
					 
				
					
						
							
							
								 
								Jason R. Coombs
							
						 
						
							 
							
							
							
							
								
							
							
								43aa037ebd 
								
							 
						 
						
							
							
								
								Reindent  
							
							 
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
						
					 
				
					
						
							
							
								 
								Jason R. Coombs
							
						 
						
							 
							
							
							
							
								
							
							
								2abf2070f2 
								
							 
						 
						
							
							
								
								Collapse nested for loops into a generator expression  
							
							 
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
						
					 
				
					
						
							
							
								 
								Jason R. Coombs
							
						 
						
							 
							
							
							
							
								
							
							
								ce0ff0040f 
								
							 
						 
						
							
							
								
								Reindent and add docstring  
							
							 
							
							
							
						 
						
							2017-05-20 04:38:27 -04:00  
						
					 
				
					
						
							
							
								 
								Jason R. Coombs
							
						 
						
							 
							
							
							
							
								
							
							
								6d2e11b7d1 
								
							 
						 
						
							
							
								
								Extract method for _mark_plugins_for_rewrite  
							
							 
							
							
							
						 
						
							2017-05-20 04:18:41 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d86c89e193 
								
							 
						 
						
							
							
								
								Revert refactor of old-style to new-style classes  
							
							 
							
							... 
							
							
							
							As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398 ).
This reverts commit d4afa1554b  from PR #2179 . 
							
						 
						
							2017-05-17 18:20:51 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								8bcf88ec12 
								
							 
						 
						
							
							
								
								try to consider all modules after registration as plugin  
							
							 
							
							
							
						 
						
							2017-05-05 11:16:05 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								25371ddbfd 
								
							 
						 
						
							
							
								
								Merge pull request  #2315  from RonnyPfannschmidt/namespace-hook  
							
							 
							
							... 
							
							
							
							remove pytest internal usage of the namespace hook 
							
						 
						
							2017-04-21 16:24:20 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								83c508eea3 
								
							 
						 
						
							
							
								
								Verify hooks after collection completes  
							
							 
							
							... 
							
							
							
							Fix  #1821  
							
						 
						
							2017-04-11 21:55:12 -03:00  
						
					 
				
					
						
							
							
								 
								reut
							
						 
						
							 
							
							
							
							
								
							
							
								417b54abed 
								
							 
						 
						
							
							
								
								added option to unicode plugin name  
							
							 
							
							
							
						 
						
							2017-04-05 13:03:11 +00:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								fab9b993f8 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.freeze_support  
							
							 
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9f85584656 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							 
							
							
							
						 
						
							2017-03-20 19:59:05 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								42a5d6bdfa 
								
							 
						 
						
							
							
								
								Add __future__ imports to all pytest modules  
							
							 
							
							... 
							
							
							
							This prevents silly errors from creeping in Python 2 when testing in Python 3 
							
						 
						
							2017-03-16 22:45:40 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								78194093af 
								
							 
						 
						
							
							
								
								Improve warning representation in terminal plugin and fix tests  
							
							 
							
							
							
						 
						
							2017-03-16 21:57:32 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								0baed781fe 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							 
							
							
							
						 
						
							2017-03-16 20:02:06 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1e0cf5ce4d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py 
							
						 
						
							2017-03-10 15:54:05 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a7643a5fbe 
								
							 
						 
						
							
							
								
								Merge branch 'features' into integrate-pytest-warnings  
							
							 
							
							
							
						 
						
							2017-02-18 11:03:15 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9eb1d73951 
								
							 
						 
						
							
							
								
								--override-ini now correctly overrides some fundamental options like "python_files"  
							
							 
							
							... 
							
							
							
							#2238  
							
						 
						
							2017-02-08 23:03:33 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								713bdc1f9f 
								
							 
						 
						
							
							
								
								merge master into features  
							
							 
							
							
							
						 
						
							2017-01-26 12:00:52 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								c477f09177 
								
							 
						 
						
							
							
								
								Assert statements of the pytester plugin again benefit from assertion rewriting  
							
							 
							
							... 
							
							
							
							Fix  #1920  
							
						 
						
							2017-01-19 21:33:51 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7cd7c283dd 
								
							 
						 
						
							
							
								
								Refactor plugin specs handling into an isolated function  
							
							 
							
							
							
						 
						
							2017-01-12 14:31:35 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								043aadeaf2 
								
							 
						 
						
							
							
								
								Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite  
							
							 
							
							... 
							
							
							
							Fix  #2185  
							
						 
						
							2017-01-11 17:15:16 -02:00  
						
					 
				
					
						
							
							
								 
								mandeep
							
						 
						
							 
							
							
							
							
								
							
							
								d4afa1554b 
								
							 
						 
						
							
							
								
								Refactored old style classes to new style classes  
							
							 
							
							
							
						 
						
							2017-01-08 22:52:42 -06:00  
						
					 
				
					
						
							
							
								 
								Andreas Pelme
							
						 
						
							 
							
							
							
							
								
							
							
								0bb8a4a36d 
								
							 
						 
						
							
							
								
								Fixed   #2148  - parse directory names properly when args contains ::.  
							
							 
							
							... 
							
							
							
							This commit also improves readbility in get_dirs_from_args by using self
documenting local functions.
get_dirs_from_args also now only returns directories that actually exists,
and not files to avoid confusion.
This commit also removes redundant checks in get_common_ancestor that
was already performed in get_dirs_from_args.. 
							
						 
						
							2016-12-27 15:28:56 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Murphy
							
						 
						
							 
							
							
							
							
								
							
							
								c856537e71 
								
							 
						 
						
							
							
								
								Add warning for incorrect passing args to `-o`.  
							
							 
							
							
							
						 
						
							2016-12-01 13:20:42 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Murphy
							
						 
						
							 
							
							
							
							
								
							
							
								4e1609b12e 
								
							 
						 
						
							
							
								
								Add `type` validation.  
							
							 
							
							... 
							
							
							
							Argparse driven argument type validation is added for the
`--junit-xml` and `--confcutdir` arguments.
The commit partially reverts #2080 . Closes  #2089 . 
							
						 
						
							2016-11-28 02:16:01 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								629d8e9fd6 
								
							 
						 
						
							
							
								
								Show an error if --confcutdir is not a valid directory  
							
							 
							
							... 
							
							
							
							Fixes  #2078  
							
						 
						
							2016-11-23 09:49:11 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								bd343ef757 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							 
							
							
							
						 
						
							2016-11-22 14:35:39 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								a3319ffe80 
								
							 
						 
						
							
							
								
								Merge pull request  #2071  from nicoddemus/fix-flake8  
							
							 
							
							... 
							
							
							
							Fix flake8 E305 and E306 errors 
							
						 
						
							2016-11-22 13:22:11 +01:00  
						
					 
				
					
						
							
							
								 
								Ned Batchelder
							
						 
						
							 
							
							
							
							
								
							
							
								632c4d5daf 
								
							 
						 
						
							
							
								
								Remove an accidental double space  
							
							 
							
							
							
						 
						
							2016-11-21 10:17:23 -05:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								26ca5a702e 
								
							 
						 
						
							
							
								
								Add tests and integrated the original code into the core  
							
							 
							
							
							
						 
						
							2016-11-21 08:26:43 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1eb5a690d4 
								
							 
						 
						
							
							
								
								Fix flake8 E305 and E306 errors  
							
							 
							
							... 
							
							
							
							These errors started to appear with flake8-3.1.1, while they don't appear with
version 3.1.0 (weird). 
							
						 
						
							2016-11-20 18:59:15 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								620b384b69 
								
							 
						 
						
							
							
								
								Fix cmdline help message for custom options with two or more metavars  
							
							 
							
							... 
							
							
							
							Fix  #2004  
							
						 
						
							2016-10-20 20:34:39 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								78eec0d7f8 
								
							 
						 
						
							
							
								
								Handle import errors with non-ascii messages when importing plugins  
							
							 
							
							... 
							
							
							
							Fix  #1998  
							
						 
						
							2016-10-12 18:19:32 -03:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								f484e7c9ca 
								
							 
						 
						
							
							
								
								Merge pkg_resources workaround  
							
							 
							
							... 
							
							
							
							Merge branch 'pkg_resources_bugfix' of github.com:raquel-ucl/pytest into pkg-resources
This is an odd case and doesn't really make sense, it is working around a bug
in maven/jython and the old version or weird packaging of setuptools they use.
But we used to do this in the past so might as well keep doing this. 
							
						 
						
							2016-09-19 10:14:41 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								04cf5e1df4 
								
							 
						 
						
							
							
								
								Fixed assertion rewriting for plugins in development mode  
							
							 
							
							... 
							
							
							
							Fix  #1934  
							
						 
						
							2016-09-14 21:59:33 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								c8a366e551 
								
							 
						 
						
							
							
								
								Fix issue where pytest_plugins as string was marking wrong modules for rewrite  
							
							 
							
							... 
							
							
							
							Fix  #1888  
							
						 
						
							2016-08-30 22:53:50 -03:00  
						
					 
				
					
						
							
							
								 
								Raquel Alegre
							
						 
						
							 
							
							
							
							
								
							
							
								8f516d27fa 
								
							 
						 
						
							
							
								
								Moved import pkg_resources to else clause.  
							
							 
							
							
							
						 
						
							2016-08-24 10:25:01 +01:00  
						
					 
				
					
						
							
							
								 
								Raquel Alegre
							
						 
						
							 
							
							
							
							
								
							
							
								2f11a85698 
								
							 
						 
						
							
							
								
								Import pkg_resources only when necessary.  
							
							 
							
							
							
						 
						
							2016-08-23 16:41:11 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ab86dea529 
								
							 
						 
						
							
							
								
								Support [tool:pytest] in setup.cfg files  
							
							 
							
							... 
							
							
							
							Also deprecate [pytest] usage in setup.cfg files
Fix  #567  
							
						 
						
							2016-08-17 08:19:38 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								802755ceed 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2016-08-06 17:58:17 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								a2891420de 
								
							 
						 
						
							
							
								
								Fix determining rootdir from common_ancestor  
							
							 
							
							
							
						 
						
							2016-08-06 19:35:40 +02: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
							
						 
						
							 
							
							
							
							
								
							
							
								6c8b0a28e1 
								
							 
						 
						
							
							
								
								Add deprecation module to centralize deprecation messages and bits of code  
							
							 
							
							
							
						 
						
							2016-07-25 18:14:39 -03:00  
						
					 
				
					
						
							
							
								 
								Roberto Polli
							
						 
						
							 
							
							
							
							
								
							
							
								ab6aef1d1f 
								
							 
						 
						
							
							
								
								feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths.  
							
							 
							
							
							
						 
						
							2016-07-25 12:41:58 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								e0f08a73ab 
								
							 
						 
						
							
							
								
								Merge branch 'features' into conftest-exception-printing  
							
							 
							
							
							
						 
						
							2016-07-20 19:33:36 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								61cc5c4d4e 
								
							 
						 
						
							
							
								
								argument parsing: always warn for string types  
							
							 
							
							... 
							
							
							
							fix  #1741  
							
						 
						
							2016-07-19 10:33:25 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								317b3f257d 
								
							 
						 
						
							
							
								
								optparse compatibility - add float and complex  
							
							 
							
							... 
							
							
							
							also documents the implementation quality
fixes  #457  
							
						 
						
							2016-07-19 10:20:41 +02:00