8338c692a3 
								
							 
						 
						
							
							
								
								Merge pull request  #887  from maartenq/753content_of  
							
							... 
							
							
							
							changed contents -> content but still #753  did not solved, might be i… 
							
						 
						
							2015-07-25 19:11:53 +02:00  
				
					
						
							
							
								 
						
							
								df8a83b2a1 
								
							 
						 
						
							
							
								
								changed contents -> content but still  #753  did not solved, might be issues with regendoc  
							
							
							
						 
						
							2015-07-25 17:48:12 +02:00  
				
					
						
							
							
								 
						
							
								00e1a2122a 
								
							 
						 
						
							
							
								
								Deprecate and warn about --genscript,  fixes   #730  
							
							
							
						 
						
							2015-07-25 15:10:22 +02:00  
				
					
						
							
							
								 
						
							
								ab9e246ab0 
								
							 
						 
						
							
							
								
								Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini files by default  
							
							... 
							
							
							
							As discussed in #82  
							
						 
						
							2015-07-23 23:21:07 -03:00  
				
					
						
							
							
								 
						
							
								6af7172204 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							
							
						 
						
							2015-07-19 15:25:04 +02:00  
				
					
						
							
							
								 
						
							
								da1d5712cf 
								
							 
						 
						
							
							
								
								Fix broken links  
							
							... 
							
							
							
							Fix  #857  
						
							2015-07-18 14:15:07 -03:00  
				
					
						
							
							
								 
						
							
								94cdec2cfe 
								
							 
						 
						
							
							
								
								Update sidebar links from Bitbucket to GitHub  
							
							
							
						 
						
							2015-07-16 03:08:06 +00:00  
				
					
						
							
							
								 
						
							
								ebf32ae8a9 
								
							 
						 
						
							
							
								
								Update CONTRIBUTING documentation with GitHub instructions  
							
							
							
						 
						
							2015-07-16 03:07:16 +00:00  
				
					
						
							
							
								 
						
							
								0f52856f99 
								
							 
						 
						
							
							
								
								Use a subdirectory in the TEMP directory to speed up tmpdir creation  
							
							... 
							
							
							
							Fix  #105  
						
							2015-07-15 20:03:58 -03:00  
				
					
						
							
							
								 
						
							
								8f4f2c665d 
								
							 
						 
						
							
							
								
								Mention pytest-runner in the docs  
							
							... 
							
							
							
							Fix  #147  
						
							2015-07-13 21:59:37 -03:00  
				
					
						
							
							
								 
						
							
								854e603f84 
								
							 
						 
						
							
							
								
								Add new testdirs ini option  
							
							... 
							
							
							
							Fix  #694  
						
							2015-07-10 21:52:47 -03:00  
				
					
						
							
							
								 
						
							
								0ee3ee7333 
								
							 
						 
						
							
							
								
								Add syntax highlighting to missing snippets in the documentation and other fixes  
							
							... 
							
							
							
							- Add explicit "code-block" for sessions without syntax highlight
- Moved Metafunc documentation to the class docstring and reused that in the
   docs; 
							
						 
						
							2015-07-09 21:50:38 -03:00  
				
					
						
							
							
								 
						
							
								ae4c8b8635 
								
							 
						 
						
							
							
								
								Merge pull request  #787  from pytest-dev/pluggy-bc-fix  
							
							... 
							
							
							
							Reintroduce get_plugin_manager() for backward-compatibility 
							
						 
						
							2015-07-08 19:28:01 -03:00  
				
					
						
							
							
								 
						
							
								4fa64a962e 
								
							 
						 
						
							
							
								
								Fix typo + grammar  
							
							
							
						 
						
							2015-07-07 16:35:21 -07:00  
				
					
						
							
							
								 
						
							
								76497c2542 
								
							 
						 
						
							
							
								
								Fix plugins_index script and update plugins_index.txt  
							
							
							
						 
						
							2015-06-30 19:01:28 -03:00  
				
					
						
							
							
								 
						
							
								3c2fd833ca 
								
							 
						 
						
							
							
								
								Reintroduce get_plugin_manager() for backward-compatibility  
							
							... 
							
							
							
							PyCharm pytest runner depends on this function existing (see #787 ).
Added reference to get_plugin_manager() and PluginManager/PytestPluginManager to docs 
							
						 
						
							2015-06-25 00:48:47 -03:00  
				
					
						
							
							
								 
						
							
								ee40ea5f6d 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	AUTHORS
	_pytest/__init__.py
	setup.py
	testing/conftest.py
	tox.ini 
							
						 
						
							2015-06-23 16:49:05 +02:00  
				
					
						
							
							
								 
						
							
								e84c00efae 
								
							 
						 
						
							
							
								
								finish pytest-2.7.2 release  
							
							
							
						 
						
							2015-06-23 16:31:24 +02:00  
				
					
						
							
							
								 
						
							
								898b63b665 
								
							 
						 
						
							
							
								
								change spelling, thanks Maciej Maciaszek  
							
							
							
						 
						
							2015-06-22 11:34:00 +02:00  
				
					
						
							
							
								 
						
							
								d4e77faea7 
								
							 
						 
						
							
							
								
								Update sidebar links from Bitbucket to GitHub  
							
							
							
						 
						
							2015-06-15 19:18:03 -03:00  
				
					
						
							
							
								 
						
							
								ff58ae66c0 
								
							 
						 
						
							
							
								
								Update CONTRIBUTING documentation with GitHub instructions  
							
							
							
						 
						
							2015-06-15 18:54:44 -03:00  
				
					
						
							
							
								 
						
							
								b40f760cc3 
								
							 
						 
						
							
							
								
								Change links from bitbucket to GitHub  
							
							
							
						 
						
							2015-06-15 18:28:31 -03:00  
				
					
						
							
							
								 
						
							
								43d27ec7ed 
								
							 
						 
						
							
							
								
								use regendoc normalization and regenerate docs  
							
							... 
							
							
							
							--HG--
branch : regendoc-upgrade 
							
						 
						
							2015-06-06 23:30:49 +02:00  
				
					
						
							
							
								 
						
							
								a2bb2ff164 
								
							 
						 
						
							
							
								
								port typo fix  
							
							
							
						 
						
							2015-06-03 23:43:12 +02:00  
				
					
						
							
							
								 
						
							
								b5fd3cfb84 
								
							 
						 
						
							
							
								
								fix typo  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-06-03 23:42:38 +02:00  
				
					
						
							
							
								 
						
							
								b09be4e3ef 
								
							 
						 
						
							
							
								
								Merged in flub/pytest (pull request  #297 )  
							
							... 
							
							
							
							Merge 2.7.1 release changes into default 
							
						 
						
							2015-05-31 20:27:13 +01:00  
				
					
						
							
							
								 
						
							
								efce2ababa 
								
							 
						 
						
							
							
								
								add in missing finalizer to doc example  
							
							
							
						 
						
							2015-05-21 19:15:52 -07:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								738c8762df 
								
							 
						 
						
							
							
								
								Regenerate docs using 2.7.1  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 01:54:24 +01:00  
				
					
						
							
							
								 
						
							
								3d990a6237 
								
							 
						 
						
							
							
								
								Fix rest formatting and set final version number  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 01:53:06 +01:00  
				
					
						
							
							
								 
						
							
								b024dbe794 
								
							 
						 
						
							
							
								
								Remove unused link  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 01:52:33 +01:00  
				
					
						
							
							
								 
						
							
								3401049dea 
								
							 
						 
						
							
							
								
								remove adopt pytest note  
							
							
							
						 
						
							2015-05-12 13:36:43 +02:00  
				
					
						
							
							
								 
						
							
								45851644c1 
								
							 
						 
						
							
							
								
								remove adopt message  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-12 13:34:32 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								5ea7f0342b 
								
							 
						 
						
							
							
								
								Merged default into pluggy1  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-05 22:29:53 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								ef7f627573 
								
							 
						 
						
							
							
								
								merging pytest-2.7  
							
							
							
						 
						
							2015-05-04 14:27:09 +02:00  
				
					
						
							
							
								 
						
							
								5a06330f61 
								
							 
						 
						
							
							
								
								Doc typo  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-01 11:18:17 -04:00  
				
					
						
							
							
								 
						
							
								d6d8d5b9d1 
								
							 
						 
						
							
							
								
								Prepare docs for bugfix release  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-04-30 22:54:43 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								ea50ef1588 
								
							 
						 
						
							
							
								
								split plugin documentation into "using" and "writing plugins",  
							
							... 
							
							
							
							referencing each other.  Also add tryfirst/trylast examples.
--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								d2a5c7f99b 
								
							 
						 
						
							
							
								
								add documented hookimpl_opts and hookspec_opts decorators  
							
							... 
							
							
							
							so that one doesn't have to use pytest.mark or function-attribute setting anymore
--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								1ab93a5f1d 
								
							 
						 
						
							
							
								
								Merged in release-checklist (pull request  #266 )  
							
							... 
							
							
							
							add a release checklist 
							
						 
						
							2015-04-04 16:27:07 +02:00  
				
					
						
							
							
								 
						
							
								6558c7245f 
								
							 
						 
						
							
							
								
								Brought back discussion session  
							
							... 
							
							
							
							Reworded it a bit to bring it to par with the current status
--HG--
branch : yield-experimental-docs 
							
						 
						
							2015-04-03 19:44:06 -03:00  
				
					
						
							
							
								 
						
							
								b3d646455a 
								
							 
						 
						
							
							
								
								Fixed straightforward spelling  
							
							... 
							
							
							
							--HG--
branch : yield-experimental-docs 
							
						 
						
							2015-04-03 17:06:51 -03:00  
				
					
						
							
							
								 
						
							
								161d9e5971 
								
							 
						 
						
							
							
								
								Removed "discussion" session  
							
							... 
							
							
							
							Kept a note about exceptions after yield not being reraised
--HG--
branch : yield-experimental-docs 
							
						 
						
							2015-04-03 16:59:33 -03:00  
				
					
						
							
							
								 
						
							
								30260361dd 
								
							 
						 
						
							
							
								
								Reviewed wording about yield being a "new" feature  
							
							... 
							
							
							
							--HG--
branch : yield-experimental-docs 
							
						 
						
							2015-04-03 16:55:10 -03:00  
				
					
						
							
							
								 
						
							
								c1b935adbd 
								
							 
						 
						
							
							
								
								Removed note about yield fixtures being experimental  
							
							... 
							
							
							
							--HG--
branch : yield-experimental-docs 
							
						 
						
							2015-04-03 16:28:20 -03:00