Aly Sivji
							
						 
						
							 
							
							
							
							
								
							
							
								025d160dfc 
								
							 
						 
						
							
							
								
								Update tests to pass in py27  
							
							 
							
							
							
						 
						
							2018-11-12 09:28:47 -06:00  
						
					 
				
					
						
							
							
								 
								Aly Sivji
							
						 
						
							 
							
							
							
							
								
							
							
								1847cc7420 
								
							 
						 
						
							
							
								
								adding docs and cleaning up  
							
							 
							
							
							
						 
						
							2018-11-12 09:28:47 -06:00  
						
					 
				
					
						
							
							
								 
								Aly Sivji
							
						 
						
							 
							
							
							
							
								
							
							
								1184db8273 
								
							 
						 
						
							
							
								
								cleaning up  
							
							 
							
							
							
						 
						
							2018-11-12 09:28:47 -06:00  
						
					 
				
					
						
							
							
								 
								Aly Sivji
							
						 
						
							 
							
							
							
							
								
							
							
								d42f1e87c3 
								
							 
						 
						
							
							
								
								Add tests for attrs and dataclasses  
							
							 
							
							
							
						 
						
							2018-11-12 09:28:47 -06:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								f551cb9677 
								
							 
						 
						
							
							
								
								Skip Instances with --collect-only  
							
							 
							
							
							
						 
						
							2018-11-10 23:48:02 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								87254ca593 
								
							 
						 
						
							
							
								
								Add test for --deselect without "::()"  
							
							 
							
							... 
							
							
							
							Closes: https://github.com/pytest-dev/pytest/issues/4127 . 
							
						 
						
							2018-11-10 23:46:41 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								ac8b9c6e9d 
								
							 
						 
						
							
							
								
								Node: do not add "::()" to nodeid  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4127 . 
							
						 
						
							2018-11-10 23:46:41 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								1b260a844f 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							 
							
							
							
						 
						
							2018-11-09 12:49:55 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e00f3a2fb7 
								
							 
						 
						
							
							
								
								Merge pull request  #4353  from blueyed/test_fileimport  
							
							 
							
							... 
							
							
							
							tests: test_fileimport: improve reporting on failure 
							
						 
						
							2018-11-09 08:32:49 -02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								a507f44465 
								
							 
						 
						
							
							
								
								cache_dir: use $TOX_ENV_DIR/ prefix if set  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4270  
							
						 
						
							2018-11-09 05:29:28 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								4a74d455de 
								
							 
						 
						
							
							
								
								minor: typos  
							
							 
							
							
							
						 
						
							2018-11-09 02:03:44 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								a0890f98d8 
								
							 
						 
						
							
							
								
								tests: harden test_config_error  
							
							 
							
							
							
						 
						
							2018-11-09 01:31:53 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								b494d3d1c1 
								
							 
						 
						
							
							
								
								tests: test_fileimport: improve reporting on failure  
							
							 
							
							
							
						 
						
							2018-11-09 01:17:36 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								423e19909e 
								
							 
						 
						
							
							
								
								Merge pull request  #4307  from fzarifian/fzarifian-pr4304  
							
							 
							
							... 
							
							
							
							#4304  the stepwise plugin must be blocked on cacheprovider plugin block request 
							
						 
						
							2018-11-08 20:42:04 -02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								3137c89cf1 
								
							 
						 
						
							
							
								
								Fix/improve handling of chdir with no-args and testpaths  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4332 . 
							
						 
						
							2018-11-08 17:50:45 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								9d838fa861 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							 
							
							... 
							
							
							
							Conflicts:
	src/_pytest/main.py 
							
						 
						
							2018-11-08 02:48:59 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								17b8e2d45b 
								
							 
						 
						
							
							
								
								Fix linting  
							
							 
							
							
							
						 
						
							2018-11-07 18:32:23 -02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								f840521854 
								
							 
						 
						
							
							
								
								harden test_collect_init_tests  
							
							 
							
							
							
						 
						
							2018-11-07 19:29:55 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								134b103605 
								
							 
						 
						
							
							
								
								XXX: revert _collect_seen_pkgdirs  
							
							 
							
							
							
						 
						
							2018-11-07 11:01:39 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								fa35f650b5 
								
							 
						 
						
							
							
								
								Fix handling of duplicate args with regard to Python packages  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4310 . 
							
						 
						
							2018-11-07 10:06:09 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								cb57159e01 
								
							 
						 
						
							
							
								
								Handle os.chdir() during collection  
							
							 
							
							
							
						 
						
							2018-11-05 23:18:47 +01:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								a4819844a4 
								
							 
						 
						
							
							
								
								Use unicode/bytes literals instead of calls  
							
							 
							
							
							
						 
						
							2018-11-04 17:43:24 -08:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								4bf6a07fe2 
								
							 
						 
						
							
							
								
								Merge pull request  #4305  from RonnyPfannschmidt/cleanup-tobytes  
							
							 
							
							... 
							
							
							
							replace byte/unicode helpers in test_capture with python level syntax 
							
						 
						
							2018-11-04 17:29:41 -08:00  
						
					 
				
					
						
							
							
								 
								Fabien ZARIFIAN
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								a447dc86fb 
								
							 
						 
						
							
							
								
								Add test to branch  
							
							 
							
							
							
						 
						
							2018-11-05 00:14:35 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								7cb271b46f 
								
							 
						 
						
							
							
								
								replace byte/unicode helpers in test_capture with python level syntax  
							
							 
							
							
							
						 
						
							2018-11-04 22:01:01 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								d1c9c54571 
								
							 
						 
						
							
							
								
								Merge pull request  #4297  from nicoddemus/release-3.10.0  
							
							 
							
							... 
							
							
							
							Release 3.10.0 
							
						 
						
							2018-11-04 12:25:30 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								6befdf8b46 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into release-3.10.0  
							
							 
							
							
							
						 
						
							2018-11-03 13:42:20 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								e61e81a7b5 
								
							 
						 
						
							
							
								
								Make debugging's pytest_configure re-entrant  
							
							 
							
							... 
							
							
							
							This is relevant when using runpytest in-process.
Fixes:
E             def test_1(testdir):
E                 testdir.runpytest()
E         >       __import__('pdb').set_trace()
E
E         ../../test_trace_after_runpytest.py:3:
E         …/Vcs/pytest/src/_pytest/debugging.py:81: in set_trace
E             tw = _pytest.config.create_terminal_writer(cls._config)
E
E         config = None, args = (), kwargs = {}, tw = <py._io.terminalwriter.TerminalWriter object at 0x7f1097088160>
E
E             def create_terminal_writer(config, *args, **kwargs):
E                 """Create a TerminalWriter instance configured according to the options
E                 in the config object. Every code which requires a TerminalWriter object
E                 and has access to a config object should use this function.
E                 """
E                 tw = py.io.TerminalWriter(*args, **kwargs)
E         >       if config.option.color == "yes":
E         E       AttributeError: 'NoneType' object has no attribute 'option' 
							
						 
						
							2018-11-02 18:25:01 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								21725e9304 
								
							 
						 
						
							
							
								
								Merge pull request  #4285  from kchmck/fix-4046  
							
							 
							
							... 
							
							
							
							Fix problems with running tests in package `__init__` files (#4046 ) 
							
						 
						
							2018-11-02 08:26:07 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								48f52b1be0 
								
							 
						 
						
							
							
								
								Merge pull request  #4279  from williamjamir/improve-warning-msg  
							
							 
							
							... 
							
							
							
							Improve the warning message for the implicitly str conversion 
							
						 
						
							2018-11-02 08:22:15 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								e30f7094f3 
								
							 
						 
						
							
							
								
								python: collect: ignore exceptions with isinstance  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4266 . 
							
						 
						
							2018-11-01 22:14:13 +01:00  
						
					 
				
					
						
							
							
								 
								Mick Koch
							
						 
						
							 
							
							
							
							
								
							
							
								320e41b142 
								
							 
						 
						
							
							
								
								Add failing test for __init__.py also including other package files  
							
							 
							
							
							
						 
						
							2018-11-01 13:10:52 -04:00  
						
					 
				
					
						
							
							
								 
								Mick Koch
							
						 
						
							 
							
							
							
							
								
							
							
								70976b04be 
								
							 
						 
						
							
							
								
								Add test for __init__.py collection with package directory as argument  
							
							 
							
							
							
						 
						
							2018-11-01 13:10:17 -04:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								d65f300988 
								
							 
						 
						
							
							
								
								Move handling of duplicate files  
							
							 
							
							... 
							
							
							
							This removes the hack added in https://github.com/pytest-dev/pytest/pull/3802 .
Adjusts test:
- it appears to not have been changed to 7 intentionally.
- removes XXX comment, likely not relevant anymore since 6dac7743 . 
							
						 
						
							2018-11-01 13:06:36 -04:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								948fd7b8b0 
								
							 
						 
						
							
							
								
								fixup pyupgrade crlf incorrect fixes  
							
							 
							
							
							
						 
						
							2018-11-01 08:40:35 -07:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								a192e6b430 
								
							 
						 
						
							
							
								
								Merge pull request  #4247  from blueyed/lru  
							
							 
							
							... 
							
							
							
							_getconftestmodules: use functools.lru_cache 
							
						 
						
							2018-11-01 15:55:38 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								ce1cc3dddb 
								
							 
						 
						
							
							
								
								_getconftestmodules: use functools.lru_cache  
							
							 
							
							... 
							
							
							
							Also renames `_path2confmods` to `_dirpath2confmods` for clarity (it is
expected to be a dirpath in `_importconftest`).
Uses an explicit maxsize, since it appears to be only relevant for a
short period [1].
Removes the lru_cache on _getconftest_pathlist, which makes no
difference when caching _getconftestmodules, at least with the
performance test of 100x10 files (#4237 ).
1: https://github.com/pytest-dev/pytest/pull/4237#discussion_r228528007  
							
						 
						
							2018-10-31 23:17:05 +01:00  
						
					 
				
					
						
							
							
								 
								William Jamir Silva
							
						 
						
							 
							
							
							
							
								
							
							
								5404246e64 
								
							 
						 
						
							
							
								
								Improve the warning message for the implicitly str conversion  
							
							 
							
							... 
							
							
							
							Signed-off-by: William Jamir Silva <williamjamir@gmail.com> 
							
						 
						
							2018-10-31 16:19:10 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								e0038b82f7 
								
							 
						 
						
							
							
								
								pdb: improve msg about output capturing with set_trace  
							
							 
							
							... 
							
							
							
							Do not display "IO-capturing turned off/on" when ``-s`` is used to avoid
confusion. 
							
						 
						
							2018-10-31 17:09:01 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f20eeebde9 
								
							 
						 
						
							
							
								
								Fix access denied error when deleting a stale temporary directory  
							
							 
							
							... 
							
							
							
							Fix  #4262  
							
						 
						
							2018-10-30 15:35:53 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3b7fbcd47f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2018-10-27 14:29:01 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9fe871016d 
								
							 
						 
						
							
							
								
								Merge pull request  #4147  from davidszotten/stepwise  
							
							 
							
							... 
							
							
							
							Stepwise 
							
						 
						
							2018-10-27 15:05:05 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ebba3ebe67 
								
							 
						 
						
							
							
								
								Merge pull request  #4240  from RonnyPfannschmidt/perf-example-collect-files  
							
							 
							
							... 
							
							
							
							add script to generate a example folder for collecting many files 
							
						 
						
							2018-10-26 19:19:02 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								d59786fcc4 
								
							 
						 
						
							
							
								
								Merge pull request  #4222  from RonnyPfannschmidt/pathlib-fixes  
							
							 
							
							... 
							
							
							
							handle race condition when creation and deletion of a numbered dir overlap 
							
						 
						
							2018-10-26 14:36:43 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								ae2fc27799 
								
							 
						 
						
							
							
								
								handle test folder cleanup being unable to create a cleanup lock  
							
							 
							
							
							
						 
						
							2018-10-26 14:31:54 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								8d0e1a99e4 
								
							 
						 
						
							
							
								
								Merge pull request  #4241  from blueyed/move-duplicates  
							
							 
							
							... 
							
							
							
							Move handling of duplicate files 
							
						 
						
							2018-10-26 08:07:48 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								ce0b0518c7 
								
							 
						 
						
							
							
								
								fix   #4243  - support positional argument stacklevel on python2  
							
							 
							
							
							
						 
						
							2018-10-26 09:01:25 +02:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								777e9e1e17 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into merge-master  
							
							 
							
							
							
						 
						
							2018-10-25 18:00:39 -07:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								bfa1993840 
								
							 
						 
						
							
							
								
								add script to generate a example folder for collecting many files  
							
							 
							
							
							
						 
						
							2018-10-25 22:07:20 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								e041823643 
								
							 
						 
						
							
							
								
								Move handling of duplicate files  
							
							 
							
							... 
							
							
							
							This removes the hack added in https://github.com/pytest-dev/pytest/pull/3802 .
Adjusts test:
- it appears to not have been changed to 7 intentionally.
- removes XXX comment, likely not relevant anymore since 6dac7743 . 
							
						 
						
							2018-10-25 20:48:08 +02:00