Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								73c6122f35 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							 
							
							
							
						 
						
							2017-07-24 21:12:51 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								2d4f1f022e 
								
							 
						 
						
							
							
								
								Introduce PYTEST_CURRENT_TEST environment variable  
							
							 
							
							... 
							
							
							
							Fix  #2583  
							
						 
						
							2017-07-19 10:01:50 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								221f42c5ce 
								
							 
						 
						
							
							
								
								Change --strict help message to clarify it deals with unregistered markers  
							
							 
							
							... 
							
							
							
							Fix  #2444  
							
						 
						
							2017-07-04 20:14:57 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								b63f6770a1 
								
							 
						 
						
							
							
								
								Preparing release version 3.1.3  
							
							 
							
							
							
						 
						
							2017-07-03 23:29:13 +00:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								7d6bde2496 
								
							 
						 
						
							
							
								
								Add docs for id= with pytest.param  
							
							 
							
							
							
						 
						
							2017-05-23 07:57:34 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9b48613baa 
								
							 
						 
						
							
							
								
								Preparing release version 3.1.0  
							
							 
							
							
							
						 
						
							2017-05-19 18:12:59 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								36cf89a2de 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							 
							
							
							
						 
						
							2017-05-19 18:01:56 -04:00  
						
					 
				
					
						
							
							
								 
								Lev Maximov
							
						 
						
							 
							
							
							
							
								
							
							
								598aefc686 
								
							 
						 
						
							
							
								
								small fix in an example from the docs  
							
							 
							
							
							
						 
						
							2017-05-18 21:18:09 +07:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								03753ca201 
								
							 
						 
						
							
							
								
								intermediate state after attempt with the plain env, DONT MERGE  
							
							 
							
							
							
						 
						
							2017-05-13 13:25:52 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								d1e44d16e7 
								
							 
						 
						
							
							
								
								regenerate docs from the pytest env  
							
							 
							
							
							
						 
						
							2017-05-12 22:51:20 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								f1c4e2c032 
								
							 
						 
						
							
							
								
								regendoc: reduce version noise by replacing minor/patch with placeholders  
							
							 
							
							
							
						 
						
							2017-05-12 22:17:40 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								6c9011c12f 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features-post-3.0.7  
							
							 
							
							
							
						 
						
							2017-03-14 18:10:23 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d58780f9a6 
								
							 
						 
						
							
							
								
								Update regendoc  
							
							 
							
							
							
						 
						
							2017-03-13 18:41:20 -04:00  
						
					 
				
					
						
							
							
								 
								Michal Wajszczuk
							
						 
						
							 
							
							
							
							
								
							
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							 
							
							
							
						 
						
							2017-02-16 20:28:17 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								449b88c640 
								
							 
						 
						
							
							
								
								rerun regendoc with correct install  
							
							 
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								01eaf9db51 
								
							 
						 
						
							
							
								
								fix the xfail docstring typo at the actual docstring + regendoc  
							
							 
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								4d0c635252 
								
							 
						 
						
							
							
								
								regendoc  
							
							 
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Jakub Wilk
							
						 
						
							 
							
							
							
							
								
							
							
								03a7a2cd3e 
								
							 
						 
						
							
							
								
								Fix typos  
							
							 
							
							
							
						 
						
							2016-12-31 19:01:15 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f592c7746a 
								
							 
						 
						
							
							
								
								Regendocs for 3.0.5  
							
							 
							
							
							
						 
						
							2016-12-05 07:22:06 -05:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ab274299fe 
								
							 
						 
						
							
							
								
								Regen doc for 3.0.4  
							
							 
							
							
							
						 
						
							2016-11-09 16:44:58 -05:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								41d3b3f4f9 
								
							 
						 
						
							
							
								
								Regendoc for version 3.0.3  
							
							 
							
							
							
						 
						
							2016-09-28 16:36:15 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d512e7f26b 
								
							 
						 
						
							
							
								
								Run regendoc for 3.0.2 release  
							
							 
							
							
							
						 
						
							2016-08-31 20:32:05 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f985f47a02 
								
							 
						 
						
							
							
								
								Fix reportingdemo call to pytest  
							
							 
							
							
							
						 
						
							2016-08-31 20:30:06 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								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