2eaf3db6ae 
								
							 
						 
						
							
							
								
								Fix docstring indentation (docs env)  
							
							
							
						 
						
							2018-11-22 20:21:22 -02:00  
				
					
						
							
							
								 
						
							
								88bf01a31e 
								
							 
						 
						
							
							
								
								fix   #4386  - restructure construction and partial state of ExceptionInfo  
							
							
							
						 
						
							2018-11-22 21:20:32 +01:00  
				
					
						
							
							
								 
						
							
								6e85febf20 
								
							 
						 
						
							
							
								
								Merge pull request  #4420  from blueyed/merge-master  
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2018-11-19 14:53:01 +01:00  
				
					
						
							
							
								 
						
							
								2754a13f86 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							
							
						 
						
							2018-11-19 12:55:29 +01:00  
				
					
						
							
							
								 
						
							
								a281d6620b 
								
							 
						 
						
							
							
								
								Merge pull request  #4417  from blueyed/tox-mock  
							
							... 
							
							
							
							tox.ini: remove additionally missed mock deps 
							
						 
						
							2018-11-18 12:06:59 -08:00  
				
					
						
							
							
								 
						
							
								c56cc93cbd 
								
							 
						 
						
							
							
								
								tox.ini: remove additionally missed mock deps  
							
							... 
							
							
							
							Ref: https://github.com/pytest-dev/pytest/pull/4415#discussion_r234452144  
							
						 
						
							2018-11-18 19:37:04 +01:00  
				
					
						
							
							
								 
						
							
								cdbe2299ec 
								
							 
						 
						
							
							
								
								Merge pull request  #4409  from blueyed/str  
							
							... 
							
							
							
							Add Testdir.__str__ to return str(self.tmpdir) 
							
						 
						
							2018-11-18 12:52:31 +01:00  
				
					
						
							
							
								 
						
							
								62967b3110 
								
							 
						 
						
							
							
								
								Merge pull request  #4367  from blueyed/determine_setup  
							
							... 
							
							
							
							Optimize/revisit determine_setup 
							
						 
						
							2018-11-18 12:52:07 +01:00  
				
					
						
							
							
								 
						
							
								5c24430555 
								
							 
						 
						
							
							
								
								Merge pull request  #4415  from blueyed/extras-testing  
							
							... 
							
							
							
							setup.py: add "testing" extra requirement 
							
						 
						
							2018-11-18 12:16:06 +01:00  
				
					
						
							
							
								 
						
							
								e46f995cc7 
								
							 
						 
						
							
							
								
								setup.py: add "testing" extra requirement  
							
							... 
							
							
							
							Use this in tox to stream-line base testing requirements.
Closes https://github.com/pytest-dev/pytest/issues/4410 . 
							
						 
						
							2018-11-18 08:55:17 +01:00  
				
					
						
							
							
								 
						
							
								10cdae8e38 
								
							 
						 
						
							
							
								
								Merge pull request  #4414  from asottile/starred_with_side_effect  
							
							... 
							
							
							
							Fix assertion rewriting involving Starred + side-effects 
							
						 
						
							2018-11-17 16:17:24 -08:00  
				
					
						
							
							
								 
						
							
								5fab0ca312 
								
							 
						 
						
							
							
								
								Merge pull request  #4403  from RonnyPfannschmidt/fix-4400  
							
							... 
							
							
							
							Fix  #4400  - rearrange the handling of yield test warnings/errors 
						
							2018-11-18 00:57:44 +01:00  
				
					
						
							
							
								 
						
							
								7f990e2b9a 
								
							 
						 
						
							
							
								
								Merge pull request  #4408  from blueyed/default-invalid-escape-sequence  
							
							... 
							
							
							
							tox.ini: do not cause SyntaxWarning with py37  [ci skip] 
							
						 
						
							2018-11-17 20:08:37 +01:00  
				
					
						
							
							
								 
						
							
								690a63b921 
								
							 
						 
						
							
							
								
								Fix assertion rewriting involving Starred + side-effects  
							
							
							
						 
						
							2018-11-17 10:42:51 -08:00  
				
					
						
							
							
								 
						
							
								4c9cde74ab 
								
							 
						 
						
							
							
								
								Merge pull request  #4411  from blueyed/fix-testpaths-with-pyargs  
							
							... 
							
							
							
							Fix collection of testpaths with `--pyargs`. 
							
						 
						
							2018-11-17 17:20:29 +01:00  
				
					
						
							
							
								 
						
							
								94e5bdd4e0 
								
							 
						 
						
							
							
								
								Merge pull request  #4413  from blueyed/tox-posargs  
							
							... 
							
							
							
							tox: fix/improve posargs with pexpect factor(s)  [ci skip] 
							
						 
						
							2018-11-17 17:18:31 +01:00  
				
					
						
							
							
								 
						
							
								cb1d4044e6 
								
							 
						 
						
							
							
								
								tox: fix/improve posargs with pexpect factor(s)  [ci skip]  
							
							
							
						 
						
							2018-11-17 15:35:40 +01:00  
				
					
						
							
							
								 
						
							
								a252e81ced 
								
							 
						 
						
							
							
								
								Fix collection of testpaths with `--pyargs`  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4405 . 
							
						 
						
							2018-11-17 13:28:10 +01:00  
				
					
						
							
							
								 
						
							
								3acfa3abdc 
								
							 
						 
						
							
							
								
								Add Testdir.__str__ to return str(self.tmpdir)  
							
							... 
							
							
							
							I just expected this with `monkeypatch.setenv("PYTHONPATH", str(testdir))`,
wondering why it was not picked up correctly.
` 
							
						 
						
							2018-11-17 13:18:54 +01:00  
				
					
						
							
							
								 
						
							
								084c36d538 
								
							 
						 
						
							
							
								
								tox.ini: do not cause SyntaxWarning with py37  [ci skip]  
							
							... 
							
							
							
							Do not cause a SyntaxError for something like:
> DeprecationWarning: invalid escape sequence \w
This was happening via pdb++ when it imported pygments (and that had no
compiled .pyc file). 
							
						 
						
							2018-11-17 11:53:15 +01:00  
				
					
						
							
							
								 
						
							
								950d30e6e0 
								
							 
						 
						
							
							
								
								fix   #4400  - rearrange the handling of yield test warnings/errors  
							
							
							
						 
						
							2018-11-16 13:49:46 +01:00  
				
					
						
							
							
								 
						
							
								5872e1c35a 
								
							 
						 
						
							
							
								
								Merge pull request  #4392  from nicoddemus/merge-master-into-features  
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2018-11-15 06:59:42 +01:00  
				
					
						
							
							
								 
						
							
								9dec146edf 
								
							 
						 
						
							
							
								
								Merge pull request  #4388  from nicoddemus/release-4.0.0  
							
							... 
							
							
							
							Release 4.0.0 
							
						 
						
							2018-11-14 15:11:09 -02:00  
				
					
						
							
							
								 
						
							
								c2d6b3524c 
								
							 
						 
						
							
							
								
								Preparing release version 4.0.0  
							
							
							
						 
						
							2018-11-13 21:01:51 +00:00  
				
					
						
							
							
								 
						
							
								e025974cbd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into release-4.0.0  
							
							
							
						 
						
							2018-11-13 20:58:24 +00:00  
				
					
						
							
							
								 
						
							
								fea09cda6c 
								
							 
						 
						
							
							
								
								Merge pull request  #4383  from nicoddemus/merge-master-into-features  
							
							... 
							
							
							
							Merge master into features (about to prepare 4.0) 
							
						 
						
							2018-11-13 18:57:41 -02:00  
				
					
						
							
							
								 
						
							
								ba457f5feb 
								
							 
						 
						
							
							
								
								Optimize/revisit determine_setup  
							
							
							
						 
						
							2018-11-13 20:14:24 +01:00  
				
					
						
							
							
								 
						
							
								ed91d5f086 
								
							 
						 
						
							
							
								
								config: set invocation_dir in the constructor already  
							
							... 
							
							
							
							This allows to make use of it when determining the rootdir etc. 
							
						 
						
							2018-11-13 20:14:24 +01:00  
				
					
						
							
							
								 
						
							
								b7863a5f48 
								
							 
						 
						
							
							
								
								Merge pull request  #4381  from blueyed/callinfo-repr  
							
							... 
							
							
							
							Fix CallInfo.__repr__ for unfinished call 
							
						 
						
							2018-11-13 18:13:58 +01:00  
				
					
						
							
							
								 
						
							
								a72eff5a08 
								
							 
						 
						
							
							
								
								Merge pull request  #4382  from blueyed/pytester-pop-TOX_ENV_DIR  
							
							... 
							
							
							
							pytester: pop TOX_ENV_DIR from os.environ 
							
						 
						
							2018-11-13 12:42:51 +01:00  
				
					
						
							
							
								 
						
							
								46c8363e12 
								
							 
						 
						
							
							
								
								Merge pull request  #4380  from blueyed/improve-ci  
							
							... 
							
							
							
							Travis: move faster builds to baseline 
							
						 
						
							2018-11-13 12:40:26 +01:00  
				
					
						
							
							
								 
						
							
								557cb6cffe 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-11-13 09:01:37 -02:00  
				
					
						
							
							
								 
						
							
								8198e7cd33 
								
							 
						 
						
							
							
								
								Merge pull request  #4349  from nicoddemus/pytest4-warnings-as-errors  
							
							... 
							
							
							
							Change RemovedInPytest4Warnings to errors by default 
							
						 
						
							2018-11-13 08:31:47 -02:00  
				
					
						
							
							
								 
						
							
								a6a96469ca 
								
							 
						 
						
							
							
								
								pytester: pop TOX_ENV_DIR from os.environ  
							
							... 
							
							
							
							Closes: https://github.com/pytest-dev/pytest/pull/4378 
Fixes: https://github.com/pytest-dev/pytest/issues/4366  
							
						 
						
							2018-11-13 09:02:52 +01:00  
				
					
						
							
							
								 
						
							
								27dab4e05f 
								
							 
						 
						
							
							
								
								Fix CallInfo.__repr__ for unfinished call  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/3554 
Ref: https://github.com/pytest-dev/pytest/pull/3560 
Ref: https://github.com/pytest-dev/pytest/pull/3562  
							
						 
						
							2018-11-13 08:51:43 +01:00  
				
					
						
							
							
								 
						
							
								3e05848ab9 
								
							 
						 
						
							
							
								
								AppVeyor: run py{27,37}-xdist first  
							
							
							
						 
						
							2018-11-13 01:33:05 +01:00  
				
					
						
							
							
								 
						
							
								5902e5a2ce 
								
							 
						 
						
							
							
								
								Travis: move faster builds to baseline  
							
							... 
							
							
							
							- use py27-pexpect,py27-trial,py27-numpy and py37-xdist in baseline,
  using pexpect there catches errors with pdb tests early, and
  py37-xdist is much faster than py37.
- move py34 and py36 out of baseline. 
							
						 
						
							2018-11-13 01:26:22 +01:00  
				
					
						
							
							
								 
						
							
								243d898b38 
								
							 
						 
						
							
							
								
								Merge pull request  #4373  from blueyed/py37-by-default  
							
							... 
							
							
							
							CI: use py37 instead of py36 by default 
							
						 
						
							2018-11-12 20:56:10 -02:00  
				
					
						
							
							
								 
						
							
								f8f22d29ee 
								
							 
						 
						
							
							
								
								Use a custom cache directory for test_stepwise tests  
							
							... 
							
							
							
							Otherwise the tests will use tox's env cache which makes them flaky 
							
						 
						
							2018-11-12 16:57:39 -02:00  
				
					
						
							
							
								 
						
							
								dc20dedbc7 
								
							 
						 
						
							
							
								
								Change RemovedInPytest4Warnings to errors by default  
							
							... 
							
							
							
							To keep existing tests which emit RemovedInPytest4Warnings running, decided
to go with a command line option because:
* Is harder to integrate an ini option with tests which already use an ini file
* It also marks tests which need to be removed/updated in 4.1, when
  RemovedInPytest4Warning and related functionality are removed.
Fix  #3737  
							
						 
						
							2018-11-12 16:10:57 -02:00  
				
					
						
							
							
								 
						
							
								3cec1482eb 
								
							 
						 
						
							
							
								
								Merge branch 'master' into py37-by-default  
							
							
							
						 
						
							2018-11-12 14:03:59 -02:00  
				
					
						
							
							
								 
						
							
								0df5ce4082 
								
							 
						 
						
							
							
								
								Fix basepython for linting testenv in tox.ini  
							
							
							
						 
						
							2018-11-12 14:03:04 -02:00  
				
					
						
							
							
								 
						
							
								93a9836962 
								
							 
						 
						
							
							
								
								Merge pull request  #4374  from blueyed/doctesting  
							
							... 
							
							
							
							CI: doctesting uses coverage, fiy py37 on AppVeyor 
							
						 
						
							2018-11-12 13:57:58 -02:00  
				
					
						
							
							
								 
						
							
								935b106213 
								
							 
						 
						
							
							
								
								CI: use py37 instead of py36 by default  
							
							... 
							
							
							
							Closes https://github.com/pytest-dev/pytest/issues/4370 . 
							
						 
						
							2018-11-12 03:16:52 +01:00  
				
					
						
							
							
								 
						
							
								74366426b9 
								
							 
						 
						
							
							
								
								Travis: use last TOXENV for PATH  
							
							
							
						 
						
							2018-11-11 22:08:45 +01:00  
				
					
						
							
							
								 
						
							
								9628242423 
								
							 
						 
						
							
							
								
								CI: doctesting uses coverage, fiy py37 on AppVeyor  
							
							
							
						 
						
							2018-11-11 21:49:59 +01:00  
				
					
						
							
							
								 
						
							
								9af613bef2 
								
							 
						 
						
							
							
								
								Merge pull request  #4372  from nicoddemus/release-3.10.1  
							
							... 
							
							
							
							Release version 3.10.1 
							
						 
						
							2018-11-11 15:35:21 -02:00  
				
					
						
							
							
								 
						
							
								7b833ce5f9 
								
							 
						 
						
							
							
								
								Merge pull request  #4368  from blueyed/toxenv-coverage  
							
							... 
							
							
							
							Travis: use coverage from existing tox env  [skip appveyor] 
							
						 
						
							2018-11-11 11:57:20 -02:00  
				
					
						
							
							
								 
						
							
								11a9cbd50b 
								
							 
						 
						
							
							
								
								Merge pull request  #4365  from blueyed/xenial  
							
							... 
							
							
							
							Travis: use Xenial by default  [skip appveyor] 
							
						 
						
							2018-11-11 11:55:06 -02:00  
				
					
						
							
							
								 
						
							
								2626bd9afa 
								
							 
						 
						
							
							
								
								Preparing release version 3.10.1  
							
							
							
						 
						
							2018-11-11 13:43:04 +00:00