holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								b5fd3cfb84 
								
							 
						 
						
							
							
								
								fix typo  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-06-03 23:42:38 +02: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  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								45851644c1 
								
							 
						 
						
							
							
								
								remove adopt message  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-12 13:34:32 +02:00  
						
					 
				
					
						
							
							
								 
								Eric Siegerman
							
						 
						
							 
							
							
							
							
								
							
							
								5a06330f61 
								
							 
						 
						
							
							
								
								Doc typo  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-01 11:18:17 -04:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								d6d8d5b9d1 
								
							 
						 
						
							
							
								
								Prepare docs for bugfix release  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-04-30 22:54:43 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								7f05cd8bfc 
								
							 
						 
						
							
							
								
								more streamlining of release checklist  
							
							 
							
							... 
							
							
							
							--HG--
branch : release-checklist 
							
						 
						
							2015-04-02 10:55:24 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								b55d66d0cf 
								
							 
						 
						
							
							
								
								- avoid setting of versions and targets in conf.py and Makefile  
							
							 
							
							... 
							
							
							
							as discussed on pytest-dev
- "make help" now prints pytest specific information.
- add a "_getdoctarget.py" helper
- make ``setup.py`` read the version from ``_pytest/__init__.py``
--HG--
branch : release-checklist 
							
						 
						
							2015-04-02 10:38:25 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								81d7883884 
								
							 
						 
						
							
							
								
								refine release process according to Bruno's feedback  
							
							 
							
							... 
							
							
							
							--HG--
branch : release-checklist 
							
						 
						
							2015-03-27 09:27:31 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								ad137d46a2 
								
							 
						 
						
							
							
								
								add a release checklist  
							
							 
							
							... 
							
							
							
							--HG--
branch : release-checklist 
							
						 
						
							2015-03-26 14:04:33 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								e16983d265 
								
							 
						 
						
							
							
								
								bump versions to dev, including changing the doc-install target to "dev"  
							
							 
							
							... 
							
							
							
							instead of "latest" 
							
						 
						
							2015-03-26 13:48:59 +01: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  
						
					 
				
					
						
							
							
								 
								Anatoly Bubenkov
							
						 
						
							 
							
							
							
							
								
							
							
								d94a29e866 
								
							 
						 
						
							
							
								
								merge almarklein/default  
							
							 
							
							
							
						 
						
							2015-03-23 21:25:10 +01:00  
						
					 
				
					
						
							
							
								 
								Almar Klein
							
						 
						
							 
							
							
							
							
								
							
							
								a9b7de8bf0 
								
							 
						 
						
							
							
								
								address reviewer comments  
							
							 
							
							
							
						 
						
							2015-03-21 17:26:23 +01:00  
						
					 
				
					
						
							
							
								 
								Almar Klein
							
						 
						
							 
							
							
							
							
								
							
							
								0fc75c9622 
								
							 
						 
						
							
							
								
								Storing sys.last_traceback: test, docs and changelog  
							
							 
							
							
							
						 
						
							2015-03-21 17:06:24 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								03c3930734 
								
							 
						 
						
							
							
								
								add a project someone reported a while ago  
							
							 
							
							
							
						 
						
							2015-03-17 13:21:44 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								eead0365b5 
								
							 
						 
						
							
							
								
								Merged in parametrized-fixture-override (pull request  #257 )  
							
							 
							
							... 
							
							
							
							allow to override parametrized fixtures with non-parametrized ones and vice versa 
							
						 
						
							2015-03-12 09:40:56 -03:00  
						
					 
				
					
						
							
							
								 
								Benjamin Peterson
							
						 
						
							 
							
							
							
							
								
							
							
								0c2dfb9683 
								
							 
						 
						
							
							
								
								update website sidebar links for repo move  
							
							 
							
							... 
							
							
							
							--HG--
branch : link-update 
							
						 
						
							2015-03-11 20:04:14 -05:00  
						
					 
				
					
						
							
							
								 
								Anatoly Bubenkov
							
						 
						
							 
							
							
							
							
								
							
							
								d1005ebb8f 
								
							 
						 
						
							
							
								
								document fixture override techniques  
							
							 
							
							... 
							
							
							
							--HG--
branch : parametrized-fixture-override 
							
						 
						
							2015-03-01 18:54:24 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								200fe072f1 
								
							 
						 
						
							
							
								
								moved pytest-plugs to plugincompat  
							
							 
							
							... 
							
							
							
							also plugins_index is ready for 2.7.0 release
--HG--
branch : plugincompat-move 
							
						 
						
							2015-02-28 17:22:42 -03:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								ff9ec13ddb 
								
							 
						 
						
							
							
								
								mention "pytestdotorg" twitter account  
							
							 
							
							
							
						 
						
							2015-02-28 20:02:31 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								1e6e373913 
								
							 
						 
						
							
							
								
								Merged in issue616 (pull request  #252 )  
							
							 
							
							... 
							
							
							
							fix issue616 - conftest visibility fixes. 
							
						 
						
							2015-02-28 10:02:58 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								e510eb0d45 
								
							 
						 
						
							
							
								
								a few more fixes  
							
							 
							
							
							
						 
						
							2015-02-27 16:42:03 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								2e2d6a8bef 
								
							 
						 
						
							
							
								
								make "Adopt pytest" note more prominent, fix link from plugins page.  
							
							 
							
							
							
						 
						
							2015-02-27 15:49:25 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								dbb58b39d9 
								
							 
						 
						
							
							
								
								switch to push to latest docs, because otherwise people get misled to old repos which don't exist anymore  
							
							 
							
							... 
							
							
							
							--HG--
branch : docs_community 
							
						 
						
							2015-02-27 12:53:14 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								c3ca44b46f 
								
							 
						 
						
							
							
								
								change links to go to the new pytest-dev bitbucket team's repo location  
							
							 
							
							... 
							
							
							
							--HG--
branch : docs_community 
							
						 
						
							2015-02-27 12:27:40 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								f6df3b0b97 
								
							 
						 
						
							
							
								
								added documentationo on the new pytest-dev teams on bitbucket and  
							
							 
							
							... 
							
							
							
							github.  See https://pytest.org/latest/contributing.html  (tentative)
Thanks to Anatoly for pushing and initial work on this.
--HG--
branch : docs_community 
							
						 
						
							2015-02-27 11:54:17 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								e9d4853296 
								
							 
						 
						
							
							
								
								Merged contributing-community into default  
							
							 
							
							
							
						 
						
							2015-02-27 11:17:14 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								d73e689991 
								
							 
						 
						
							
							
								
								fix issue616 - conftest visibility fixes.  This is achieved by  
							
							 
							
							... 
							
							
							
							refactoring how nodeid's are constructed.  They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.
--HG--
branch : issue616 
							
						 
						
							2015-02-26 21:56:44 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								aa757f7715 
								
							 
						 
						
							
							
								
								change "install" targets to use pytest-dev user so that Brianna, Ronny, me  
							
							 
							
							... 
							
							
							
							and others can push to pytest.org 
							
						 
						
							2015-02-23 16:14:54 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								4222a806f1 
								
							 
						 
						
							
							
								
								Merged in LucasC/pytest (pull request  #247 )  
							
							 
							
							... 
							
							
							
							Fixing description of --dist=load in the --help documentation for the xdist plugin 
							
						 
						
							2015-02-22 20:04:05 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								f1c9554f42 
								
							 
						 
						
							
							
								
								merge  
							
							 
							
							
							
						 
						
							2015-02-22 12:29:26 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								3d0b756877 
								
							 
						 
						
							
							
								
								merge in the 2.6 maintenance branch  
							
							 
							
							
							
						 
						
							2015-02-22 11:45:07 +01:00  
						
					 
				
					
						
							
							
								 
								Lucas Cimon
							
						 
						
							 
							
							
							
							
								
							
							
								5025478ac2 
								
							 
						 
						
							
							
								
								Fixing description of --dist=load in the --help documentation for the xdist plugin  
							
							 
							
							
							
						 
						
							2015-02-14 00:07:19 +01:00  
						
					 
				
					
						
							
							
								 
								Jeff Widman
							
						 
						
							 
							
							
							
							
								
							
							
								6a237bd49f 
								
							 
						 
						
							
							
								
								Changed back to "parametrized" to match the API  
							
							 
							
							... 
							
							
							
							--HG--
branch : jeffwidman/fix-faq-grammar-and-spelling-1423641159173 
							
						 
						
							2015-02-11 19:27:51 +00:00  
						
					 
				
					
						
							
							
								 
								Jeff Widman
							
						 
						
							 
							
							
							
							
								
							
							
								89710b4901 
								
							 
						 
						
							
							
								
								Fix: FAQ grammar and spelling  
							
							 
							
							... 
							
							
							
							--HG--
branch : jeffwidman/fix-faq-grammar-and-spelling-1423641159173 
							
						 
						
							2015-02-11 07:52:48 +00:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								459d6e610c 
								
							 
						 
						
							
							
								
								Merged in davehunt/pytest/env-addopts (pull request  #241 )  
							
							 
							
							... 
							
							
							
							Support setting configuration using the PYTEST_ADDOPTS environment variable 
							
						 
						
							2015-02-09 16:33:36 +00:00  
						
					 
				
					
						
							
							
								 
								Dave Hunt
							
						 
						
							 
							
							
							
							
								
							
							
								d1adbf4a5c 
								
							 
						 
						
							
							
								
								Added documentation for PYTEST_ADDOPTS environment variable, updated CHANGELOG and AUTHORS.  
							
							 
							
							... 
							
							
							
							--HG--
branch : env-addopts 
							
						 
						
							2015-02-09 14:11:54 +00:00  
						
					 
				
					
						
							
							
								 
								Brianna Laugher
							
						 
						
							 
							
							
							
							
								
							
							
								2b7fae2368 
								
							 
						 
						
							
							
								
								#676  
							
							 
							
							... 
							
							
							
							Add  docs page describing 'adopt pytest month'
--HG--
branch : adopt-pytest-docs 
							
						 
						
							2015-02-09 11:59:15 +01:00  
						
					 
				
					
						
							
							
								 
								okin
							
						 
						
							 
							
							
							
							
								
							
							
								d580f5bac8 
								
							 
						 
						
							
							
								
								Only one import on one line.  
							
							 
							
							... 
							
							
							
							If this should show good practices, the code should not set a bad example ;)
--HG--
branch : okin/only-one-import-on-one-line-if-this-shou-1421239108222 
							
						 
						
							2015-01-14 12:38:37 +00: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  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								de7c97aa1e 
								
							 
						 
						
							
							
								
								Merged in tomviner/pytest (pull request  #222 )  
							
							 
							
							... 
							
							
							
							fix issue552: Add a note to the docs about marking single callables 
							
						 
						
							2014-10-14 10:02:21 +02:00  
						
					 
				
					
						
							
							
								 
								TomV
							
						 
						
							 
							
							
							
							
								
							
							
								857db415bc 
								
							 
						 
						
							
							
								
								fix some spelling mistakes  
							
							 
							
							... 
							
							
							
							--HG--
branch : some_spelling_fixes 
							
						 
						
							2014-10-13 23:16:26 +01:00  
						
					 
				
					
						
							
							
								 
								TomV
							
						 
						
							 
							
							
							
							
								
							
							
								4cadc600d5 
								
							 
						 
						
							
							
								
								fix issue552: note about marking single callables  
							
							 
							
							
							
						 
						
							2014-10-12 19:07:03 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								cea9367739 
								
							 
						 
						
							
							
								
								Merged in HolgerPeters/pytest (pull request  #221 )  
							
							 
							
							... 
							
							
							
							Make doctest flags configurable 
							
						 
						
							2014-10-09 17:05:48 +02:00  
						
					 
				
					
						
							
							
								 
								Holger Peters
							
						 
						
							 
							
							
							
							
								
							
							
								a37f9f19d4 
								
							 
						 
						
							
							
								
								link fix: Use restructured text :doc: link instead of html link  
							
							 
							
							
							
						 
						
							2014-10-09 16:59:42 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								8c91ffc701 
								
							 
						 
						
							
							
								
								some docs and refined semantics for wrappers  
							
							 
							
							
							
						 
						
							2014-10-09 12:21:01 +02:00