2575053697 
								
							 
						 
						
							
							
								
								Merge pull request  #1015  from hpk42/cache-integration  
							
							... 
							
							
							
							refined pytest-cache integration 
							
						 
						
							2015-09-16 21:46:46 +02:00  
				
					
						
							
							
								 
						
							
								e20216a1a8 
								
							 
						 
						
							
							
								
								merge the pytest-cache plugin into core  
							
							
							
						 
						
							2015-09-13 19:55:44 +02:00  
				
					
						
							
							
								 
						
							
								0b3f1b4a7c 
								
							 
						 
						
							
							
								
								Create `_pytest.vendored_packages` and _pytest._pluggy  
							
							... 
							
							
							
							- Replace imports from "pluggy" to "_pytest._pluggy"
- Fallback to import "pluggy" from global namespace if
  not found in _pytest.vendored_packges 
							
						 
						
							2015-09-07 13:01:54 -03:00  
				
					
						
							
							
								 
						
							
								8625eb643e 
								
							 
						 
						
							
							
								
								Merge pull request  #986  from RonnyPfannschmidt/early-logging  
							
							... 
							
							
							
							replay initial warnings when terminalreporter is loaded 
							
						 
						
							2015-09-02 19:10:53 -03:00  
				
					
						
							
							
								 
						
							
								76f0988551 
								
							 
						 
						
							
							
								
								turn the pytest_logwarning hook historic  
							
							
							
						 
						
							2015-09-02 18:49:49 +02:00  
				
					
						
							
							
								 
						
							
								3fa261564b 
								
							 
						 
						
							
							
								
								replay initial warnings when terminalreporter is loaded  
							
							
							
						 
						
							2015-08-31 21:54:12 +02:00  
				
					
						
							
							
								 
						
							
								4533a50542 
								
							 
						 
						
							
							
								
								Fix regression caused by changing the signature for parse_known_args  
							
							... 
							
							
							
							Fix  #973  
						
							2015-08-27 19:35:32 -03:00  
				
					
						
							
							
								 
						
							
								42b43a7d7b 
								
							 
						 
						
							
							
								
								Paths after normal options are now properly used to discover rootdir and ini files  
							
							... 
							
							
							
							Fix  #949  
						
							2015-08-25 22:08:05 -03:00  
				
					
						
							
							
								 
						
							
								e103932aad 
								
							 
						 
						
							
							
								
								Reintroduce hasplugin to PytestPluginManager  
							
							... 
							
							
							
							Fix  #932  
						
							2015-08-09 19:30:49 -03:00  
				
					
						
							
							
								 
						
							
								023687d8d0 
								
							 
						 
						
							
							
								
								Merge pull request  #872  from nicoddemus/confcutdir-inifile  
							
							... 
							
							
							
							Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini by default 
							
						 
						
							2015-07-25 14:03:24 +02:00  
				
					
						
							
							
								 
						
							
								9f94e443ff 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	testing/conftest.py 
							
						 
						
							2015-07-24 19:24:21 -03:00  
				
					
						
							
							
								 
						
							
								35bbcc39a2 
								
							 
						 
						
							
							
								
								Interpret strings to "plugins" arg in pytest.main() as module names  
							
							... 
							
							
							
							See #855  
							
						 
						
							2015-07-23 23:37:09 -03:00  
				
					
						
							
							
								 
						
							
								ab9e246ab0 
								
							 
						 
						
							
							
								
								Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini files by default  
							
							... 
							
							
							
							As discussed in #82  
							
						 
						
							2015-07-23 23:21:07 -03:00  
				
					
						
							
							
								 
						
							
								df29120abe 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini 
							
						 
						
							2015-07-23 22:35:51 -03:00  
				
					
						
							
							
								 
						
							
								2f7d0f8bd9 
								
							 
						 
						
							
							
								
								Consider --color option in more places which deal with TerminalWriters  
							
							
							
						 
						
							2015-07-18 16:39:55 -03:00  
				
					
						
							
							
								 
						
							
								1baa1a4d01 
								
							 
						 
						
							
							
								
								Merge pull request  #822  from nicoddemus/extra-usage-info  
							
							... 
							
							
							
							Print inifile and rootdir when there's usage errors 
							
						 
						
							2015-07-11 13:43:20 -03:00  
				
					
						
							
							
								 
						
							
								8a6aa5e17e 
								
							 
						 
						
							
							
								
								Print inifile and rootdir when there's usage errors  
							
							... 
							
							
							
							Related to #821  
							
						 
						
							2015-07-10 21:56:12 -03:00  
				
					
						
							
							
								 
						
							
								854e603f84 
								
							 
						 
						
							
							
								
								Add new testdirs ini option  
							
							... 
							
							
							
							Fix  #694  
						
							2015-07-10 21:52:47 -03:00  
				
					
						
							
							
								 
						
							
								3c2fd833ca 
								
							 
						 
						
							
							
								
								Reintroduce get_plugin_manager() for backward-compatibility  
							
							... 
							
							
							
							PyCharm pytest runner depends on this function existing (see #787 ).
Added reference to get_plugin_manager() and PluginManager/PytestPluginManager to docs 
							
						 
						
							2015-06-25 00:48:47 -03:00  
				
					
						
							
							
								 
						
							
								f78b6df8bc 
								
							 
						 
						
							
							
								
								Return an empty list directly.  
							
							
							
						 
						
							2015-06-23 14:05:44 +02:00  
				
					
						
							
							
								 
						
							
								8664fc4102 
								
							 
						 
						
							
							
								
								Add a --noconftest option.  
							
							
							
						 
						
							2015-06-23 09:38:54 +02:00  
				
					
						
							
							
								 
						
							
								bddc88f09e 
								
							 
						 
						
							
							
								
								adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-06 10:08:08 +02:00  
				
					
						
							
							
								 
						
							
								23538bcd31 
								
							 
						 
						
							
							
								
								- some more adaptation to most recent pluggy API  
							
							... 
							
							
							
							- avoid using pluggin underscore api
- show pluggy version in header
--HG--
branch : pluggy1 
							
						 
						
							2015-05-05 21:53:04 +02:00  
				
					
						
							
							
								 
						
							
								88538f13ba 
								
							 
						 
						
							
							
								
								adapt for current API changes of pluggy  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-04 15:08:41 +02:00  
				
					
						
							
							
								 
						
							
								25963e0544 
								
							 
						 
						
							
							
								
								adapt pytest to pluggy's decoratorclass branch  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:52 +02:00  
				
					
						
							
							
								 
						
							
								5ee7ee0850 
								
							 
						 
						
							
							
								
								adapt pytest to using pluggy (current master)  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:51 +02:00  
				
					
						
							
							
								 
						
							
								a8afba054a 
								
							 
						 
						
							
							
								
								- refine lsof checking  
							
							... 
							
							
							
							- make runpytest() create an inline testing process instead of
  a subprocess one
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:46 +02:00  
				
					
						
							
							
								 
						
							
								d3e363b97a 
								
							 
						 
						
							
							
								
								- make API between runpytest() and inline_run() more similar  
							
							... 
							
							
							
							- shift a number of tests to become inline_run() tests
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:45 +02:00  
				
					
						
							
							
								 
						
							
								b2d66b9e7b 
								
							 
						 
						
							
							
								
								simplify load_setuptools_entrypoints and refine comments/docstrings  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-27 14:10:33 +02:00  
				
					
						
							
							
								 
						
							
								c54afbe42e 
								
							 
						 
						
							
							
								
								deprecate and warn about __multicall__ usage in hooks, refine docs about hook ordering,  
							
							... 
							
							
							
							make hookwrappers respect tryfirst/trylast
--HG--
branch : more_plugin 
							
						 
						
							2015-04-27 12:50:34 +02:00  
				
					
						
							
							
								 
						
							
								d2ea7387f2 
								
							 
						 
						
							
							
								
								re-add tryfirst/trylast marker documentation, mark it as to be removed  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-26 00:47:24 +02:00  
				
					
						
							
							
								 
						
							
								8e009ee31c 
								
							 
						 
						
							
							
								
								move consider_setuptools_entrypoints to core pluginmanager  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-26 00:41:29 +02:00  
				
					
						
							
							
								 
						
							
								0c961deeaa 
								
							 
						 
						
							
							
								
								fix some doc strings  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-26 00:22:34 +02:00  
				
					
						
							
							
								 
						
							
								32165d82b1 
								
							 
						 
						
							
							
								
								introduce a new subset_hook_caller instead of remove make_hook_caller  
							
							... 
							
							
							
							and adapat and refine conftest/global plugin management accordingly
--HG--
branch : more_plugin 
							
						 
						
							2015-04-26 00:10:52 +02:00  
				
					
						
							
							
								 
						
							
								d422247433 
								
							 
						 
						
							
							
								
								specialize make_hook_caller to work with a subset of the registered plugins.  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 22:13:42 +02:00  
				
					
						
							
							
								 
						
							
								3a1374e69c 
								
							 
						 
						
							
							
								
								simplify plugins bookkeeping further, refine API  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 20:17:32 +02:00  
				
					
						
							
							
								 
						
							
								1e883f5979 
								
							 
						 
						
							
							
								
								simplify tracing mechanics by simply going through an indirection  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 18:15:39 +02:00  
				
					
						
							
							
								 
						
							
								9c5495832c 
								
							 
						 
						
							
							
								
								avoid direct circular reference between config and pluginmanager  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 18:14:41 +02:00  
				
					
						
							
							
								 
						
							
								4e116ed503 
								
							 
						 
						
							
							
								
								make pytest_plugin_registered a historic hook  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 13:38:30 +02:00  
				
					
						
							
							
								 
						
							
								a63585dcab 
								
							 
						 
						
							
							
								
								introduce historic hook spec which will memorize calls to a hook  
							
							... 
							
							
							
							in order to call them on later registered plugins
--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								bbbb6dc2e3 
								
							 
						 
						
							
							
								
								remove _do_register indirection between PluginManager and PytestPluginManager  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								b03c1342ac 
								
							 
						 
						
							
							
								
								allow to register plugins with hooks that are only added later  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								feb4b2249a 
								
							 
						 
						
							
							
								
								remove some redundancy when parsing import spec  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-23 13:15:34 +02:00  
				
					
						
							
							
								 
						
							
								95dd2eb1da 
								
							 
						 
						
							
							
								
								streamline and document handling of builtin module special casing.  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-23 12:39:11 +02:00  
				
					
						
							
							
								 
						
							
								715a235b45 
								
							 
						 
						
							
							
								
								remove shutdown logic from PluginManager and add a add_cleanup() API  
							
							... 
							
							
							
							for the already existing cleanup logic of the config object.
This simplifies lifecycle management as we don't keep two
layers of shutdown functions and also simplifies the pluginmanager
interface.
also add some docstrings.
--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 16:33:20 +02:00  
				
					
						
							
							
								 
						
							
								f746c190ac 
								
							 
						 
						
							
							
								
								slight cleanup of plugin register() functionality  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 14:54:28 +02:00  
				
					
						
							
							
								 
						
							
								d632a0d5c2 
								
							 
						 
						
							
							
								
								merge conftest management into PytestPluginManager  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 14:15:42 +02:00  
				
					
						
							
							
								 
						
							
								894d7dca22 
								
							 
						 
						
							
							
								
								avoid undocumented special casing of "pytest_" prefix  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 13:44:37 +02:00  
				
					
						
							
							
								 
						
							
								20d6c0b560 
								
							 
						 
						
							
							
								
								simplify exception capturing  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 13:37:42 +02:00  
				
					
						
							
							
								 
						
							
								c08dfdc330 
								
							 
						 
						
							
							
								
								move bookkeeping of conftest plugins in core pluginmanager to PytestPluginManager  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 13:33:01 +02:00