d784155fd2 
								
							 
						 
						
							
							
								
								#1642  Add rootdir option  
							
							
							
						 
						
							2018-01-17 23:02:31 +03:00  
				
					
						
							
							
								 
						
							
								e3406e0818 
								
							 
						 
						
							
							
								
								Show usage errors in red  
							
							
							
						 
						
							2018-01-16 19:35:32 -02:00  
				
					
						
							
							
								 
						
							
								8433e2ba04 
								
							 
						 
						
							
							
								
								#2953  fix comments: fix exception type  
							
							
							
						 
						
							2018-01-16 23:35:57 +03:00  
				
					
						
							
							
								 
						
							
								648d5d0c6b 
								
							 
						 
						
							
							
								
								#2953  fix comments: use keyword module  
							
							
							
						 
						
							2018-01-16 22:55:24 +03:00  
				
					
						
							
							
								 
						
							
								076fb56f85 
								
							 
						 
						
							
							
								
								show a simple and easy error when keyword expressions trigger a syntax error  
							
							
							
						 
						
							2018-01-16 21:30:44 +03:00  
				
					
						
							
							
								 
						
							
								abbdb60051 
								
							 
						 
						
							
							
								
								Move logic determining if progress should be displayed to a function  
							
							
							
						 
						
							2018-01-12 07:04:43 -02:00  
				
					
						
							
							
								 
						
							
								5939b336cd 
								
							 
						 
						
							
							
								
								Fix progress report when tests fail during teardown  
							
							... 
							
							
							
							Fix  #3088  
						
							2018-01-11 20:42:05 -02:00  
				
					
						
							
							
								 
						
							
								4a704bbb55 
								
							 
						 
						
							
							
								
								fix reorder_items_atscope ordering  
							
							
							
						 
						
							2018-01-11 11:30:52 -08:00  
				
					
						
							
							
								 
						
							
								ee6c9f50a2 
								
							 
						 
						
							
							
								
								optimize fixtures.reorder_items  
							
							
							
						 
						
							2018-01-11 11:30:52 -08:00  
				
					
						
							
							
								 
						
							
								2674f352e8 
								
							 
						 
						
							
							
								
								Merge pull request  #3091  from nicoddemus/conftest-hooks  
							
							... 
							
							
							
							Document bootstrap and initialization hooks 
							
						 
						
							2018-01-11 11:14:20 -02:00  
				
					
						
							
							
								 
						
							
								b68b80aec9 
								
							 
						 
						
							
							
								
								Add new pytest_runtest_logfinish hook  
							
							... 
							
							
							
							Fix  #3101  
						
							2018-01-09 22:17:39 -02:00  
				
					
						
							
							
								 
						
							
								bd1d17e8de 
								
							 
						 
						
							
							
								
								Replace py.std with stdlib imports  
							
							
							
						 
						
							2018-01-09 12:44:10 -08:00  
				
					
						
							
							
								 
						
							
								93306f6a5e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2018-01-09 18:41:00 -02:00  
				
					
						
							
							
								 
						
							
								b6b36bc167 
								
							 
						 
						
							
							
								
								Handle pluggy package or module for traceback filtering  
							
							... 
							
							
							
							Since 0.6.1 pluggy has been turned into a package 
							
						 
						
							2018-01-08 21:29:15 -02:00  
				
					
						
							
							
								 
						
							
								afb8a4e35d 
								
							 
						 
						
							
							
								
								Document bootstrap and initialization hooks  
							
							... 
							
							
							
							Fix  #2616  
						
							2018-01-06 13:31:38 -02:00  
				
					
						
							
							
								 
						
							
								f24c470403 
								
							 
						 
						
							
							
								
								Assume not skipped by mark if attribute missing  
							
							... 
							
							
							
							Fixes  #3074 . 
						
							2018-01-03 18:47:18 -05:00  
				
					
						
							
							
								 
						
							
								c70efaa0fb 
								
							 
						 
						
							
							
								
								Merge pull request  #3047  from RonnyPfannschmidt/mark-newapi  
							
							... 
							
							
							
							move node base classes from main to nodes 
							
						 
						
							2017-12-19 07:59:25 -02:00  
				
					
						
							
							
								 
						
							
								ed293ec3e9 
								
							 
						 
						
							
							
								
								pytester: no ignore files used to obtain current user metadata in the fd leak detector  
							
							
							
						 
						
							2017-12-18 17:52:55 +01:00  
				
					
						
							
							
								 
						
							
								94608c6110 
								
							 
						 
						
							
							
								
								port _Compatproperty to attrs  
							
							
							
						 
						
							2017-12-18 11:08:20 +01:00  
				
					
						
							
							
								 
						
							
								afc607cfd8 
								
							 
						 
						
							
							
								
								move node base classes from main to nodes  
							
							
							
						 
						
							2017-12-18 11:08:20 +01:00  
				
					
						
							
							
								 
						
							
								dfc5399cd7 
								
							 
						 
						
							
							
								
								Revert "WIP #3013"  
							
							... 
							
							
							
							This reverts commit 28a93b9eeb 
							
						 
						
							2017-12-17 21:50:17 +01:00  
				
					
						
							
							
								 
						
							
								76489d30f7 
								
							 
						 
						
							
							
								
								Revert "WIP"  
							
							... 
							
							
							
							This reverts commit d6f75d2836 
							
						 
						
							2017-12-17 21:49:57 +01:00  
				
					
						
							
							
								 
						
							
								d6f75d2836 
								
							 
						 
						
							
							
								
								WIP  
							
							
							
						 
						
							2017-12-17 20:11:24 +01:00  
				
					
						
							
							
								 
						
							
								f3c9c6e8a8 
								
							 
						 
						
							
							
								
								fix restoring Python state after in-process pytest runs  
							
							... 
							
							
							
							Now each in-process pytest run saves a snapshot of important global Python
state and restores it after the test completes, including the list of loaded
modules & the Python path settings.
Previously only the loaded package data was getting restored, but that was
also reverting any loaded package changes done in the test triggering the
pytest runs, and not only those done by the pytest runs themselves.
Updated acceptance tests broken by this change, which were only passing before
by accident as they were making multiple pytest runs with later ones depending
on sys.path changes left behind by the initial one. 
							
						 
						
							2017-12-17 12:47:50 +01:00  
				
					
						
							
							
								 
						
							
								67bd60d5c6 
								
							 
						 
						
							
							
								
								clean up Testdir taking snapshots & restoring global Python state  
							
							... 
							
							
							
							Now extracted to new CwdSnapshot, SysModulesSnapshot & SysPathsSnapshot
classes, each saving the state they are interested in on instantiation
and restoring it in its `restore()` method. 
							
						 
						
							2017-12-17 12:47:50 +01:00  
				
					
						
							
							
								 
						
							
								28a93b9eeb 
								
							 
						 
						
							
							
								
								WIP  #3013  
							
							
							
						 
						
							2017-12-17 06:54:57 +01:00  
				
					
						
							
							
								 
						
							
								d87279115d 
								
							 
						 
						
							
							
								
								Merge pull request  #3041  from segevfiner/capture-no-disable-progress  
							
							... 
							
							
							
							Use classic console output when -s is used 
							
						 
						
							2017-12-16 12:34:34 -02:00  
				
					
						
							
							
								 
						
							
								370daf0441 
								
							 
						 
						
							
							
								
								Use classic console output when -s is used  
							
							... 
							
							
							
							Fixes  #3038  
						
							2017-12-16 15:00:23 +02:00  
				
					
						
							
							
								 
						
							
								db4df5833a 
								
							 
						 
						
							
							
								
								Merge pull request  #3030  from nicoddemus/leak  
							
							... 
							
							
							
							Fix memory leak caused by fixture values never been garbage collected 
							
						 
						
							2017-12-14 19:20:34 -02:00  
				
					
						
							
							
								 
						
							
								c3f63ac143 
								
							 
						 
						
							
							
								
								Fix memory leak caused by fixture values never been garbage collected  
							
							... 
							
							
							
							The leak was caused by the (unused) `FixtureRequest._fixture_values`
cache.
This was introduced because the `partial` object (created to call
FixtureDef.finish() bound with the Request) is kept alive
through the entire session when a function-scoped fixture depends
on a session-scoped (or higher) fixture because of the nested
`addfinalizer` calls.
FixtureDef.finish() started receiving a request object in order to
obtain the proper hook proxy object (#2127 ), but this does not seem
useful at all in practice because `pytest_fixture_post_finalizer`
will be called with the `request` object of the moment the fixture value
was *created*, not the request object active when the fixture value
is being destroyed. We should probably deprecate/remove the request
parameter from `pytest_fixture_post_finalizer`.
Fix  #2981  
							
						 
						
							2017-12-13 19:49:06 -02:00  
				
					
						
							
							
								 
						
							
								3862b0b28d 
								
							 
						 
						
							
							
								
								Remove logger parameter from catching_logs  
							
							... 
							
							
							
							The logger parameter of catching_logs is not used anywhere. The main
motivation for removing the logger parameter is that it removes the
logger = logger or logging.getLogger(logger)
line. IMO there are too many occurences of the string 'logg' ;) 
							
						 
						
							2017-12-13 21:13:59 +01:00  
				
					
						
							
							
								 
						
							
								476d4df1b7 
								
							 
						 
						
							
							
								
								Merge pull request  #3010  from cryvate/fix-issue-2985  
							
							... 
							
							
							
							Improve handling of pyargs 
							
						 
						
							2017-12-13 13:56:42 +01:00  
				
					
						
							
							
								 
						
							
								52449903c3 
								
							 
						 
						
							
							
								
								Merge pull request  #3023  from nicoddemus/preparse-deprecated  
							
							... 
							
							
							
							Add param annotations and types to hookspec 
							
						 
						
							2017-12-13 13:51:20 +01:00  
				
					
						
							
							
								 
						
							
								506c9c91c0 
								
							 
						 
						
							
							
								
								Merge pull request  #3025  from anntzer/dont-rewrite-plugin  
							
							... 
							
							
							
							Respect PYTEST_DONT_REWRITE for plugins too.
closes  #2995  
							
						 
						
							2017-12-13 12:34:51 +01:00  
				
					
						
							
							
								 
						
							
								38f34e2fa1 
								
							 
						 
						
							
							
								
								Merge pull request  #3012  from thisch/merge_contextmanagers  
							
							... 
							
							
							
							Integrate logging_using_handler into catching_logs 
							
						 
						
							2017-12-13 06:59:48 -02:00  
				
					
						
							
							
								 
						
							
								45e7734b1a 
								
							 
						 
						
							
							
								
								Change set ops to use methods instead of operators.  
							
							
							
						 
						
							2017-12-13 00:54:57 -08:00  
				
					
						
							
							
								 
						
							
								c8e7d1ae34 
								
							 
						 
						
							
							
								
								Respect PYTEST_DONT_REWRITE for plugins too.  
							
							
							
						 
						
							2017-12-12 17:43:17 -08:00  
				
					
						
							
							
								 
						
							
								7b5d4d01ed 
								
							 
						 
						
							
							
								
								Add param annotations and types to hookspec  
							
							... 
							
							
							
							Also mention which hook to use instead of the deprecated
pytest_cmdline_preparse
Fix  #3022  
							
						 
						
							2017-12-12 18:01:31 -02:00  
				
					
						
							
							
								 
						
							
								1e295535c3 
								
							 
						 
						
							
							
								
								Move _patched_find_module to module namespace.  
							
							
							
						 
						
							2017-12-12 09:53:06 +00:00  
				
					
						
							
							
								 
						
							
								3ca1e4b7f0 
								
							 
						 
						
							
							
								
								Make patch for issue in pkgutil.ImpImporter local by using contextmanager.  
							
							
							
						 
						
							2017-12-12 08:43:01 +00:00  
				
					
						
							
							
								 
						
							
								f8f1a52ea0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2017-12-11 22:18:50 -02:00  
				
					
						
							
							
								 
						
							
								5c6d7739bc 
								
							 
						 
						
							
							
								
								Merge pull request  #3015  from jurko-gospodnetic/code-cleanup  
							
							... 
							
							
							
							Code cleanup 
							
						 
						
							2017-12-11 22:15:50 -02:00  
				
					
						
							
							
								 
						
							
								fc544dc660 
								
							 
						 
						
							
							
								
								remove redundant checking because  
							
							... 
							
							
							
							* isinstance([], Sequence) is True
* isinstance((), Sequence) is True 
							
						 
						
							2017-12-12 00:10:59 +05:30  
				
					
						
							
							
								 
						
							
								7792587b3f 
								
							 
						 
						
							
							
								
								remove unnecessary import  
							
							
							
						 
						
							2017-12-12 00:03:38 +05:30  
				
					
						
							
							
								 
						
							
								cb0ba18f53 
								
							 
						 
						
							
							
								
								remove '_ast' module; and redirect '_ast' references to 'ast'  
							
							
							
						 
						
							2017-12-11 23:14:17 +05:30  
				
					
						
							
							
								 
						
							
								596937e610 
								
							 
						 
						
							
							
								
								remove extra whitespace  
							
							
							
						 
						
							2017-12-09 13:34:55 +01:00  
				
					
						
							
							
								 
						
							
								57fcd3f57e 
								
							 
						 
						
							
							
								
								remove corpse code comments  
							
							
							
						 
						
							2017-12-09 13:34:55 +01:00  
				
					
						
							
							
								 
						
							
								65f5383106 
								
							 
						 
						
							
							
								
								fix comment & docstring typos, line wrapping & wording  
							
							
							
						 
						
							2017-12-09 13:34:54 +01:00  
				
					
						
							
							
								 
						
							
								ba209b5230 
								
							 
						 
						
							
							
								
								Integrate logging_using_handler into catching_logs  
							
							... 
							
							
							
							logging_using_handler is only used in catching_logs. Therefore it makes
sense to remove one of the many context managers from the logging
plugin. 
							
						 
						
							2017-12-07 16:34:53 +01:00  
				
					
						
							
							
								 
						
							
								b62fd79c0c 
								
							 
						 
						
							
							
								
								Fix issue 2985.  
							
							
							
						 
						
							2017-12-07 15:12:44 +00:00  
				
					
						
							
							
								 
						
							
								655146e522 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2017-12-05 22:30:35 -02:00  
				
					
						
							
							
								 
						
							
								ce30896cd2 
								
							 
						 
						
							
							
								
								Also blacklist pytest-capturelog plugin  
							
							... 
							
							
							
							This is the older plugin before pytest-catchlog was around. Apparently there are
people still using it.
Fixes  #3004  
							
						 
						
							2017-12-05 20:02:56 +01:00  
				
					
						
							
							
								 
						
							
								2e8b0a83fe 
								
							 
						 
						
							
							
								
								Merge pull request  #2989  from nicoddemus/bring-tr-writer-back-2984  
							
							... 
							
							
							
							Bring back TerminalReporter.writer as an alias to TerminalReporter._tw 
							
						 
						
							2017-12-01 17:42:31 +01:00  
				
					
						
							
							
								 
						
							
								369c711f14 
								
							 
						 
						
							
							
								
								Merge pull request  #2971  from blueyed/fix-ZeroDivisionError  
							
							... 
							
							
							
							Fix ZeroDivisionError with 0 collected tests 
							
						 
						
							2017-11-30 21:12:46 -02:00  
				
					
						
							
							
								 
						
							
								cf0cac3b73 
								
							 
						 
						
							
							
								
								Bring back TerminalReporter.writer as an alias to TerminalReporter._tw  
							
							... 
							
							
							
							Fix  #2984  
						
							2017-11-30 19:56:47 -02:00  
				
					
						
							
							
								 
						
							
								70f1e3b4b0 
								
							 
						 
						
							
							
								
								Improve getscopeitem assertion message  
							
							... 
							
							
							
							Fix  #2979  
						
							2017-11-30 07:53:43 -02:00  
				
					
						
							
							
								 
						
							
								912330a7e2 
								
							 
						 
						
							
							
								
								Extend _pytest.python._idval to return __name__ of functions as well, not just for classes  
							
							
							
						 
						
							2017-11-29 16:17:49 +00:00  
				
					
						
							
							
								 
						
							
								88ed1ab648 
								
							 
						 
						
							
							
								
								Merge pull request  #2964  from rpuntaie/master  
							
							... 
							
							
							
							fix issue #2920  
							
						 
						
							2017-11-29 10:32:28 +01:00  
				
					
						
							
							
								 
						
							
								191e8c6d9b 
								
							 
						 
						
							
							
								
								Merge pull request  #2969  from nicoddemus/null-bytes-2957  
							
							... 
							
							
							
							Always escape null bytes when setting PYTEST_CURRENT_TEST 
							
						 
						
							2017-11-29 06:57:48 +01:00  
				
					
						
							
							
								 
						
							
								0f5fb7ed05 
								
							 
						 
						
							
							
								
								Fix ZeroDivisionError with 0 collected tests  
							
							... 
							
							
							
							This can easily happen with pytest-testmon. 
							
						 
						
							2017-11-29 00:54:14 +01:00  
				
					
						
							
							
								 
						
							
								89cf943e04 
								
							 
						 
						
							
							
								
								Always escape null bytes when setting PYTEST_CURRENT_TEST  
							
							... 
							
							
							
							Fix  #2957  
						
							2017-11-28 19:45:13 -02:00  
				
					
						
							
							
								 
						
							
								4ea7bbc197 
								
							 
						 
						
							
							
								
								fix issue  #2920  
							
							
							
						 
						
							2017-11-28 16:47:12 +01:00  
				
					
						
							
							
								 
						
							
								796db80ca4 
								
							 
						 
						
							
							
								
								Only escape str-like arguments passed to warnings  
							
							... 
							
							
							
							Fix  #2956  
						
							2017-11-27 23:17:15 -02:00  
				
					
						
							
							
								 
						
							
								4678cbeb91 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features'  
							
							
							
						 
						
							2017-11-27 19:37:58 -02:00  
				
					
						
							
							
								 
						
							
								c58715371c 
								
							 
						 
						
							
							
								
								Merge pull request  #2954  from blueyed/rewritten  
							
							... 
							
							
							
							Fix spelling: s/re-writ/rewrit/g 
							
						 
						
							2017-11-26 18:12:30 -02:00  
				
					
						
							
							
								 
						
							
								d5f038e29a 
								
							 
						 
						
							
							
								
								Fix spelling: s/re-writ/rewrit/g  
							
							... 
							
							
							
							This also fixes "can not" to "cannot" in the "Module already imported so
cannot be rewritten" assertion error. 
							
						 
						
							2017-11-26 20:46:06 +01:00  
				
					
						
							
							
								 
						
							
								95de11a44e 
								
							 
						 
						
							
							
								
								Block pytest-catchlog and issue a warning  
							
							... 
							
							
							
							Trying to install pytest-3.3 and pytest-catchlog will result in an
option conflicts because both declare the same options. 
							
						 
						
							2017-11-23 19:53:12 -02:00  
				
					
						
							
							
								 
						
							
								05cfdcc8cb 
								
							 
						 
						
							
							
								
								Revert making TerminalWriter public in TerminalReporter plugin  
							
							... 
							
							
							
							We eventually want to replace py.io.TerminalWriter (exposed as
"_tw" in TerminalReporter) by something else, so deprecating access
to "_tw" and making it public as "writer" is contrary to that. 
							
						 
						
							2017-11-23 19:53:12 -02:00  
				
					
						
							
							
								 
						
							
								f50ace7c0a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into release-3.3.0  
							
							
							
						 
						
							2017-11-23 20:20:40 +00:00  
				
					
						
							
							
								 
						
							
								1d26f3730f 
								
							 
						 
						
							
							
								
								Fix docstrings in pytester  
							
							
							
						 
						
							2017-11-22 17:15:59 -02:00  
				
					
						
							
							
								 
						
							
								5e71ffab87 
								
							 
						 
						
							
							
								
								Handle marks without description  
							
							
							
						 
						
							2017-11-22 15:47:15 +03:00  
				
					
						
							
							
								 
						
							
								f05333ab75 
								
							 
						 
						
							
							
								
								Fix rewrite to not write past the edge of the screen  
							
							
							
						 
						
							2017-11-22 00:00:02 -02:00  
				
					
						
							
							
								 
						
							
								c8d52b633b 
								
							 
						 
						
							
							
								
								Fix assertion rewrite to match module names correctly  
							
							... 
							
							
							
							Fix  #2939  
						
							2017-11-21 23:06:47 -02:00  
				
					
						
							
							
								 
						
							
								3a5dbabf60 
								
							 
						 
						
							
							
								
								Add tests for progress output and docs for ``console_output_style``  
							
							... 
							
							
							
							Fix  #2657  
						
							2017-11-21 21:01:51 -02:00  
				
					
						
							
							
								 
						
							
								3441084bd2 
								
							 
						 
						
							
							
								
								Add progress output for verbose mode with xdist  
							
							
							
						 
						
							2017-11-21 21:01:51 -02:00  
				
					
						
							
							
								 
						
							
								8b92527d7d 
								
							 
						 
						
							
							
								
								Add re_match_lines and re_match_lines_random to pytester fixture  
							
							
							
						 
						
							2017-11-21 21:01:51 -02:00  
				
					
						
							
							
								 
						
							
								dab889304e 
								
							 
						 
						
							
							
								
								Implement progress percentage reporting while running tests  
							
							... 
							
							
							
							Fix  #2657  
						
							2017-11-21 21:01:41 -02:00  
				
					
						
							
							
								 
						
							
								219b758949 
								
							 
						 
						
							
							
								
								Add capsysbinary fixture  
							
							... 
							
							
							
							`capsysbinary` works like `capsys` but produces bytes for `readouterr()`. 
							
						 
						
							2017-11-17 09:02:46 -08:00  
				
					
						
							
							
								 
						
							
								6161bcff6e 
								
							 
						 
						
							
							
								
								Merge pull request  #2925  from asottile/capfdbinary  
							
							... 
							
							
							
							Add capfdbinary fixture 
							
						 
						
							2017-11-17 08:00:10 -02:00  
				
					
						
							
							
								 
						
							
								1f08d990d5 
								
							 
						 
						
							
							
								
								Deprecate metafunc.addcall  
							
							... 
							
							
							
							Fix  #2876  
						
							2017-11-15 15:16:00 -02:00  
				
					
						
							
							
								 
						
							
								8f90812481 
								
							 
						 
						
							
							
								
								Add capfdbinary fixture  
							
							... 
							
							
							
							`capfdbinary` works like `capfd` but produces bytes for `readouterr()`. 
							
						 
						
							2017-11-14 14:50:00 -08:00  
				
					
						
							
							
								 
						
							
								a6f2d2d2c9 
								
							 
						 
						
							
							
								
								Rename FixtureDef.finalizer to FixtureDef.finalizers  
							
							
							
						 
						
							2017-11-12 11:35:46 -02:00  
				
					
						
							
							
								 
						
							
								6d3fe0b826 
								
							 
						 
						
							
							
								
								Explicitly clear finalizers list in finalize to ensure cleanup  
							
							
							
						 
						
							2017-11-12 11:28:57 -02:00  
				
					
						
							
							
								 
						
							
								bdad345f99 
								
							 
						 
						
							
							
								
								Fix passing request to finish() in FixtureDef  
							
							
							
						 
						
							2017-11-12 11:28:26 -02:00  
				
					
						
							
							
								 
						
							
								f074fd9ac6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into malinoff/fix-2124  
							
							
							
						 
						
							2017-11-12 11:16:08 -02:00  
				
					
						
							
							
								 
						
							
								6550b9911b 
								
							 
						 
						
							
							
								
								pytest_fixture_post_finalizer now receives a request argument  
							
							
							
						 
						
							2017-11-12 11:14:55 -02:00  
				
					
						
							
							
								 
						
							
								258031afe5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into malinoff/fix-2124  
							
							
							
						 
						
							2017-11-12 10:34:47 -02:00  
				
					
						
							
							
								 
						
							
								f0f2d2b861 
								
							 
						 
						
							
							
								
								Merge branch 'master' into fix-missing-nodeid-with-pyargs  
							
							
							
						 
						
							2017-11-11 14:33:55 +01:00  
				
					
						
							
							
								 
						
							
								d1af369800 
								
							 
						 
						
							
							
								
								Merge pull request  #2913  from nicoddemus/merge-master-into-features  
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2017-11-11 10:09:49 +01:00  
				
					
						
							
							
								 
						
							
								b671c5a8bf 
								
							 
						 
						
							
							
								
								Merge pull request  #2914  from nicoddemus/addfinalizer-refactor  
							
							... 
							
							
							
							Make SubRequest.addfinalizer an explicit method 
							
						 
						
							2017-11-11 09:26:24 +01:00  
				
					
						
							
							
								 
						
							
								f320686fe0 
								
							 
						 
						
							
							
								
								Make SubRequest.addfinalizer an explicit method  
							
							... 
							
							
							
							This implicit definition really tripped me while debugging #2127 ,
unfortunately hidden as it was in the middle of all the variable
declarations.
I think the explicit definition is much easier for the eyes and IDEs
to find. 
							
						 
						
							2017-11-11 03:07:34 -02:00  
				
					
						
							
							
								 
						
							
								742f9cb825 
								
							 
						 
						
							
							
								
								Merge pull request  #2911  from RonnyPfannschmidt/remove-nodeinfo  
							
							... 
							
							
							
							remove unused _pytest.runner.NodeInfo class 
							
						 
						
							2017-11-10 18:57:14 -02:00  
				
					
						
							
							
								 
						
							
								983a09a2d4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-11-10 18:33:02 -02:00  
				
					
						
							
							
								 
						
							
								76f3be452a 
								
							 
						 
						
							
							
								
								remove unused _pytest.runner.NodeInfo class  
							
							
							
						 
						
							2017-11-10 17:48:52 +01:00  
				
					
						
							
							
								 
						
							
								c47dcaa713 
								
							 
						 
						
							
							
								
								switch a special case in scope node lookup to a general one  
							
							
							
						 
						
							2017-11-10 17:35:42 +01:00  
				
					
						
							
							
								 
						
							
								b11640c1eb 
								
							 
						 
						
							
							
								
								Fix linting E722: do not use bare except  
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00  
				
					
						
							
							
								 
						
							
								03829fde8a 
								
							 
						 
						
							
							
								
								Fix linting E741: ambiguous variable name  
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00  
				
					
						
							
							
								 
						
							
								e351976ef4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into RonnyPfannschmidt/introduce-attrs  
							
							
							
						 
						
							2017-11-04 12:32:27 -02:00  
				
					
						
							
							
								 
						
							
								b18a9deb4c 
								
							 
						 
						
							
							
								
								Merge pull request  #2892  from nicoddemus/merge-master-into-features  
							
							... 
							
							
							
							Merge upstream/master into features 
							
						 
						
							2017-11-04 08:15:28 +01:00  
				
					
						
							
							
								 
						
							
								d7e8eeef56 
								
							 
						 
						
							
							
								
								Merge pull request  #2878  from RonnyPfannschmidt/collector-makeitem-deprecate  
							
							... 
							
							
							
							deprecate the public internal PyCollector.makeitem method 
							
						 
						
							2017-11-03 17:13:18 -02:00