Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								49fc4e5e4c 
								
							 
						 
						
							
							
								
								Changes for 3.0.1 release  
							
							 
							
							
							
						 
						
							2016-08-23 18:15:43 -04:00  
						
					 
				
					
						
							
							
								 
								Adam Chainz
							
						 
						
							 
							
							
							
							
								
							
							
								1673667232 
								
							 
						 
						
							
							
								
								Delete unreferenced setup.cfg from docs  
							
							 
							
							... 
							
							
							
							Noticed it's not using the new `[tool:pytest]` header as changed in #567 , can't find any reference to it or `testfilepatterns`. It was added in b1e4301457  6 years ago, there don't seem to have ever been references to it. 
							
						 
						
							2016-08-23 16:08:24 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9ce30e0085 
								
							 
						 
						
							
							
								
								Run regendoc for 3.0 release  
							
							 
							
							
							
						 
						
							2016-08-18 08:27:16 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ab86dea529 
								
							 
						 
						
							
							
								
								Support [tool:pytest] in setup.cfg files  
							
							 
							
							... 
							
							
							
							Also deprecate [pytest] usage in setup.cfg files
Fix  #567  
							
						 
						
							2016-08-17 08:19:38 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								802755ceed 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2016-08-06 17:58:17 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								8b8c698f1a 
								
							 
						 
						
							
							
								
								Add more interpreter versions to multipython example  
							
							 
							
							
							
						 
						
							2016-08-03 16:48:49 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d28801d794 
								
							 
						 
						
							
							
								
								Make parametrize example deterministic  
							
							 
							
							
							
						 
						
							2016-08-03 16:48:11 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								701d5fc727 
								
							 
						 
						
							
							
								
								Regendoc after more fixes on features branch  
							
							 
							
							
							
						 
						
							2016-08-03 16:31:44 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								21a90c8c50 
								
							 
						 
						
							
							
								
								Run regendoc again  
							
							 
							
							
							
						 
						
							2016-08-01 20:12:00 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								eed21e06db 
								
							 
						 
						
							
							
								
								Sort yml items to get same results for regendoc runs  
							
							 
							
							
							
						 
						
							2016-08-01 20:09:35 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								946466abf4 
								
							 
						 
						
							
							
								
								Run regen-docs for pytest 3.0  
							
							 
							
							
							
						 
						
							2016-08-01 20:09:35 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ae9d3bf886 
								
							 
						 
						
							
							
								
								Freeze docs: PyInstaller hook and wording  
							
							 
							
							... 
							
							
							
							As discussed during the review, suggest in general
to use PyInstaller and just mention pytest.freeze_includes()
in less detail on how to actually use it, because it varies
from tool to tool. 
							
						 
						
							2016-07-27 09:15:40 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ed36d627e4 
								
							 
						 
						
							
							
								
								Use PyInstaller for freeze test env  
							
							 
							
							... 
							
							
							
							cx_freeze doesn't seem to be very well supported in Python 3.5.
Using pyinstaller instead and rename environment to "freeze" which
is a more generic term for freezing python code into standalone
executables.
Fix  #1769  
							
						 
						
							2016-07-26 22:02:37 -03:00  
						
					 
				
					
						
							
							
								 
								Roberto Polli
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							 
							
							
							
						 
						
							2016-06-22 14:39:33 +02:00  
						
					 
				
					
						
							
							
								 
								Dave Hunt
							
						 
						
							 
							
							
							
							
								
							
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							 
							
							... 
							
							
							
							Fixes  #1629  
							
						 
						
							2016-06-21 16:16:57 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								fe4f23c1bf 
								
							 
						 
						
							
							
								
								Update docs in prol of using yield statements  
							
							 
							
							
							
						 
						
							2016-06-08 21:07:52 -03:00  
						
					 
				
					
						
							
							
								 
								Marius Gedminas
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								b5bd4d959d 
								
							 
						 
						
							
							
								
								merge master to features  
							
							 
							
							
							
						 
						
							2016-06-01 08:13:26 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								77c28825df 
								
							 
						 
						
							
							
								
								regendoc and comment out a python2.7 example as per  #1573  
							
							 
							
							
							
						 
						
							2016-05-31 19:05:36 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								26b526967e 
								
							 
						 
						
							
							
								
								merge from master again  
							
							 
							
							
							
						 
						
							2016-05-23 22:33:00 +02:00  
						
					 
				
					
						
							
							
								 
								Adam Chainz
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								eab762ea99 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							 
							
							
							
						 
						
							2016-05-13 19:37:41 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								68f658b6cc 
								
							 
						 
						
							
							
								
								Merge commit '890c2fa555314a67a8d97a1b8ea4881a14be69c4' into merge-master  
							
							 
							
							
							
						 
						
							2016-05-13 17:52:59 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								4bde70d060 
								
							 
						 
						
							
							
								
								Merge commit 'ec62a3c9e47c3b5b07aa1656815145ffa2882a09' into merge-master  
							
							 
							
							
							
						 
						
							2016-05-13 17:40:14 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Omar Kohl
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Omar Kohl
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								nicoddemus
							
						 
						
							 
							
							
							
							
								
							
							
								168daaa71f 
								
							 
						 
						
							
							
								
								Regendocs  
							
							 
							
							
							
						 
						
							2016-03-17 17:13:41 -04:00  
						
					 
				
					
						
							
							
								 
								nicoddemus
							
						 
						
							 
							
							
							
							
								
							
							
								f82c03833f 
								
							 
						 
						
							
							
								
								Regendocs  
							
							 
							
							
							
						 
						
							2016-02-29 15:52:56 -05:00  
						
					 
				
					
						
							
							
								 
								Matt Williams
							
						 
						
							 
							
							
							
							
								
							
							
								fc4e240596 
								
							 
						 
						
							
							
								
								Correct JUnit test invocation example  
							
							 
							
							
							
						 
						
							2016-02-23 10:05:51 +00:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								de1a9f574c 
								
							 
						 
						
							
							
								
								merge from master  
							
							 
							
							
							
						 
						
							2016-02-05 00:10:28 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							 
							
							... 
							
							
							
							Fix  #103  
							
						 
						
							2016-01-25 23:18:04 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								64d7d00218 
								
							 
						 
						
							
							
								
								Prepare 2.8.7 release  
							
							 
							
							
							
						 
						
							2016-01-24 17:59:48 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								b8784c28c9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into 'features'  
							
							 
							
							
							
						 
						
							2016-01-08 21:51:34 -02:00  
						
					 
				
					
						
							
							
								 
								Kartik Singhal
							
						 
						
							 
							
							
							
							
								
							
							
								26c835eea5 
								
							 
						 
						
							
							
								
								Correct platform name osx -> darwin  
							
							 
							
							
							
						 
						
							2016-01-05 18:43:03 -05:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								6c170201d6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							 
							
							
							
						 
						
							2016-01-02 23:56:01 +01:00  
						
					 
				
					
						
							
							
								 
								Rick van Hattem
							
						 
						
							 
							
							
							
							
								
							
							
								87ff7ee232 
								
							 
						 
						
							
							
								
								Updated out of date link  
							
							 
							
							
							
						 
						
							2015-12-27 02:35:02 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ec597e81a4 
								
							 
						 
						
							
							
								
								Remove references to python pre-2.6 from docs  
							
							 
							
							
							
						 
						
							2015-12-16 16:16:22 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4263b8b407 
								
							 
						 
						
							
							
								
								Restore regen-doc result  
							
							 
							
							
							
						 
						
							2015-12-11 22:34:16 -02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								7d150c20cf 
								
							 
						 
						
							
							
								
								Regenerate 2.8.5 docs.  
							
							 
							
							
							
						 
						
							2015-12-11 22:28:23 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								b920f09a95 
								
							 
						 
						
							
							
								
								doc regen for release 2.8.4  
							
							 
							
							
							
						 
						
							2015-12-06 16:14:23 +01:00  
						
					 
				
					
						
							
							
								 
								Jeff Widman
							
						 
						
							 
							
							
							
							
								
							
							
								6be6798cdf 
								
							 
						 
						
							
							
								
								Fix spelling: explicitely --> explicitly  
							
							 
							
							
							
						 
						
							2015-12-01 01:41:47 -08:00  
						
					 
				
					
						
							
							
								 
								Tim Chan
							
						 
						
							 
							
							
							
							
								
							
							
								a8d7e513f4 
								
							 
						 
						
							
							
								
								Fixed docs  
							
							 
							
							
							
						 
						
							2015-11-27 22:46:45 -08:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								063f90f0d2 
								
							 
						 
						
							
							
								
								run regendoc  
							
							 
							
							
							
						 
						
							2015-11-18 17:47:17 +01:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								d667259e31 
								
							 
						 
						
							
							
								
								Change pytest ignore invocation as suggested by @nicoddemus  
							
							 
							
							
							
						 
						
							2015-11-04 23:45:29 +01:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								a2d07bfa93 
								
							 
						 
						
							
							
								
								Add pytest invocation along with result  
							
							 
							
							
							
						 
						
							2015-11-04 15:34:18 +01:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								586fdbcbbd 
								
							 
						 
						
							
							
								
								Add example tests directory structure  
							
							 
							
							
							
						 
						
							2015-11-04 15:00:37 +01:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								04079f9ae5 
								
							 
						 
						
							
							
								
								Start doc section on ``--ignore`` in pytestcollection.rst  
							
							 
							
							
							
						 
						
							2015-11-04 14:49:02 +01:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								42937d4bb6 
								
							 
						 
						
							
							
								
								Prepare 2.8.2 release.  
							
							 
							
							
							
						 
						
							2015-10-06 21:06:25 +02:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								4829eac1e1 
								
							 
						 
						
							
							
								
								Use a variable for the skipif marker as suggested by @nicoddemus  
							
							 
							
							
							
						 
						
							2015-09-30 21:53:34 +02:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								a10da0e540 
								
							 
						 
						
							
							
								
								Implement skipif marker for slow test based on pytest.config  
							
							 
							
							
							
						 
						
							2015-09-30 19:41:47 +02:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								7ac8a88a05 
								
							 
						 
						
							
							
								
								Remove pytest_runtest_setup from conftest.py  
							
							 
							
							
							
						 
						
							2015-09-30 19:25:57 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								448ec8b740 
								
							 
						 
						
							
							
								
								Mark sources correctly in parametrize.rst.  
							
							 
							
							... 
							
							
							
							Sphinx didn't pick this up as monospace text. 
							
						 
						
							2015-09-25 18:43:33 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								c3588b545f 
								
							 
						 
						
							
							
								
								generate docs on python3.4  
							
							 
							
							
							
						 
						
							2015-09-22 16:52:35 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								5ff75a41ea 
								
							 
						 
						
							
							
								
								fix erroring doc example  
							
							 
							
							
							
						 
						
							2015-09-22 15:05:56 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								89badfec0c 
								
							 
						 
						
							
							
								
								update regendoc, substitutes PYTHON_PREFIX  
							
							 
							
							
							
						 
						
							2015-09-22 14:48:04 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								662d755974 
								
							 
						 
						
							
							
								
								fix documentation gegeneration, kill Makefile  
							
							 
							
							
							
						 
						
							2015-09-22 14:22:37 +02:00  
						
					 
				
					
						
							
							
								 
								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