Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								ff8d787cd5 
								
							 
						 
						
							
							
								
								Fix monkeypatch.setenv with string and raising=False.  
							
							 
							
							... 
							
							
							
							Fixes  #746 . 
							
						 
						
							2015-05-19 22:59:49 +02:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								d299f0d99f 
								
							 
						 
						
							
							
								
								Merge changes from 2.7.1 release  
							
							 
							
							... 
							
							
							
							This is mostly doc examples regeneration, other changes are:
- Add 2.7.1 tag to .hgtags
- Update changelog to use real versions
- Update HOWTORELEASE.rst
- Fix rst in doc/en/adopt.txt
- Fix CHANGELOG and release-2.7.0 rst formatting 
							
						 
						
							2015-05-19 21:43:50 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								bf837164b4 
								
							 
						 
						
							
							
								
								Add how to upload a wheel and tag the release  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 09:32:21 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								f6d589caa1 
								
							 
						 
						
							
							
								
								Added tag 2.7.1 for changeset edc1d080bab5  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 09:26:59 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								738c8762df 
								
							 
						 
						
							
							
								
								Regenerate docs using 2.7.1  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 01:54:24 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								3d990a6237 
								
							 
						 
						
							
							
								
								Fix rest formatting and set final version number  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 01:53:06 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								b024dbe794 
								
							 
						 
						
							
							
								
								Remove unused link  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 01:52:33 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								83a93e5e9a 
								
							 
						 
						
							
							
								
								More updates/fixes to release process  
							
							 
							
							... 
							
							
							
							Some of this is temporary, but this is how I got things to work.
--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 01:52:06 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								504b6b72a9 
								
							 
						 
						
							
							
								
								Set 2.7.1 version number  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 01:50:32 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								3401049dea 
								
							 
						 
						
							
							
								
								remove adopt pytest note  
							
							 
							
							
							
						 
						
							2015-05-12 13:36:43 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								45851644c1 
								
							 
						 
						
							
							
								
								remove adopt message  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-12 13:34:32 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a7f880fa1f 
								
							 
						 
						
							
							
								
								Make "running" output from testdir.run copy/pastable  
							
							 
							
							... 
							
							
							
							fix 741
--HG--
branch : issue-741-pytester-output 
							
						 
						
							2015-05-09 10:24:33 -03:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								c4bd3c672b 
								
							 
						 
						
							
							
								
								another try at ignoring cx_freeze during other tox envs  
							
							 
							
							
							
						 
						
							2015-05-07 12:19:35 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								52354b9ab5 
								
							 
						 
						
							
							
								
								try to ignore cx_freeze from regular pytest runs and see if travis is happy  
							
							 
							
							
							
						 
						
							2015-05-07 12:02:14 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								3c187c844e 
								
							 
						 
						
							
							
								
								make default depend on just published py/pluggy releases  
							
							 
							
							
							
						 
						
							2015-05-07 11:50:08 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								45ed4c726e 
								
							 
						 
						
							
							
								
								Merged in hpk42/pytest-patches/plug30 (pull request  #291 )  
							
							 
							
							... 
							
							
							
							use new pluggy api (now at 0.3.0) for adding hookcall monitoring 
							
						 
						
							2015-05-07 11:24:39 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								d9a44098ce 
								
							 
						 
						
							
							
								
								use new pluggy api (now at 0.3.0) for adding hookcall monitoring  
							
							 
							
							... 
							
							
							
							and reraise real keyboard interrupts during inline pytest runs
to allow for better stopping of the pytest tests.
--HG--
branch : plug30 
							
						 
						
							2015-05-07 11:02:55 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								b93abfb3d1 
								
							 
						 
						
							
							
								
								Merged in hpk42/pytest-patches/pluggy1 (pull request  #290 )  
							
							 
							
							... 
							
							
							
							integrate pluggy as external plugin manager 
							
						 
						
							2015-05-06 15:02:05 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								bb8141e27c 
								
							 
						 
						
							
							
								
								- make sure sub pytest runs use the same basetemp  
							
							 
							
							... 
							
							
							
							- depend on pluggy < 0.3
--HG--
branch : pluggy1 
							
						 
						
							2015-05-06 14:58:46 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								bddc88f09e 
								
							 
						 
						
							
							
								
								adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts  
							
							 
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-06 10:08:08 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								5ea7f0342b 
								
							 
						 
						
							
							
								
								Merged default into pluggy1  
							
							 
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-05 22:29:53 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								13db045fc4 
								
							 
						 
						
							
							
								
								merge  
							
							 
							
							
							
						 
						
							2015-05-05 21:55:39 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								23538bcd31 
								
							 
						 
						
							
							
								
								- some more adaptation to most recent pluggy API  
							
							 
							
							... 
							
							
							
							- avoid using pluggin underscore api
- show pluggy version in header
--HG--
branch : pluggy1 
							
						 
						
							2015-05-05 21:53:04 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								a4f2236b36 
								
							 
						 
						
							
							
								
								merge default  
							
							 
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-05 14:52:16 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								88538f13ba 
								
							 
						 
						
							
							
								
								adapt for current API changes of pluggy  
							
							 
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-04 15:08:41 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								920b5afe45 
								
							 
						 
						
							
							
								
								now that we are going to have wheels, py source code might be not be installed  
							
							 
							
							... 
							
							
							
							and the resulting genscript is useless
--HG--
branch : pluggy1 
							
						 
						
							2015-05-04 14:42:01 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								e4b9603fa8 
								
							 
						 
						
							
							
								
								Merged in famousgarkin/pytest/famousgarkin/monkeypatchchdir-docstring-punctuation-1430453576841 (pull request  #288 )  
							
							 
							
							... 
							
							
							
							monkeypatch.chdir docstring punctuation 
							
						 
						
							2015-05-04 14:28:32 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								ef7f627573 
								
							 
						 
						
							
							
								
								merging pytest-2.7  
							
							 
							
							
							
						 
						
							2015-05-04 14:27:09 +02:00  
						
					 
				
					
						
							
							
								 
								Eric Siegerman
							
						 
						
							 
							
							
							
							
								
							
							
								5a06330f61 
								
							 
						 
						
							
							
								
								Doc typo  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-01 11:18:17 -04:00  
						
					 
				
					
						
							
							
								 
								Janne Vanhala
							
						 
						
							 
							
							
							
							
								
							
							
								93628fc0eb 
								
							 
						 
						
							
							
								
								Include setup and teardown in junitxml test durations  
							
							 
							
							... 
							
							
							
							--HG--
branch : include-setup-teardown-duration-in-junitxml 
							
						 
						
							2015-05-01 14:55:52 +03:00  
						
					 
				
					
						
							
							
								 
								famousgarkin
							
						 
						
							 
							
							
							
							
								
							
							
								47936643c9 
								
							 
						 
						
							
							
								
								monkeypatch.chdir docstring punctuation  
							
							 
							
							... 
							
							
							
							--HG--
branch : famousgarkin/monkeypatchchdir-docstring-punctuation-1430453576841 
							
						 
						
							2015-05-01 04:13:06 +00:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								11ad61ba07 
								
							 
						 
						
							
							
								
								Use current regendocs location  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-01 00:27:47 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								129549fd5b 
								
							 
						 
						
							
							
								
								Some more tweaks of how to release  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-01 00:27:04 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								652a353319 
								
							 
						 
						
							
							
								
								Some small corrections to release process  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-04-30 22:55:01 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								d6d8d5b9d1 
								
							 
						 
						
							
							
								
								Prepare docs for bugfix release  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-04-30 22:54:43 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								aa2ffb9805 
								
							 
						 
						
							
							
								
								Merge fix for issue 731 from pytest-2.7  
							
							 
							
							
							
						 
						
							2015-04-30 21:13:03 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								7f554f50e3 
								
							 
						 
						
							
							
								
								Fix collapse false to look at unescaped braces only  
							
							 
							
							... 
							
							
							
							Sometimes the repr of an object can contain the "\n{" sequence which is
used as a formatting language, so they are escaped to "\\n{".  But the
collapse-false code needs to look for the real "\n{" token instead of
simply "{" as otherwise it may get unbalanced braces from the object's
repr (sometimes caused by the collapsing of long reprs by saferepr).
Fixes issue #731 .
--HG--
branch : pytest-2.7 
							
						 
						
							2015-04-30 02:31:12 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								25963e0544 
								
							 
						 
						
							
							
								
								adapt pytest to pluggy's decoratorclass branch  
							
							 
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:52 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								5ee7ee0850 
								
							 
						 
						
							
							
								
								adapt pytest to using pluggy (current master)  
							
							 
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:51 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								d6670bd6a8 
								
							 
						 
						
							
							
								
								Merged in hpk42/pytest-patches/testrefactor (pull request  #284 )  
							
							 
							
							... 
							
							
							
							majorly refactor pytester and speed/streamline  tests 
							
						 
						
							2015-04-29 16:32:28 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								9aec5cd52d 
								
							 
						 
						
							
							
								
								use runpytest() instead of runpytest_inprocess if a test can run as subprocess as well  
							
							 
							
							... 
							
							
							
							--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 12:05:08 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								4d5161444c 
								
							 
						 
						
							
							
								
								merge  
							
							 
							
							... 
							
							
							
							--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:56:57 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								db5649ec6a 
								
							 
						 
						
							
							
								
								streamline pytester API majorly:  
							
							 
							
							... 
							
							
							
							- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
  runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:53 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								a8afba054a 
								
							 
						 
						
							
							
								
								- refine lsof checking  
							
							 
							
							... 
							
							
							
							- make runpytest() create an inline testing process instead of
  a subprocess one
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:46 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								d3e363b97a 
								
							 
						 
						
							
							
								
								- make API between runpytest() and inline_run() more similar  
							
							 
							
							... 
							
							
							
							- shift a number of tests to become inline_run() tests
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:45 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								2e3e1e9b7e 
								
							 
						 
						
							
							
								
								Merged in hpk42/pytest-patches/plugtestfix (pull request  #283 )  
							
							 
							
							... 
							
							
							
							make test suite more tolerable against xdist causing warnings itself 
							
						 
						
							2015-04-28 11:52:53 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								424e5d1394 
								
							 
						 
						
							
							
								
								make test suite more tolerable against xdist causing warnings itself (which it does  
							
							 
							
							... 
							
							
							
							currently)
--HG--
branch : plugtestfix 
							
						 
						
							2015-04-27 15:06:47 +02:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								2d8f115d8c 
								
							 
						 
						
							
							
								
								Merged in hpk42/pytest-patches/more_plugin (pull request  #282 )  
							
							 
							
							... 
							
							
							
							another major pluginmanager refactor and docs 
							
						 
						
							2015-04-27 13:17:40 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								b2d66b9e7b 
								
							 
						 
						
							
							
								
								simplify load_setuptools_entrypoints and refine comments/docstrings  
							
							 
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-27 14:10:33 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								c54afbe42e 
								
							 
						 
						
							
							
								
								deprecate and warn about __multicall__ usage in hooks, refine docs about hook ordering,  
							
							 
							
							... 
							
							
							
							make hookwrappers respect tryfirst/trylast
--HG--
branch : more_plugin 
							
						 
						
							2015-04-27 12:50:34 +02:00