f786534173 
								
							 
						 
						
							
							
								
								Fix three spaces instead of four in docs  
							
							
							
						 
						
							2018-06-12 19:39:51 +02:00  
				
					
						
							
							
								 
						
							
								86fc31db8d 
								
							 
						 
						
							
							
								
								apply most other hooks and opt out of black reformating  
							
							
							
						 
						
							2018-05-23 16:45:58 +02: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  
				
					
						
							
							
								 
						
							
								f3a119c06a 
								
							 
						 
						
							
							
								
								Merge upstream/master into features  
							
							
							
						 
						
							2017-11-03 16:37:18 -02:00  
				
					
						
							
							
								 
						
							
								657976e98a 
								
							 
						 
						
							
							
								
								update raises documentation regarding regex match  
							
							
							
						 
						
							2017-08-22 12:12:48 +02:00  
				
					
						
							
							
								 
						
							
								b63f6770a1 
								
							 
						 
						
							
							
								
								Preparing release version 3.1.3  
							
							
							
						 
						
							2017-07-03 23:29:13 +00: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  
				
					
						
							
							
								 
						
							
								f3b359f5b8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	_pytest/capture.py
#	_pytest/compat.py
#	_pytest/python.py
#	testing/python/collect.py
#	testing/test_mark.py 
							
						 
						
							2017-05-03 19:04:53 -03:00  
				
					
						
							
							
								 
						
							
								90be44c812 
								
							 
						 
						
							
							
								
								Document PYTEST_DONT_REWRITE  
							
							... 
							
							
							
							Fixes  #2203  
						
							2017-04-19 08:19:19 -03: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  
				
					
						
							
							
								 
						
							
								1e0cf5ce4d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py 
							
						 
						
							2017-03-10 15:54:05 -03:00  
				
					
						
							
							
								 
						
							
								e05ff0338a 
								
							 
						 
						
							
							
								
								assert.rst: typographical correction  
							
							
							
						 
						
							2017-03-06 01:01:55 +08:00  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01:00  
				
					
						
							
							
								 
						
							
								4d0c635252 
								
							 
						 
						
							
							
								
								regendoc  
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
				
					
						
							
							
								 
						
							
								46a9861d29 
								
							 
						 
						
							
							
								
								Remove mention of --assert=reinterp in documentation  
							
							... 
							
							
							
							Related to #1940  
							
						 
						
							2017-01-13 22:35:37 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								701d5fc727 
								
							 
						 
						
							
							
								
								Regendoc after more fixes on features branch  
							
							
							
						 
						
							2016-08-03 16:31:44 -04:00  
				
					
						
							
							
								 
						
							
								946466abf4 
								
							 
						 
						
							
							
								
								Run regen-docs for pytest 3.0  
							
							
							
						 
						
							2016-08-01 20:09:35 -04:00  
				
					
						
							
							
								 
						
							
								f827810fa8 
								
							 
						 
						
							
							
								
								Fix 2.10 -> 3.0 versions in docs  
							
							
							
						 
						
							2016-07-12 21:02:40 -03:00  
				
					
						
							
							
								 
						
							
								0e2ebc96ff 
								
							 
						 
						
							
							
								
								Remove deprecated cmd options  
							
							... 
							
							
							
							Fixes  #1657  
						
							2016-06-26 19:26:04 +02:00  
				
					
						
							
							
								 
						
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							... 
							
							
							
							Fixes  #1629  
						
							2016-06-21 16:16:57 +02:00  
				
					
						
							
							
								 
						
							
								f8d4cadc3d 
								
							 
						 
						
							
							
								
								Added versionchanged directives  
							
							
							
						 
						
							2016-06-19 23:56:43 +03:00  
				
					
						
							
							
								 
						
							
								c29130d400 
								
							 
						 
						
							
							
								
								Updated documentation  
							
							
							
						 
						
							2016-06-19 23:34:42 +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  
				
					
						
							
							
								 
						
							
								c578226d43 
								
							 
						 
						
							
							
								
								Implement ExceptionInfo.match() to match regexp on str(exception)  
							
							... 
							
							
							
							This implements similar functionality to
unittest.TestCase.assertRegexpMatches()
closes  #372  
							
						 
						
							2016-04-03 11:22:44 +02:00  
				
					
						
							
							
								 
						
							
								168daaa71f 
								
							 
						 
						
							
							
								
								Regendocs  
							
							
							
						 
						
							2016-03-17 17:13:41 -04:00  
				
					
						
							
							
								 
						
							
								f82c03833f 
								
							 
						 
						
							
							
								
								Regendocs  
							
							
							
						 
						
							2016-02-29 15:52:56 -05: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  
				
					
						
							
							
								 
						
							
								ec597e81a4 
								
							 
						 
						
							
							
								
								Remove references to python pre-2.6 from docs  
							
							
							
						 
						
							2015-12-16 16:16:22 -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  
				
					
						
							
							
								 
						
							
								063f90f0d2 
								
							 
						 
						
							
							
								
								run regendoc  
							
							
							
						 
						
							2015-11-18 17:47:17 +01:00  
				
					
						
							
							
								 
						
							
								37e96c9335 
								
							 
						 
						
							
							
								
								[doc] Fixed indentation  
							
							
							
						 
						
							2015-10-10 13:29:22 +02:00  
				
					
						
							
							
								 
						
							
								42937d4bb6 
								
							 
						 
						
							
							
								
								Prepare 2.8.2 release.  
							
							
							
						 
						
							2015-10-06 21:06:25 +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  
				
					
						
							
							
								 
						
							
								c3588b545f 
								
							 
						 
						
							
							
								
								generate docs on python3.4  
							
							
							
						 
						
							2015-09-22 16:52:35 +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  
				
					
						
							
							
								 
						
							
								622e64320a 
								
							 
						 
						
							
							
								
								Add __eq__ method to assertion comparison example  
							
							... 
							
							
							
							This makes the example make more sense, because now Foo(1) == Foo(1) is
true. Fixes  #411  
							
						 
						
							2015-09-21 14:23:26 +01:00