a4819844a4 
								
							 
						 
						
							
							
								
								Use unicode/bytes literals instead of calls  
							
							
							
						 
						
							2018-11-04 17:43:24 -08:00  
				
					
						
							
							
								 
						
							
								2368fbb63c 
								
							 
						 
						
							
							
								
								Apply reorder-python-imports to all files  
							
							
							
						 
						
							2018-10-25 00:01:29 -07:00  
				
					
						
							
							
								 
						
							
								9ae0a3cd85 
								
							 
						 
						
							
							
								
								Do not trigger warning about tuples being always True if the tuple has size != 2  
							
							
							
						 
						
							2018-09-04 13:41:11 -03:00  
				
					
						
							
							
								 
						
							
								78ac7d99f5 
								
							 
						 
						
							
							
								
								Deprecate Config.warn and Node.warn, replaced by standard warnings  
							
							
							
						 
						
							2018-09-04 11:35:34 -03:00  
				
					
						
							
							
								 
						
							
								dccac69d82 
								
							 
						 
						
							
							
								
								py.builtin.text -> six.text_type  
							
							
							
						 
						
							2018-08-22 23:00:06 -07:00  
				
					
						
							
							
								 
						
							
								0fc4a806e5 
								
							 
						 
						
							
							
								
								py.builtins._totext -> string literals or six.text_type  
							
							
							
						 
						
							2018-08-22 23:00:04 -07:00  
				
					
						
							
							
								 
						
							
								011f88f7e7 
								
							 
						 
						
							
							
								
								Deprecate calling fixture functions directly  
							
							... 
							
							
							
							This will now issue a RemovedInPytest4Warning when the user calls
a fixture function directly, instead of requesting it from test
functions as is expected
Fix  #3661  
							
						 
						
							2018-07-26 19:58:42 -03:00  
				
					
						
							
							
								 
						
							
								cbaa7dd56a 
								
							 
						 
						
							
							
								
								Upgrade pre-commit hooks except pyupgrade  
							
							
							
						 
						
							2018-06-26 06:35:27 -07:00  
				
					
						
							
							
								 
						
							
								3d0717813a 
								
							 
						 
						
							
							
								
								bytes() is a builtin in python2.6+  
							
							
							
						 
						
							2018-06-03 11:54:36 -07:00  
				
					
						
							
							
								 
						
							
								703e4b11ba 
								
							 
						 
						
							
							
								
								run black  
							
							
							
						 
						
							2018-05-23 16:48:46 +02:00  
				
					
						
							
							
								 
						
							
								9aacb4635e 
								
							 
						 
						
							
							
								
								run pyupgrade  
							
							
							
						 
						
							2018-05-23 16:45:09 +02:00  
				
					
						
							
							
								 
						
							
								aa51fcb2b6 
								
							 
						 
						
							
							
								
								Spelling and grammar fixes  
							
							
							
						 
						
							2018-05-13 12:06:09 +02:00  
				
					
						
							
							
								 
						
							
								dca77b2273 
								
							 
						 
						
							
							
								
								Escape whitespace only strings when diffing them on failed assertions  
							
							... 
							
							
							
							Fix  #3443  
						
							2018-05-03 20:38:00 -03:00  
				
					
						
							
							
								 
						
							
								4678cbeb91 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features'  
							
							
							
						 
						
							2017-11-27 19:37:58 -02:00  
				
					
						
							
							
								 
						
							
								d5f038e29a 
								
							 
						 
						
							
							
								
								Fix spelling: s/re-writ/rewrit/g  
							
							... 
							
							
							
							This also fixes "can not" to "cannot" in the "Module already imported so
cannot be rewritten" assertion error. 
							
						 
						
							2017-11-26 20:46:06 +01:00  
				
					
						
							
							
								 
						
							
								f50ace7c0a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into release-3.3.0  
							
							
							
						 
						
							2017-11-23 20:20:40 +00:00  
				
					
						
							
							
								 
						
							
								c8d52b633b 
								
							 
						 
						
							
							
								
								Fix assertion rewrite to match module names correctly  
							
							... 
							
							
							
							Fix  #2939  
						
							2017-11-21 23:06:47 -02:00  
				
					
						
							
							
								 
						
							
								dab889304e 
								
							 
						 
						
							
							
								
								Implement progress percentage reporting while running tests  
							
							... 
							
							
							
							Fix  #2657  
						
							2017-11-21 21:01:41 -02:00  
				
					
						
							
							
								 
						
							
								03829fde8a 
								
							 
						 
						
							
							
								
								Fix linting E741: ambiguous variable name  
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00  
				
					
						
							
							
								 
						
							
								b840622819 
								
							 
						 
						
							
							
								
								Fixed E302 flake8 errors  
							
							... 
							
							
							
							expected 2 blank lines, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								195a816522 
								
							 
						 
						
							
							
								
								Fixed E265 flake8 errors  
							
							... 
							
							
							
							block comment should start with ‘# ‘ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								8f3eb6dfc7 
								
							 
						 
						
							
							
								
								Fixed E261 flake8 errors  
							
							... 
							
							
							
							at least two spaces before inline comment 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								617e510b6e 
								
							 
						 
						
							
							
								
								Fixed E231 flake8 errors  
							
							... 
							
							
							
							missing whitespace after ‘,’, ‘;’, or ‘:’ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								4b22f270a3 
								
							 
						 
						
							
							
								
								Fixed E226 flake8 errors  
							
							... 
							
							
							
							missing whitespace around arithmetic operator 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								2e8caefcab 
								
							 
						 
						
							
							
								
								Fixed E225 flake8 errors  
							
							... 
							
							
							
							missing whitespace around operator 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								ba0a4d0b2e 
								
							 
						 
						
							
							
								
								Fixed E202 flake8 errors  
							
							... 
							
							
							
							whitespace before ‘)’ 
							
						 
						
							2017-07-17 01:28:17 +02:00  
				
					
						
							
							
								 
						
							
								df54bf0db5 
								
							 
						 
						
							
							
								
								Fixed E131 flake8 errors  
							
							... 
							
							
							
							continuation line unaligned for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								e855a79dd4 
								
							 
						 
						
							
							
								
								Fixed E126 flake8 errors  
							
							... 
							
							
							
							continuation line over-indented for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								9f85584656 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							
							
						 
						
							2017-03-20 19:59:05 -03:00  
				
					
						
							
							
								 
						
							
								42a5d6bdfa 
								
							 
						 
						
							
							
								
								Add __future__ imports to all pytest modules  
							
							... 
							
							
							
							This prevents silly errors from creeping in Python 2 when testing in Python 3 
							
						 
						
							2017-03-16 22:45:40 -03:00  
				
					
						
							
							
								 
						
							
								78194093af 
								
							 
						 
						
							
							
								
								Improve warning representation in terminal plugin and fix tests  
							
							
							
						 
						
							2017-03-16 21:57:32 -03:00  
				
					
						
							
							
								 
						
							
								0baed781fe 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							
							
						 
						
							2017-03-16 20:02:06 -03:00  
				
					
						
							
							
								 
						
							
								337f891d78 
								
							 
						 
						
							
							
								
								Fixed tests  
							
							
							
						 
						
							2017-03-16 20:01:47 -03: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  
				
					
						
							
							
								 
						
							
								6a52fe1650 
								
							 
						 
						
							
							
								
								fixed internal error on unprintable raised AssertionErrors  
							
							
							
						 
						
							2017-03-04 10:26:46 +02:00  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01:00  
				
					
						
							
							
								 
						
							
								ede4e9171f 
								
							 
						 
						
							
							
								
								Spelling fixes  
							
							
							
						 
						
							2017-02-15 17:00:58 +02:00  
				
					
						
							
							
								 
						
							
								713bdc1f9f 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2017-01-26 12:00:52 +01:00  
				
					
						
							
							
								 
						
							
								c477f09177 
								
							 
						 
						
							
							
								
								Assert statements of the pytester plugin again benefit from assertion rewriting  
							
							... 
							
							
							
							Fix  #1920  
						
							2017-01-19 21:33:51 -02:00  
				
					
						
							
							
								 
						
							
								5ce551e469 
								
							 
						 
						
							
							
								
								Merge pull request  #2075  from pytest-dev/master  
							
							... 
							
							
							
							Merge master into features after fixing flake8 errors 
							
						 
						
							2016-11-22 14:10:31 -02:00  
				
					
						
							
							
								 
						
							
								1eb5a690d4 
								
							 
						 
						
							
							
								
								Fix flake8 E305 and E306 errors  
							
							... 
							
							
							
							These errors started to appear with flake8-3.1.1, while they don't appear with
version 3.1.0 (weird). 
							
						 
						
							2016-11-20 18:59:15 -02:00  
				
					
						
							
							
								 
						
							
								6876ba9ba6 
								
							 
						 
						
							
							
								
								Merge pull request  #1995  from mattduck/feat/restructure-assert-truncation  
							
							... 
							
							
							
							Restructure truncation of assertion messages 
							
						 
						
							2016-11-13 19:07:35 -02:00  
				
					
						
							
							
								 
						
							
								efc54b2e56 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-features  
							
							
							
						 
						
							2016-11-11 18:56:53 -02:00  
				
					
						
							
							
								 
						
							
								006a901b86 
								
							 
						 
						
							
							
								
								Properly handle exceptions in multiprocessing tasks  
							
							... 
							
							
							
							Fix  #1984  
						
							2016-11-03 10:48:43 -02:00  
				
					
						
							
							
								 
						
							
								acee88a118 
								
							 
						 
						
							
							
								
								Fix truncation tests: pyruntest() match  
							
							... 
							
							
							
							Fix issue with truncation tests for -vv and CI, where the test for
non-truncated output would return a positive match even on truncated output. 
							
						 
						
							2016-10-16 20:54:51 +01:00  
				
					
						
							
							
								 
						
							
								0061d9bd3d 
								
							 
						 
						
							
							
								
								Fix flake8 (unused import, trailng whitespace)  
							
							
							
						 
						
							2016-10-11 00:17:15 +01:00  
				
					
						
							
							
								 
						
							
								b629da424e 
								
							 
						 
						
							
							
								
								Restructure truncation of assertion messages  
							
							... 
							
							
							
							This addresses ref https://github.com/pytest-dev/pytest/issues/1954 .
The current truncation for assertion explanations does not deal with long lines
properly:
- Previously if lines were too long it would display a "-n more lines"
  message.
- 999e7c6541 
							
						 
						
							2016-10-10 23:38:27 +01:00  
				
					
						
							
							
								 
						
							
								654af0ba25 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2016-09-26 19:32:53 -03:00  
				
					
						
							
							
								 
						
							
								8cba033bbb 
								
							 
						 
						
							
							
								
								added a test  
							
							
							
						 
						
							2016-09-20 02:47:59 +07:00  
				
					
						
							
							
								 
						
							
								dd64d823b9 
								
							 
						 
						
							
							
								
								Don't display dict common items if verbosity=1  
							
							... 
							
							
							
							Part one of https://github.com/pytest-dev/pytest/issues/1512 .
If verbosity=1, assertion explanations are truncated at 10 lines. In this
situation, it's more important to tell the user which dictionary items are
different than which are the same. 
							
						 
						
							2016-09-19 15:27:28 +01:00