57caa4e25e 
								
							 
						 
						
							
							
								
								Fix flake8: os imported, but unused  
							
							... 
							
							
							
							Likely due to b6fa4e24 
							
						 
						
							2018-10-24 23:43:41 +02:00  
				
					
						
							
							
								 
						
							
								66ce952da6 
								
							 
						 
						
							
							
								
								Merge pull request  #4228  from blueyed/merge-master  
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2018-10-24 23:04:52 +02:00  
				
					
						
							
							
								 
						
							
								b6fa4e248f 
								
							 
						 
						
							
							
								
								Merge pull request  #4028  from asottile/revert_breakpoint_code  
							
							... 
							
							
							
							Revert patching of breakpointhook as it appears to do nothing 
							
						 
						
							2018-10-24 17:50:19 -03:00  
				
					
						
							
							
								 
						
							
								eee8201e4f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into merge-master  
							
							
							
						 
						
							2018-10-24 22:36:34 +02:00  
				
					
						
							
							
								 
						
							
								e690e191fd 
								
							 
						 
						
							
							
								
								Merge pull request  #4225  from blueyed/collect-performance  
							
							... 
							
							
							
							TerminalWriter: write "collecting" msg only once every 0.5s 
							
						 
						
							2018-10-24 22:35:53 +02:00  
				
					
						
							
							
								 
						
							
								d40cd3ec6b 
								
							 
						 
						
							
							
								
								Use functools.lru_cache with _getconftest_pathlist  
							
							... 
							
							
							
							For pytest's own suite the `cache_info()` looks as follows:
    > session.config._getconftest_pathlist.cache_info()
    CacheInfo(hits=231, misses=19, maxsize=None, currsize=19)
While it does not really make a difference for me this might help with
larger test suites / the case mentioned in
https://github.com/pytest-dev/pytest/issues/2206#issuecomment-432623646 . 
							
						 
						
							2018-10-24 18:22:30 +02:00  
				
					
						
							
							
								 
						
							
								9df1b037d6 
								
							 
						 
						
							
							
								
								Merge pull request  #4217  from nicoddemus/fix-macos-py37-travis  
							
							... 
							
							
							
							Fix MacOS py37 on Travis 
							
						 
						
							2018-10-24 17:51:49 +02:00  
				
					
						
							
							
								 
						
							
								28dbffdaf2 
								
							 
						 
						
							
							
								
								Attempt to fix macosx build setup  
							
							... 
							
							
							
							This has been failing as of 2018-10-23 while installing gcc with
this message:
	==> Installing numpy dependency: gcc
	==> Downloading https://homebrew.bintray.com/bottles/gcc-8.2.0.high_sierra.bottl 
	######################################################################## 100.0%
	==> Pouring gcc-8.2.0.high_sierra.bottle.1.tar.gz
	Error: The `brew link` step did not complete successfully
	The formula built, but is not symlinked into /usr/local
	Could not symlink include/c++
	Target /usr/local/include/c++
	already exists. You may want to remove it:
	  rm '/usr/local/include/c++'
	To force the link and overwrite all conflicting files:
	  brew link --overwrite gcc
	To list all files that would be deleted:
	  brew link --overwrite --dry-run gcc
	Possible conflicting files are:
	/usr/local/include/c++ -> /usr/local/Caskroom/oclint/0.13.1,17.4.0/oclint-0.13.1/include/c++ 
							
						 
						
							2018-10-24 12:46:45 -03:00  
				
					
						
							
							
								 
						
							
								f8f4c16020 
								
							 
						 
						
							
							
								
								TerminalWriter: write "collecting" msg only once every 0.1s  
							
							... 
							
							
							
							Running `pytest -k doesnotmatch` on pytest's own tests takes ~3s with
Kitty terminal for me, but only ~1s with `-q`.
It also is faster with urxvt, but still takes 2.2s there.
This patch only calls `report_collect` every 0.1s, which is good enough
for reporting collection progress, and improves the time with both Kitty
and urxvt to ~1.2s for me. 
							
						 
						
							2018-10-24 16:48:35 +02:00  
				
					
						
							
							
								 
						
							
								8bced7415c 
								
							 
						 
						
							
							
								
								Merge pull request  #4220  from anpr/doc_raise_on_empty_parameterset  
							
							... 
							
							
							
							Add `empty_parameter_set_mark` ini option documentation to the parametrize doc 
							
						 
						
							2018-10-23 19:10:44 -03:00  
				
					
						
							
							
								 
						
							
								72d98a7c52 
								
							 
						 
						
							
							
								
								Merge pull request  #4214  from blueyed/fix-4174  
							
							... 
							
							
							
							Fix "Plugin already registered" error with symlinks 
							
						 
						
							2018-10-23 17:10:15 -03:00  
				
					
						
							
							
								 
						
							
								0dd85157ea 
								
							 
						 
						
							
							
								
								Add reference to ``empty_parameter_set_mark`` parametrize doc  
							
							
							
						 
						
							2018-10-23 22:03:05 +02:00  
				
					
						
							
							
								 
						
							
								2a45851c9e 
								
							 
						 
						
							
							
								
								Merge pull request  #4218  from blueyed/remove-_shutil_rmtree_remove_writable  
							
							... 
							
							
							
							minor: remove unused _shutil_rmtree_remove_writable 
							
						 
						
							2018-10-23 18:34:28 +02:00  
				
					
						
							
							
								 
						
							
								b51ee48f78 
								
							 
						 
						
							
							
								
								minor: remove unused _shutil_rmtree_remove_writable  
							
							
							
						 
						
							2018-10-23 17:36:22 +02:00  
				
					
						
							
							
								 
						
							
								fadac0ffc0 
								
							 
						 
						
							
							
								
								Fix "Plugin already registered" error with symlinks  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4174 . 
							
						 
						
							2018-10-23 10:15:23 +02:00  
				
					
						
							
							
								 
						
							
								799b72cf6f 
								
							 
						 
						
							
							
								
								Merge pull request  #4213  from asottile/flake8_master_fixes  
							
							... 
							
							
							
							Fixes for flake8 master 
							
						 
						
							2018-10-22 20:08:38 -07:00  
				
					
						
							
							
								 
						
							
								fc0f89ac14 
								
							 
						 
						
							
							
								
								Merge pull request  #4215  from nicoddemus/release-3.9.2  
							
							... 
							
							
							
							Release version 3.9.2 
							
						 
						
							2018-10-22 22:08:16 -03:00  
				
					
						
							
							
								 
						
							
								771e860011 
								
							 
						 
						
							
							
								
								Preparing release version 3.9.2  
							
							
							
						 
						
							2018-10-22 21:47:42 +00:00  
				
					
						
							
							
								 
						
							
								cb39bd0651 
								
							 
						 
						
							
							
								
								Fixes for flake8 master  
							
							
							
						 
						
							2018-10-22 08:50:00 -07:00  
				
					
						
							
							
								 
						
							
								c94b2b227e 
								
							 
						 
						
							
							
								
								Merge pull request  #4208  from nicoddemus/pytestskip-docs-4206  
							
							... 
							
							
							
							Remove pytest.config example from skipping at module level docs 
							
						 
						
							2018-10-21 10:28:53 -07:00  
				
					
						
							
							
								 
						
							
								f30911d3af 
								
							 
						 
						
							
							
								
								Merge pull request  #4209  from nicoddemus/fixture-named-request  
							
							... 
							
							
							
							Issue a warning when a fixture named 'request' is collected 
							
						 
						
							2018-10-21 05:49:08 +05:30  
				
					
						
							
							
								 
						
							
								cd72e23f3f 
								
							 
						 
						
							
							
								
								Merge pull request  #4207  from nicoddemus/recursive-dep-fixtures  
							
							... 
							
							
							
							Improve error message when a recursive dependency between fixtures is detected 
							
						 
						
							2018-10-20 22:19:21 +05:30  
				
					
						
							
							
								 
						
							
								7bb51b8ceb 
								
							 
						 
						
							
							
								
								Issue a warning when a fixture named 'request' is collected  
							
							... 
							
							
							
							Fix  #611  
						
							2018-10-20 12:09:44 -03:00  
				
					
						
							
							
								 
						
							
								b9990f77ff 
								
							 
						 
						
							
							
								
								Merge pull request  #4204  from vbarbaresi/3340_log_hooks  
							
							... 
							
							
							
							Fix logging usage in hooks pytest_sessionstart/finish 
							
						 
						
							2018-10-20 11:36:06 -03:00  
				
					
						
							
							
								 
						
							
								6b126997e1 
								
							 
						 
						
							
							
								
								Remove pytest.config example from skipping at module level docs  
							
							
							
						 
						
							2018-10-20 11:28:39 -03:00  
				
					
						
							
							
								 
						
							
								02ae7d8531 
								
							 
						 
						
							
							
								
								Improve error message when a recursive dependency between fixtures is detected  
							
							... 
							
							
							
							Fix  #2909  
						
							2018-10-20 09:44:42 -03:00  
				
					
						
							
							
								 
						
							
								f947cb2613 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into davidszotten/stepwise  
							
							
							
						 
						
							2018-10-20 09:18:02 -03:00  
				
					
						
							
							
								 
						
							
								db106d6085 
								
							 
						 
						
							
							
								
								Fix logging usage in hooks pytest_sessionstart/finish  #3340  
							
							
							
						 
						
							2018-10-20 09:55:10 +02:00  
				
					
						
							
							
								 
						
							
								b0eed7b56c 
								
							 
						 
						
							
							
								
								Merge pull request  #4205  from vbarbaresi/fix_typo  
							
							... 
							
							
							
							fix typo in tmpdir documentation (trivial) 
							
						 
						
							2018-10-19 17:49:32 -03:00  
				
					
						
							
							
								 
						
							
								51d358a7a9 
								
							 
						 
						
							
							
								
								fix typo in tmpdir documentation  
							
							
							
						 
						
							2018-10-19 19:22:04 +02:00  
				
					
						
							
							
								 
						
							
								c54cdd05b8 
								
							 
						 
						
							
							
								
								Merge pull request  #4201  from ykantor/patch-1  
							
							... 
							
							
							
							Update tmpdir.rst - very trivial 
							
						 
						
							2018-10-19 12:13:35 -03:00  
				
					
						
							
							
								 
						
							
								dde147641e 
								
							 
						 
						
							
							
								
								Fix linting  
							
							
							
						 
						
							2018-10-19 09:33:51 -03:00  
				
					
						
							
							
								 
						
							
								2abd005cc9 
								
							 
						 
						
							
							
								
								Merge pull request  #4195  from nicoddemus/issue-3691  
							
							... 
							
							
							
							Use safe_str() to format warning message about unicode in Python 2 
							
						 
						
							2018-10-19 07:18:29 -03:00  
				
					
						
							
							
								 
						
							
								366b88388b 
								
							 
						 
						
							
							
								
								Merge pull request  #4200  from asottile/upgrade_hooks  
							
							... 
							
							
							
							Upgrade pre-commit/pre-commit-hooks to 2.0.0 
							
						 
						
							2018-10-19 08:33:03 +02:00  
				
					
						
							
							
								 
						
							
								0fc1801d0d 
								
							 
						 
						
							
							
								
								Update tmpdir.rst  
							
							
							
						 
						
							2018-10-19 05:54:29 +02:00  
				
					
						
							
							
								 
						
							
								11ff14be1f 
								
							 
						 
						
							
							
								
								Upgrade pre-commit/pre-commit-hooks to 2.0.0  
							
							
							
						 
						
							2018-10-18 20:11:35 -07:00  
				
					
						
							
							
								 
						
							
								dc0b4efffa 
								
							 
						 
						
							
							
								
								Merge pull request  #4196  from nicoddemus/better-signature-error-msg-4026  
							
							... 
							
							
							
							Improve error message when it is not possible to determine a function's signature 
							
						 
						
							2018-10-18 18:56:55 -07:00  
				
					
						
							
							
								 
						
							
								864d7fef30 
								
							 
						 
						
							
							
								
								Add back some {posargs} placeholders for pytest invocations in tox.ini  
							
							... 
							
							
							
							Those were removed by accident in a previous commits it seems 
							
						 
						
							2018-10-18 21:57:11 -03:00  
				
					
						
							
							
								 
						
							
								18035211f5 
								
							 
						 
						
							
							
								
								Use safe_str() to format warning message about unicode in Python 2  
							
							... 
							
							
							
							Fix  #3691  
						
							2018-10-18 21:56:17 -03:00  
				
					
						
							
							
								 
						
							
								61080da89d 
								
							 
						 
						
							
							
								
								Merge pull request  #4192  from asottile/fix_recwarn_stacklevel  
							
							... 
							
							
							
							Fix filename reported by `warnings.warn` when using `recwarn` under python2. 
							
						 
						
							2018-10-18 16:22:00 -07:00  
				
					
						
							
							
								 
						
							
								ac5704290f 
								
							 
						 
						
							
							
								
								Improve error message when it is not possible to determine a function's signature  
							
							... 
							
							
							
							Fix  #4026  
						
							2018-10-18 20:06:43 -03:00  
				
					
						
							
							
								 
						
							
								b432f1207c 
								
							 
						 
						
							
							
								
								Merge pull request  #4190  from nicoddemus/merge-master-into-features  
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2018-10-18 19:23:16 -03:00  
				
					
						
							
							
								 
						
							
								cdd0e18ca8 
								
							 
						 
						
							
							
								
								Emulate resetting the warnings registry for python 2.x  
							
							
							
						 
						
							2018-10-18 10:43:05 -07:00  
				
					
						
							
							
								 
						
							
								43c3f59660 
								
							 
						 
						
							
							
								
								Merge pull request  #4188  from svenstaro/make-it-more-colorful  
							
							... 
							
							
							
							Make --color more colorful 
							
						 
						
							2018-10-18 14:14:53 -03:00  
				
					
						
							
							
								 
						
							
								e4871f7722 
								
							 
						 
						
							
							
								
								Merge pull request  #4183  from RonnyPfannschmidt/bump-setuptools  
							
							... 
							
							
							
							fix  #4177  - pin setuptools>=40.0 
						
							2018-10-18 07:49:03 -03:00  
				
					
						
							
							
								 
						
							
								517ee588c6 
								
							 
						 
						
							
							
								
								Merge pull request  #4186  from nicoddemus/drop-coveralls  
							
							... 
							
							
							
							No longer upload code coverage to coveralls 
							
						 
						
							2018-10-18 07:48:40 -03:00  
				
					
						
							
							
								 
						
							
								1b51497936 
								
							 
						 
						
							
							
								
								[WIP] Update warning stacklevel when wrapping warnings.warn  
							
							
							
						 
						
							2018-10-18 02:36:41 +00:00  
				
					
						
							
							
								 
						
							
								f694d8d6ad 
								
							 
						 
						
							
							
								
								Make --color more colorful  
							
							
							
						 
						
							2018-10-18 03:56:58 +02:00  
				
					
						
							
							
								 
						
							
								a83ee197c6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into RonnyPfannschmidt/bump-setuptools  
							
							
							
						 
						
							2018-10-17 19:05:52 -03:00  
				
					
						
							
							
								 
						
							
								12f94b81c0 
								
							 
						 
						
							
							
								
								No longer upload code coverage to coveralls  
							
							... 
							
							
							
							We have since moved to codecov and uploading to coveralls is breaking
OS-X builds for py37 [1], so we might as well take this opportunity to drop
it.
[1] https://travis-ci.org/pytest-dev/pytest/jobs/442858038  
							
						 
						
							2018-10-17 18:18:08 -03:00