f3c87a77a7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into release-3.5.0  
							
							
							
						 
						
							2018-03-21 20:39:44 +00:00  
				
					
						
							
							
								 
						
							
								a4cf380343 
								
							 
						 
						
							
							
								
								Fix tests to not fail when running from root.  
							
							
							
						 
						
							2018-03-18 21:23:39 -07:00  
				
					
						
							
							
								 
						
							
								1fff81e21d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-03-16 18:15:28 -03:00  
				
					
						
							
							
								 
						
							
								c0fe4d483d 
								
							 
						 
						
							
							
								
								Add environment variables  
							
							
							
						 
						
							2018-03-06 20:41:21 -03:00  
				
					
						
							
							
								 
						
							
								66009b0f91 
								
							 
						 
						
							
							
								
								Add tutorial links to all references  
							
							
							
						 
						
							2018-03-06 20:41:20 -03:00  
				
					
						
							
							
								 
						
							
								ade7ad25c7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2018-03-05 19:48:25 -03:00  
				
					
						
							
							
								 
						
							
								fac8208e8f 
								
							 
						 
						
							
							
								
								Preparing release version 3.4.2  
							
							
							
						 
						
							2018-03-04 19:37:49 +00:00  
				
					
						
							
							
								 
						
							
								54e63b7dd5 
								
							 
						 
						
							
							
								
								Merge pull request  #2770  from HPENetworking/master  
							
							... 
							
							
							
							Make record_xml_property generic and compatible with xdist and markers. 
							
						 
						
							2018-02-22 07:38:55 +01:00  
				
					
						
							
							
								 
						
							
								7a62619a75 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2018-02-21 10:39:55 -03:00  
				
					
						
							
							
								 
						
							
								8b49ddfa58 
								
							 
						 
						
							
							
								
								Renamed the fixture record_xml_property to record_property and adapted logic so that the properties are passed to the TestReport object and thus allow compatibility with pytest-xdist.  
							
							
							
						 
						
							2018-02-20 15:46:26 -06:00  
				
					
						
							
							
								 
						
							
								b319375592 
								
							 
						 
						
							
							
								
								Preparing release version 3.4.1  
							
							
							
						 
						
							2018-02-20 01:43:59 +00:00  
				
					
						
							
							
								 
						
							
								774c539f1a 
								
							 
						 
						
							
							
								
								Add --deselect command line option  
							
							... 
							
							
							
							Fixes  #3198  
						
							2018-02-16 08:17:37 -06:00  
				
					
						
							
							
								 
						
							
								489e638b4e 
								
							 
						 
						
							
							
								
								Preparing release version 3.4.0  
							
							
							
						 
						
							2018-01-30 19:47:56 +00:00  
				
					
						
							
							
								 
						
							
								4c148bd0ef 
								
							 
						 
						
							
							
								
								Fix imports in failure_demo.py  
							
							
							
						 
						
							2018-01-30 19:44:06 +00:00  
				
					
						
							
							
								 
						
							
								820ea6d68f 
								
							 
						 
						
							
							
								
								Update Freezing pytest description in simple.rst  
							
							... 
							
							
							
							I have trouble using third party plugins in my frozen program and discovered 
that other people have experienced it as well:
    https://mail.python.org/pipermail//pytest-dev/2015-June/003015.html 
The problem is that the mechanism for plugin discovery used by pytest
(setupttools entry points) doesn't work with frozen executables so pytest
can't find any plugins. The solution seems to be to import the third party 
plugins explicitly as shown here:
    https://mail.python.org/pipermail//pytest-dev/2015-June/003018.html 
This is not mentioned anywhere in the documentaion. 
							
						 
						
							2018-01-10 16:44:26 +01:00  
				
					
						
							
							
								 
						
							
								bd1d17e8de 
								
							 
						 
						
							
							
								
								Replace py.std with stdlib imports  
							
							
							
						 
						
							2018-01-09 12:44:10 -08:00  
				
					
						
							
							
								 
						
							
								bd2d0d2c3c 
								
							 
						 
						
							
							
								
								Preparing release version 3.3.2  
							
							
							
						 
						
							2017-12-25 20:38:27 +00:00  
				
					
						
							
							
								 
						
							
								aa9a02ec44 
								
							 
						 
						
							
							
								
								Preparing release version 3.3.0  
							
							
							
						 
						
							2017-11-23 20:25:36 +00:00  
				
					
						
							
							
								 
						
							
								e0d236c031 
								
							 
						 
						
							
							
								
								Remove gendoc normalization for '=' and '_' headers  
							
							... 
							
							
							
							Using the default for non-atty terminals (80) so the new
progress indicator aligns correctly. 
							
						 
						
							2017-11-23 15:33:41 +00:00  
				
					
						
							
							
								 
						
							
								3b3bf9f53d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-11-14 18:42:29 -02:00  
				
					
						
							
							
								 
						
							
								a0ad9e31da 
								
							 
						 
						
							
							
								
								Preparing release version 3.2.4  
							
							
							
						 
						
							2017-11-13 20:01:17 +00:00  
				
					
						
							
							
								 
						
							
								f3a119c06a 
								
							 
						 
						
							
							
								
								Merge upstream/master into features  
							
							
							
						 
						
							2017-11-03 16:37:18 -02:00  
				
					
						
							
							
								 
						
							
								d00e2da6e9 
								
							 
						 
						
							
							
								
								Merge pull request  #2881  from dawran6/2658  
							
							... 
							
							
							
							Document pytest.param 
							
						 
						
							2017-10-30 09:36:33 +01:00  
				
					
						
							
							
								 
						
							
								af5e9238c8 
								
							 
						 
						
							
							
								
								Document pytest.param  
							
							... 
							
							
							
							Append example for pytest.param in the example/parametrize document. 
							
						 
						
							2017-10-28 14:25:09 -07:00  
				
					
						
							
							
								 
						
							
								383239cafc 
								
							 
						 
						
							
							
								
								doc: Include collector config in the skip doc  
							
							... 
							
							
							
							None of the decorators are sufficient to skip an entire file, for
example if the file contain invalid code for a given Python version.
Simply link to details about customizing the collector.
Signed-off-by: Stephen Finucane <stephen@that.guru> 
							
						 
						
							2017-10-26 17:14:29 +01:00  
				
					
						
							
							
								 
						
							
								6821d36ca5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-10-24 19:57:14 -02:00  
				
					
						
							
							
								 
						
							
								cfdebb3ba4 
								
							 
						 
						
							
							
								
								Fix typo in parametrization doc  
							
							
							
						 
						
							2017-10-16 01:55:30 +03:00  
				
					
						
							
							
								 
						
							
								ef732fc51d 
								
							 
						 
						
							
							
								
								Remove code for unsupported Python versions  
							
							
							
						 
						
							2017-10-10 08:54:56 +03:00  
				
					
						
							
							
								 
						
							
								15222ceca2 
								
							 
						 
						
							
							
								
								Fix typo in example of passing a callable to markers  
							
							
							
						 
						
							2017-09-09 18:22:23 -04:00  
				
					
						
							
							
								 
						
							
								c52f87ede3 
								
							 
						 
						
							
							
								
								Preparing release version 3.2.2  
							
							
							
						 
						
							2017-09-06 21:37:57 +00:00  
				
					
						
							
							
								 
						
							
								3f8ff7f090 
								
							 
						 
						
							
							
								
								[DOC] Add examples for mark.with_args  
							
							
							
						 
						
							2017-09-06 14:26:28 -04:00  
				
					
						
							
							
								 
						
							
								fd84c886ee 
								
							 
						 
						
							
							
								
								Merge pull request  #2671  from nicoddemus/release-3.2.1  
							
							... 
							
							
							
							Release 3.2.1 
							
						 
						
							2017-08-09 17:15:21 -03:00  
				
					
						
							
							
								 
						
							
								c847b83d56 
								
							 
						 
						
							
							
								
								Use `pytest_collection_modifyitems()` in the run/skip option example  
							
							
							
						 
						
							2017-08-09 02:51:07 +00:00  
				
					
						
							
							
								 
						
							
								45d2962e97 
								
							 
						 
						
							
							
								
								Preparing release version 3.2.1  
							
							
							
						 
						
							2017-08-08 21:11:11 +00:00  
				
					
						
							
							
								 
						
							
								8b322afcdb 
								
							 
						 
						
							
							
								
								Make generated doc in simple.rst more reliable  
							
							... 
							
							
							
							Sometimes `test_funcfast` would show up in the `setup` step in
the slowest test durations summary. 
							
						 
						
							2017-08-08 18:04:21 -03:00  
				
					
						
							
							
								 
						
							
								07dd1ca7b8 
								
							 
						 
						
							
							
								
								Preparing release version 3.2.0  
							
							
							
						 
						
							2017-07-30 21:37:18 +00:00  
				
					
						
							
							
								 
						
							
								f1467f8f03 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2017-07-30 18:08:24 -03:00  
				
					
						
							
							
								 
						
							
								7082320f3f 
								
							 
						 
						
							
							
								
								Apply modifications requested in review  
							
							
							
						 
						
							2017-07-28 07:55:34 -03:00  
				
					
						
							
							
								 
						
							
								6fe7069cbb 
								
							 
						 
						
							
							
								
								Move historical notes to their own doc  
							
							... 
							
							
							
							Fix  #2512  
						
							2017-07-27 20:47:12 -03:00  
				
					
						
							
							
								 
						
							
								f770f16294 
								
							 
						 
						
							
							
								
								Replace deprecated "config.option.<name>" usages from docs  
							
							
							
						 
						
							2017-07-27 19:18:44 -03:00  
				
					
						
							
							
								 
						
							
								73c6122f35 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2017-07-24 21:12:51 -03:00  
				
					
						
							
							
								 
						
							
								3d24485cae 
								
							 
						 
						
							
							
								
								Clarify PYTHONPATH changes and ``rootdir`` roles  
							
							... 
							
							
							
							- Also minor adjustments in the docs (wording, formatting, links, etc).
Fix  #2589  
							
						 
						
							2017-07-21 07:28:11 -03:00  
				
					
						
							
							
								 
						
							
								2d4f1f022e 
								
							 
						 
						
							
							
								
								Introduce PYTEST_CURRENT_TEST environment variable  
							
							... 
							
							
							
							Fix  #2583  
						
							2017-07-19 10:01:50 -03:00  
				
					
						
							
							
								 
						
							
								221f42c5ce 
								
							 
						 
						
							
							
								
								Change --strict help message to clarify it deals with unregistered markers  
							
							... 
							
							
							
							Fix  #2444  
						
							2017-07-04 20:14:57 -03:00  
				
					
						
							
							
								 
						
							
								b63f6770a1 
								
							 
						 
						
							
							
								
								Preparing release version 3.1.3  
							
							
							
						 
						
							2017-07-03 23:29:13 +00:00  
				
					
						
							
							
								 
						
							
								7d6bde2496 
								
							 
						 
						
							
							
								
								Add docs for id= with pytest.param  
							
							
							
						 
						
							2017-05-23 07:57:34 +02:00  
				
					
						
							
							
								 
						
							
								9b48613baa 
								
							 
						 
						
							
							
								
								Preparing release version 3.1.0  
							
							
							
						 
						
							2017-05-19 18:12:59 -04:00  
				
					
						
							
							
								 
						
							
								36cf89a2de 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2017-05-19 18:01:56 -04:00  
				
					
						
							
							
								 
						
							
								598aefc686 
								
							 
						 
						
							
							
								
								small fix in an example from the docs  
							
							
							
						 
						
							2017-05-18 21:18:09 +07:00  
				
					
						
							
							
								 
						
							
								03753ca201 
								
							 
						 
						
							
							
								
								intermediate state after attempt with the plain env, DONT MERGE  
							
							
							
						 
						
							2017-05-13 13:25:52 +02:00  
				
					
						
							
							
								 
						
							
								d1e44d16e7 
								
							 
						 
						
							
							
								
								regenerate docs from the pytest env  
							
							
							
						 
						
							2017-05-12 22:51:20 +02:00  
				
					
						
							
							
								 
						
							
								f1c4e2c032 
								
							 
						 
						
							
							
								
								regendoc: reduce version noise by replacing minor/patch with placeholders  
							
							
							
						 
						
							2017-05-12 22:17:40 +02:00  
				
					
						
							
							
								 
						
							
								6c9011c12f 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features-post-3.0.7  
							
							
							
						 
						
							2017-03-14 18:10:23 -03:00  
				
					
						
							
							
								 
						
							
								d58780f9a6 
								
							 
						 
						
							
							
								
								Update regendoc  
							
							
							
						 
						
							2017-03-13 18:41:20 -04:00  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01:00  
				
					
						
							
							
								 
						
							
								449b88c640 
								
							 
						 
						
							
							
								
								rerun regendoc with correct install  
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
				
					
						
							
							
								 
						
							
								01eaf9db51 
								
							 
						 
						
							
							
								
								fix the xfail docstring typo at the actual docstring + regendoc  
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
				
					
						
							
							
								 
						
							
								4d0c635252 
								
							 
						 
						
							
							
								
								regendoc  
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
				
					
						
							
							
								 
						
							
								61fa91f3d0 
								
							 
						 
						
							
							
								
								Fix marker example on "linux" platform  
							
							... 
							
							
							
							I cheated a little and updated the example output by hand. 😁 
Fix  #2200  
							
						 
						
							2017-01-17 21:09:04 -02:00  
				
					
						
							
							
								 
						
							
								03a7a2cd3e 
								
							 
						 
						
							
							
								
								Fix typos  
							
							
							
						 
						
							2016-12-31 19:01:15 +01:00  
				
					
						
							
							
								 
						
							
								f592c7746a 
								
							 
						 
						
							
							
								
								Regendocs for 3.0.5  
							
							
							
						 
						
							2016-12-05 07:22:06 -05:00  
				
					
						
							
							
								 
						
							
								ab274299fe 
								
							 
						 
						
							
							
								
								Regen doc for 3.0.4  
							
							
							
						 
						
							2016-11-09 16:44:58 -05:00  
				
					
						
							
							
								 
						
							
								41d3b3f4f9 
								
							 
						 
						
							
							
								
								Regendoc for version 3.0.3  
							
							
							
						 
						
							2016-09-28 16:36:15 -04:00  
				
					
						
							
							
								 
						
							
								d512e7f26b 
								
							 
						 
						
							
							
								
								Run regendoc for 3.0.2 release  
							
							
							
						 
						
							2016-08-31 20:32:05 -04:00  
				
					
						
							
							
								 
						
							
								f985f47a02 
								
							 
						 
						
							
							
								
								Fix reportingdemo call to pytest  
							
							
							
						 
						
							2016-08-31 20:30:06 -04:00  
				
					
						
							
							
								 
						
							
								519f02b014 
								
							 
						 
						
							
							
								
								docs warnings as errors and initial page similar to README  
							
							... 
							
							
							
							* Changed "index" to be more similar to the README (#1708 ).
* Fixes numerous issues like missing documents, syntax errors, etc (#1829 , #432 ).
* Mention all docs in "contents.rst" so it's easier for users to locate (#1112 ).
* Add doc generation and checking to Travis and AppVeyor, to avoid re-introducing errors.
Fixes  #432 , Fixes  #1112 , Fixes  #1708 , Fixes  #1829  
							
						 
						
							2016-08-26 17:47:18 -03:00  
				
					
						
							
							
								 
						
							
								49fc4e5e4c 
								
							 
						 
						
							
							
								
								Changes for 3.0.1 release  
							
							
							
						 
						
							2016-08-23 18:15:43 -04:00  
				
					
						
							
							
								 
						
							
								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 
							
						 
						
							2016-08-23 16:08:24 +01:00  
				
					
						
							
							
								 
						
							
								9ce30e0085 
								
							 
						 
						
							
							
								
								Run regendoc for 3.0 release  
							
							
							
						 
						
							2016-08-18 08:27:16 -04:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								802755ceed 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2016-08-06 17:58:17 -03:00  
				
					
						
							
							
								 
						
							
								8b8c698f1a 
								
							 
						 
						
							
							
								
								Add more interpreter versions to multipython example  
							
							
							
						 
						
							2016-08-03 16:48:49 -04:00  
				
					
						
							
							
								 
						
							
								d28801d794 
								
							 
						 
						
							
							
								
								Make parametrize example deterministic  
							
							
							
						 
						
							2016-08-03 16:48:11 -04:00  
				
					
						
							
							
								 
						
							
								701d5fc727 
								
							 
						 
						
							
							
								
								Regendoc after more fixes on features branch  
							
							
							
						 
						
							2016-08-03 16:31:44 -04:00  
				
					
						
							
							
								 
						
							
								21a90c8c50 
								
							 
						 
						
							
							
								
								Run regendoc again  
							
							
							
						 
						
							2016-08-01 20:12:00 -04:00  
				
					
						
							
							
								 
						
							
								eed21e06db 
								
							 
						 
						
							
							
								
								Sort yml items to get same results for regendoc runs  
							
							
							
						 
						
							2016-08-01 20:09:35 -04:00  
				
					
						
							
							
								 
						
							
								946466abf4 
								
							 
						 
						
							
							
								
								Run regen-docs for pytest 3.0  
							
							
							
						 
						
							2016-08-01 20:09:35 -04:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d49fb8a2d5 
								
							 
						 
						
							
							
								
								Change cx_freeze example to not use regendoc  
							
							
							
						 
						
							2015-08-08 19:17:50 -03:00  
				
					
						
							
							
								 
						
							
								e8583f01a0 
								
							 
						 
						
							
							
								
								Replaced __multicall__ examples in docs by hookwrapper  
							
							... 
							
							
							
							Fix  #929  
						
							2015-08-08 19:07:27 -03:00  
				
					
						
							
							
								 
						
							
								e79413acc4 
								
							 
						 
						
							
							
								
								Updated documentation from txt to rst  
							
							... 
							
							
							
							Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> 
							
						 
						
							2015-08-04 16:41:02 +05:30  
				
					
						
							
							
								 
						
							
								f7bacd169e 
								
							 
						 
						
							
							
								
								Update docs  
							
							
							
						 
						
							2015-08-04 00:48:41 +03:00  
				
					
						
							
							
								 
						
							
								df8a83b2a1 
								
							 
						 
						
							
							
								
								changed contents -> content but still  #753  did not solved, might be issues with regendoc  
							
							
							
						 
						
							2015-07-25 17:48:12 +02:00  
				
					
						
							
							
								 
						
							
								43d27ec7ed 
								
							 
						 
						
							
							
								
								use regendoc normalization and regenerate docs  
							
							... 
							
							
							
							--HG--
branch : regendoc-upgrade 
							
						 
						
							2015-06-06 23:30:49 +02:00  
				
					
						
							
							
								 
						
							
								a2bb2ff164 
								
							 
						 
						
							
							
								
								port typo fix  
							
							
							
						 
						
							2015-06-03 23:43:12 +02:00  
				
					
						
							
							
								 
						
							
								b5fd3cfb84 
								
							 
						 
						
							
							
								
								fix typo  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-06-03 23:42:38 +02:00  
				
					
						
							
							
								 
						
							
								d299f0d99f 
								
							 
						 
						
							
							
								
								Merge changes from 2.7.1 release  
							
							... 
							
							
							
							This is mostly doc examples regeneration, other changes are:
- Add 2.7.1 tag to .hgtags
- Update changelog to use real versions
- Update HOWTORELEASE.rst
- Fix rst in doc/en/adopt.txt
- Fix CHANGELOG and release-2.7.0 rst formatting 
							
						 
						
							2015-05-19 21:43:50 +01:00  
				
					
						
							
							
								 
						
							
								738c8762df 
								
							 
						 
						
							
							
								
								Regenerate docs using 2.7.1  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 01:54:24 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								ef7f627573 
								
							 
						 
						
							
							
								
								merging pytest-2.7  
							
							
							
						 
						
							2015-05-04 14:27:09 +02:00  
				
					
						
							
							
								 
						
							
								5a06330f61 
								
							 
						 
						
							
							
								
								Doc typo  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-01 11:18:17 -04:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d2a8866bce 
								
							 
						 
						
							
							
								
								bump verrsion to python2.7, fix a too precise test for windows, regen docs  
							
							
							
						 
						
							2015-03-26 09:34:10 +01:00  
				
					
						
							
							
								 
						
							
								3d0b756877 
								
							 
						 
						
							
							
								
								merge in the 2.6 maintenance branch  
							
							
							
						 
						
							2015-02-22 11:45:07 +01:00  
				
					
						
							
							
								 
						
							
								e0251ecb41 
								
							 
						 
						
							
							
								
								regen docs  
							
							... 
							
							
							
							--HG--
branch : pytest-2.6 
							
						 
						
							2014-10-24 15:08:43 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								4cadc600d5 
								
							 
						 
						
							
							
								
								fix issue552: note about marking single callables  
							
							
							
						 
						
							2014-10-12 19:07:03 +01:00