elizabeth
							
						 
						
							 
							
							
							
							
								
							
							
								e67d66a5d4 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-dev'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS 
							
						 
						
							2015-08-24 22:55:11 +03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d49fb8a2d5 
								
							 
						 
						
							
							
								
								Change cx_freeze example to not use regendoc  
							
							 
							
							
							
						 
						
							2015-08-08 19:17:50 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								e8583f01a0 
								
							 
						 
						
							
							
								
								Replaced __multicall__ examples in docs by hookwrapper  
							
							 
							
							... 
							
							
							
							Fix  #929  
							
						 
						
							2015-08-08 19:07:27 -03:00  
						
					 
				
					
						
							
							
								 
								Abhijeet Kasurde
							
						 
						
							 
							
							
							
							
								
							
							
								e79413acc4 
								
							 
						 
						
							
							
								
								Updated documentation from txt to rst  
							
							 
							
							... 
							
							
							
							Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> 
							
						 
						
							2015-08-04 16:41:02 +05:30  
						
					 
				
					
						
							
							
								 
								elizabeth
							
						 
						
							 
							
							
							
							
								
							
							
								f7bacd169e 
								
							 
						 
						
							
							
								
								Update docs  
							
							 
							
							
							
						 
						
							2015-08-04 00:48:41 +03:00  
						
					 
				
					
						
							
							
								 
								Maarten
							
						 
						
							 
							
							
							
							
								
							
							
								df8a83b2a1 
								
							 
						 
						
							
							
								
								changed contents -> content but still  #753  did not solved, might be issues with regendoc  
							
							 
							
							
							
						 
						
							2015-07-25 17:48:12 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								43d27ec7ed 
								
							 
						 
						
							
							
								
								use regendoc normalization and regenerate docs  
							
							 
							
							... 
							
							
							
							--HG--
branch : regendoc-upgrade 
							
						 
						
							2015-06-06 23:30:49 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								a2bb2ff164 
								
							 
						 
						
							
							
								
								port typo fix  
							
							 
							
							
							
						 
						
							2015-06-03 23:43:12 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								b5fd3cfb84 
								
							 
						 
						
							
							
								
								fix typo  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-06-03 23:42:38 +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
							
						 
						
							 
							
							
							
							
								
							
							
								738c8762df 
								
							 
						 
						
							
							
								
								Regenerate docs using 2.7.1  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 01:54:24 +01: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
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								d2a8866bce 
								
							 
						 
						
							
							
								
								bump verrsion to python2.7, fix a too precise test for windows, regen docs  
							
							 
							
							
							
						 
						
							2015-03-26 09:34:10 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								3d0b756877 
								
							 
						 
						
							
							
								
								merge in the 2.6 maintenance branch  
							
							 
							
							
							
						 
						
							2015-02-22 11:45:07 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								e0251ecb41 
								
							 
						 
						
							
							
								
								regen docs  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.6 
							
						 
						
							2014-10-24 15:08:43 +02:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								8d19ccb56f 
								
							 
						 
						
							
							
								
								Merged in pfctdayelise/pytest/issue351 (pull request  #161 )  
							
							 
							
							... 
							
							
							
							Fixes issue351: Add ability to specify parametrize ids as a
callable, to generate custom test ids. + tests, docs
Hg branch merge 
							
						 
						
							2014-10-22 23:18:01 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								b928928942 
								
							 
						 
						
							
							
								
								added support for glob-style patterns to python_classes and python_functions config options  
							
							 
							
							... 
							
							
							
							fixes  #600 
--HG--
branch : python-classes-glob 
							
						 
						
							2014-10-16 19:27:10 -03:00  
						
					 
				
					
						
							
							
								 
								TomV
							
						 
						
							 
							
							
							
							
								
							
							
								4cadc600d5 
								
							 
						 
						
							
							
								
								fix issue552: note about marking single callables  
							
							 
							
							
							
						 
						
							2014-10-12 19:07:03 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								89de87dce1 
								
							 
						 
						
							
							
								
								Document the ids keyword for fixture parametrisation  
							
							 
							
							... 
							
							
							
							--HG--
branch : issue351 
							
						 
						
							2014-10-08 00:43:27 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								2eef674615 
								
							 
						 
						
							
							
								
								regen and fix some docs (tox -e regen)  
							
							 
							
							... 
							
							
							
							bump versions, depend on already released py-1.4.25 
							
						 
						
							2014-09-24 14:46:56 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								79d2edcbff 
								
							 
						 
						
							
							
								
								Merged in flub/pytest (pull request  #207 )  
							
							 
							
							... 
							
							
							
							Show both user assertion msg as explanation (issue549) 
							
						 
						
							2014-09-22 19:16:10 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								6aa5611ae5 
								
							 
						 
						
							
							
								
								fix issue584: fix py3 syntax errors for example/special.txt.  
							
							 
							
							... 
							
							
							
							Thanks Bruno Oliveira. 
							
						 
						
							2014-09-15 15:04:09 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								2a504a5bcd 
								
							 
						 
						
							
							
								
								regen docs for 2.6.2  
							
							 
							
							
							
						 
						
							2014-09-05 13:55:00 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								745737e337 
								
							 
						 
						
							
							
								
								strike python2.5 from test code cc @flub  
							
							 
							
							
							
						 
						
							2014-09-05 09:50:40 +02:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								7760cf1881 
								
							 
						 
						
							
							
								
								Fix doctest tox run  
							
							 
							
							... 
							
							
							
							The new failures in the failure demo apparently affect the
doctests tox run. 
							
						 
						
							2014-08-23 19:01:26 +02:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								37bd1e03cb 
								
							 
						 
						
							
							
								
								Show user assertion messages and instrospection together  
							
							 
							
							... 
							
							
							
							User provided messages, or any valid expression given as second
argument to the assert statement, are now shown in addition to the
py.test introspection details.  Formerly any user provided message
would entirely replace the introspection details.
Fixes issue549. 
							
						 
						
							2014-08-23 18:14:25 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ccd67733fb 
								
							 
						 
						
							
							
								
								standard lib modules no longer required in freeze_includes() and updated docs  
							
							 
							
							... 
							
							
							
							--HG--
branch : cx_freeze-support 
							
						 
						
							2014-08-11 20:20:41 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5873ca5146 
								
							 
						 
						
							
							
								
								Merging with default  
							
							 
							
							... 
							
							
							
							--HG--
branch : cx_freeze-support 
							
						 
						
							2014-08-11 20:07:11 -03:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								e5eaf02e19 
								
							 
						 
						
							
							
								
								finalize pytest-2.6.1 release, regen docs  
							
							 
							
							
							
						 
						
							2014-08-07 21:41:51 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3c649cf91d 
								
							 
						 
						
							
							
								
								guarding scripts with __main__ and doc changes  
							
							 
							
							... 
							
							
							
							tox-flakes environment tries to import the modules for
checking, and that may fail because of its dependencies
--HG--
branch : cx_freeze-support 
							
						 
						
							2014-07-30 22:28:03 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								b7b96b24d8 
								
							 
						 
						
							
							
								
								Docs about cx_freeze support and minor adjustments  
							
							 
							
							... 
							
							
							
							--HG--
branch : cx_freeze-support 
							
						 
						
							2014-07-30 21:50:00 -03:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								7c701948d5 
								
							 
						 
						
							
							
								
								Merged in nicoddemus/pytest/cx_freeze-docs (pull request  #188 )  
							
							 
							
							... 
							
							
							
							Documentation example on how to integrate pytest and cx_freeze 
							
						 
						
							2014-07-29 12:43:04 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								899b804ec1 
								
							 
						 
						
							
							
								
								Improved the text a little  
							
							 
							
							... 
							
							
							
							--HG--
branch : cx_freeze-docs 
							
						 
						
							2014-07-28 22:46:57 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								66bd4e485a 
								
							 
						 
						
							
							
								
								Adding blurb about using pytest runner and cx_freeze  
							
							 
							
							... 
							
							
							
							--HG--
branch : cx_freeze-docs 
							
						 
						
							2014-07-28 22:40:23 -03:00  
						
					 
				
					
						
							
							
								 
								david@mcbf.net
							
						 
						
							 
							
							
							
							
								
							
							
								d08c4ce0ad 
								
							 
						 
						
							
							
								
								Tiny example update for clarification  
							
							 
							
							... 
							
							
							
							--HG--
branch : xfail-cause 
							
						 
						
							2014-07-26 18:24:55 +02:00  
						
					 
				
					
						
							
							
								 
								david@mcbf.net
							
						 
						
							 
							
							
							
							
								
							
							
								91e2b23258 
								
							 
						 
						
							
							
								
								Update documentation  
							
							 
							
							... 
							
							
							
							--HG--
branch : xfail-cause 
							
						 
						
							2014-07-26 18:10:32 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								98de64badc 
								
							 
						 
						
							
							
								
								regen docs for pytest-2.6  
							
							 
							
							
							
						 
						
							2014-07-17 16:55:24 +02:00  
						
					 
				
					
						
							
							
								 
								Brianna Laugher
							
						 
						
							 
							
							
							
							
								
							
							
								4e35c00ab0 
								
							 
						 
						
							
							
								
								issue351: Add ability to specify parametrize ids as a callable, to generate custom test ids. + tests, docs  
							
							 
							
							... 
							
							
							
							--HG--
branch : issue351 
							
						 
						
							2014-04-17 15:08:49 -04:00  
						
					 
				
					
						
							
							
								 
								Andy Freeland
							
						 
						
							 
							
							
							
							
								
							
							
								1728798e81 
								
							 
						 
						
							
							
								
								Interal link to node ID explanation  
							
							 
							
							... 
							
							
							
							--HG--
branch : issue499 
							
						 
						
							2014-04-14 14:24:13 -04:00  
						
					 
				
					
						
							
							
								 
								Andy Freeland
							
						 
						
							 
							
							
							
							
								
							
							
								53a8d20d88 
								
							 
						 
						
							
							
								
								fix issue499: document selecting tests by node ID  
							
							 
							
							... 
							
							
							
							--HG--
branch : issue499 
							
						 
						
							2014-04-14 12:27:55 -04:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								25ab906b8b 
								
							 
						 
						
							
							
								
								add release announcement, bump version to 2.5.2,  
							
							 
							
							... 
							
							
							
							add links to plugins index, regenerate doc examples. 
							
						 
						
							2014-01-29 13:47:11 +01:00  
						
					 
				
					
						
							
							
								 
								Jurko Gospodnetić
							
						 
						
							 
							
							
							
							
								
							
							
								9fb2079458 
								
							 
						 
						
							
							
								
								replace py.test module references with pytest  
							
							 
							
							... 
							
							
							
							The only remaining 'py.test' references are:
 * those referring to the 'py.test' executable
 * those in code explicitly testing py.test/pytest module compatibility
 * those in old CHANGES documentation
 * those in documentation generated based on external data
 * those in seemingly unfinished & unmaintained Japanese documentation
Minor stylistic changes and typo corrections made to documentation next to
several applied py.test --> pytest content changes. 
							
						 
						
							2014-01-18 12:31:33 +01:00  
						
					 
				
					
						
							
							
								 
								Philippe Muller
							
						 
						
							 
							
							
							
							
								
							
							
								e6ae68c0cc 
								
							 
						 
						
							
							
								
								Fix minor typo in special.txt  
							
							 
							
							
							
						 
						
							2013-12-20 14:01:17 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								6b2040f98d 
								
							 
						 
						
							
							
								
								regen docs for 2.5.1, add links for coverage reports  
							
							 
							
							
							
						 
						
							2013-12-17 08:30:35 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								bfa53811d3 
								
							 
						 
						
							
							
								
								regen docs and bump version to 2.5.0  
							
							 
							
							
							
						 
						
							2013-12-11 12:20:19 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								94031f9cef 
								
							 
						 
						
							
							
								
								apply doc changes from just backed out changeset  
							
							 
							
							
							
						 
						
							2013-11-22 13:53:43 +01:00