ab6aef1d1f 
								
							 
						 
						
							
							
								
								feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths.  
							
							
							
						 
						
							2016-07-25 12:41:58 +02:00  
				
					
						
							
							
								 
						
							
								083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2016-06-22 14:39:33 +02:00  
				
					
						
							
							
								 
						
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							... 
							
							
							
							Fixes  #1629  
						
							2016-06-21 16:16:57 +02:00  
				
					
						
							
							
								 
						
							
								fe4f23c1bf 
								
							 
						 
						
							
							
								
								Update docs in prol of using yield statements  
							
							
							
						 
						
							2016-06-08 21:07:52 -03:00  
				
					
						
							
							
								 
						
							
								3ad5b9de86 
								
							 
						 
						
							
							
								
								Docs: config.option is deprecated  
							
							... 
							
							
							
							https://pytest.org/latest/writing_plugins.html#_pytest.config.Config  says config.option is deprecated and one should use config.getoption() instead. 
						
							2016-06-02 09:52:56 +03:00  
				
					
						
							
							
								 
						
							
								b5bd4d959d 
								
							 
						 
						
							
							
								
								merge master to features  
							
							
							
						 
						
							2016-06-01 08:13:26 +02:00  
				
					
						
							
							
								 
						
							
								77c28825df 
								
							 
						 
						
							
							
								
								regendoc and comment out a python2.7 example as per  #1573  
							
							
							
						 
						
							2016-05-31 19:05:36 +02:00  
				
					
						
							
							
								 
						
							
								26b526967e 
								
							 
						 
						
							
							
								
								merge from master again  
							
							
							
						 
						
							2016-05-23 22:33:00 +02:00  
				
					
						
							
							
								 
						
							
								8a39869347 
								
							 
						 
						
							
							
								
								Convert readthedocs link for their .org -> .io migration for hosted projects  
							
							... 
							
							
							
							As per their email ‘Changes to project subdomains’:
> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.
Test Plan: Manually visited all the links I’ve modified. One was not modified - `http://media.readthedocs.org/epub/pytest/latest/pytest.epub ` - since it doesn't work on `readthedocs.io`. 
							
						 
						
							2016-05-18 17:12:39 +01:00  
				
					
						
							
							
								 
						
							
								eab762ea99 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							
							
						 
						
							2016-05-13 19:37:41 +02:00  
				
					
						
							
							
								 
						
							
								68f658b6cc 
								
							 
						 
						
							
							
								
								Merge commit '890c2fa555314a67a8d97a1b8ea4881a14be69c4' into merge-master  
							
							
							
						 
						
							2016-05-13 17:52:59 +02:00  
				
					
						
							
							
								 
						
							
								4bde70d060 
								
							 
						 
						
							
							
								
								Merge commit 'ec62a3c9e47c3b5b07aa1656815145ffa2882a09' into merge-master  
							
							
							
						 
						
							2016-05-13 17:40:14 +02:00  
				
					
						
							
							
								 
						
							
								75160547f2 
								
							 
						 
						
							
							
								
								Use a callable __tracebackhide__ for filtering  
							
							... 
							
							
							
							While this leads to slightly more complicated user code for the common
case (checking if the exception is of a given type) it's easier to
implement and more flexible. 
							
						 
						
							2016-04-20 11:09:27 +02:00  
				
					
						
							
							
								 
						
							
								b607f6728f 
								
							 
						 
						
							
							
								
								Filter selectively with __tracebackhide__  
							
							... 
							
							
							
							When __tracebackhide__ gets set to an exception type or list/tuple of
exception types, only those exceptions get filtered, while the full
traceback is shown if another exception (e.g. a bug in a assertion
helper) happens. 
							
						 
						
							2016-04-20 10:25:33 +02:00  
				
					
						
							
							
								 
						
							
								98430a17f2 
								
							 
						 
						
							
							
								
								doc: Use ascii chars for file tree  
							
							... 
							
							
							
							LaTeX doesn't like those particular unicode chars, so let's avoid them so the
PDF builds easily. 
							
						 
						
							2016-04-13 23:38:58 +02:00  
				
					
						
							
							
								 
						
							
								a341dddc74 
								
							 
						 
						
							
							
								
								Replace --fulltrace with --full-trace in doc  
							
							... 
							
							
							
							Since 'py.test --help' shows --full-trace as an option (and not --fulltrace)
even though both forms are accepted I assume --full-trace is the preferred form
and should therefore be used in the documentation. 
							
						 
						
							2016-03-20 19:51:23 +01:00  
				
					
						
							
							
								 
						
							
								bdb3581a52 
								
							 
						 
						
							
							
								
								Fix minor mistake in test discovery doc  
							
							... 
							
							
							
							The example output shown was for Python3 not Python2.
Add Python2 output and rephrase for clarity. 
							
						 
						
							2016-03-20 13:24:43 +01:00  
				
					
						
							
							
								 
						
							
								168daaa71f 
								
							 
						 
						
							
							
								
								Regendocs  
							
							
							
						 
						
							2016-03-17 17:13:41 -04:00  
				
					
						
							
							
								 
						
							
								f82c03833f 
								
							 
						 
						
							
							
								
								Regendocs  
							
							
							
						 
						
							2016-02-29 15:52:56 -05:00  
				
					
						
							
							
								 
						
							
								fc4e240596 
								
							 
						 
						
							
							
								
								Correct JUnit test invocation example  
							
							
							
						 
						
							2016-02-23 10:05:51 +00:00  
				
					
						
							
							
								 
						
							
								de1a9f574c 
								
							 
						 
						
							
							
								
								merge from master  
							
							
							
						 
						
							2016-02-05 00:10:28 +01:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								64d7d00218 
								
							 
						 
						
							
							
								
								Prepare 2.8.7 release  
							
							
							
						 
						
							2016-01-24 17:59:48 +01:00  
				
					
						
							
							
								 
						
							
								b8784c28c9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into 'features'  
							
							
							
						 
						
							2016-01-08 21:51:34 -02:00  
				
					
						
							
							
								 
						
							
								26c835eea5 
								
							 
						 
						
							
							
								
								Correct platform name osx -> darwin  
							
							
							
						 
						
							2016-01-05 18:43:03 -05:00  
				
					
						
							
							
								 
						
							
								6c170201d6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							
							
						 
						
							2016-01-02 23:56:01 +01:00  
				
					
						
							
							
								 
						
							
								87ff7ee232 
								
							 
						 
						
							
							
								
								Updated out of date link  
							
							
							
						 
						
							2015-12-27 02:35:02 +01:00  
				
					
						
							
							
								 
						
							
								ec597e81a4 
								
							 
						 
						
							
							
								
								Remove references to python pre-2.6 from docs  
							
							
							
						 
						
							2015-12-16 16:16:22 -02:00  
				
					
						
							
							
								 
						
							
								4263b8b407 
								
							 
						 
						
							
							
								
								Restore regen-doc result  
							
							
							
						 
						
							2015-12-11 22:34:16 -02:00  
				
					
						
							
							
								 
						
							
								7d150c20cf 
								
							 
						 
						
							
							
								
								Regenerate 2.8.5 docs.  
							
							
							
						 
						
							2015-12-11 22:28:23 -02:00  
				
					
						
							
							
								 
						
							
								b920f09a95 
								
							 
						 
						
							
							
								
								doc regen for release 2.8.4  
							
							
							
						 
						
							2015-12-06 16:14:23 +01:00  
				
					
						
							
							
								 
						
							
								6be6798cdf 
								
							 
						 
						
							
							
								
								Fix spelling: explicitely --> explicitly  
							
							
							
						 
						
							2015-12-01 01:41:47 -08:00  
				
					
						
							
							
								 
						
							
								a8d7e513f4 
								
							 
						 
						
							
							
								
								Fixed docs  
							
							
							
						 
						
							2015-11-27 22:46:45 -08:00  
				
					
						
							
							
								 
						
							
								063f90f0d2 
								
							 
						 
						
							
							
								
								run regendoc  
							
							
							
						 
						
							2015-11-18 17:47:17 +01:00  
				
					
						
							
							
								 
						
							
								d667259e31 
								
							 
						 
						
							
							
								
								Change pytest ignore invocation as suggested by @nicoddemus  
							
							
							
						 
						
							2015-11-04 23:45:29 +01:00  
				
					
						
							
							
								 
						
							
								a2d07bfa93 
								
							 
						 
						
							
							
								
								Add pytest invocation along with result  
							
							
							
						 
						
							2015-11-04 15:34:18 +01:00  
				
					
						
							
							
								 
						
							
								586fdbcbbd 
								
							 
						 
						
							
							
								
								Add example tests directory structure  
							
							
							
						 
						
							2015-11-04 15:00:37 +01:00  
				
					
						
							
							
								 
						
							
								04079f9ae5 
								
							 
						 
						
							
							
								
								Start doc section on ``--ignore`` in pytestcollection.rst  
							
							
							
						 
						
							2015-11-04 14:49:02 +01:00  
				
					
						
							
							
								 
						
							
								42937d4bb6 
								
							 
						 
						
							
							
								
								Prepare 2.8.2 release.  
							
							
							
						 
						
							2015-10-06 21:06:25 +02:00  
				
					
						
							
							
								 
						
							
								4829eac1e1 
								
							 
						 
						
							
							
								
								Use a variable for the skipif marker as suggested by @nicoddemus  
							
							
							
						 
						
							2015-09-30 21:53:34 +02:00  
				
					
						
							
							
								 
						
							
								a10da0e540 
								
							 
						 
						
							
							
								
								Implement skipif marker for slow test based on pytest.config  
							
							
							
						 
						
							2015-09-30 19:41:47 +02:00  
				
					
						
							
							
								 
						
							
								7ac8a88a05 
								
							 
						 
						
							
							
								
								Remove pytest_runtest_setup from conftest.py  
							
							
							
						 
						
							2015-09-30 19:25:57 +02:00  
				
					
						
							
							
								 
						
							
								95245b935c 
								
							 
						 
						
							
							
								
								- fix a flaky test on py35-xdist by calling  
							
							... 
							
							
							
							importlib.invalidate_caches()
- bump version to 2.8.1
- regen docs
- amend changelog, authors 
							
						 
						
							2015-09-29 13:10:59 +02:00  
				
					
						
							
							
								 
						
							
								448ec8b740 
								
							 
						 
						
							
							
								
								Mark sources correctly in parametrize.rst.  
							
							... 
							
							
							
							Sphinx didn't pick this up as monospace text. 
							
						 
						
							2015-09-25 18:43:33 +02:00  
				
					
						
							
							
								 
						
							
								272f987b0c 
								
							 
						 
						
							
							
								
								Fix test_time in parametrize doc.  
							
							... 
							
							
							
							The source was indented with a mixture of tabs and spaces, causing syntax
errors when executed. 
							
						 
						
							2015-09-25 18:42:06 +02:00  
				
					
						
							
							
								 
						
							
								c3588b545f 
								
							 
						 
						
							
							
								
								generate docs on python3.4  
							
							
							
						 
						
							2015-09-22 16:52:35 +02:00  
				
					
						
							
							
								 
						
							
								5ff75a41ea 
								
							 
						 
						
							
							
								
								fix erroring doc example  
							
							
							
						 
						
							2015-09-22 15:05:56 +02:00  
				
					
						
							
							
								 
						
							
								89badfec0c 
								
							 
						 
						
							
							
								
								update regendoc, substitutes PYTHON_PREFIX  
							
							
							
						 
						
							2015-09-22 14:48:04 +02:00  
				
					
						
							
							
								 
						
							
								662d755974 
								
							 
						 
						
							
							
								
								fix documentation gegeneration, kill Makefile  
							
							
							
						 
						
							2015-09-22 14:22:37 +02:00  
				
					
						
							
							
								 
						
							
								e67d66a5d4 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-dev'  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS 
							
						 
						
							2015-08-24 22:55:11 +03:00