9e62a31b63 
								
							 
						 
						
							
							
								
								Merge pull request  #2650  from srinivasreddy/2642  
							
							... 
							
							
							
							Fixed#2642: Convert py module references to six module 
							
						 
						
							2017-08-04 09:21:51 +02:00  
				
					
						
							
							
								 
						
							
								dc563e4954 
								
							 
						 
						
							
							
								
								convert py module references to six module  
							
							
							
						 
						
							2017-08-04 08:05:03 +05:30  
				
					
						
							
							
								 
						
							
								6e7547244b 
								
							 
						 
						
							
							
								
								Merge pull request  #2636  from RonnyPfannschmidt/remove-preinit  
							
							... 
							
							
							
							remove preinit, its no longer needed 
							
						 
						
							2017-08-01 05:22:41 +02:00  
				
					
						
							
							
								 
						
							
								ceb016514b 
								
							 
						 
						
							
							
								
								remove dead code - Node._memoizedcall  
							
							
							
						 
						
							2017-07-31 18:18:26 +02:00  
				
					
						
							
							
								 
						
							
								e90f876b34 
								
							 
						 
						
							
							
								
								remove the last own implementation of pytest_namespace  
							
							
							
						 
						
							2017-07-31 13:48:25 +02:00  
				
					
						
							
							
								 
						
							
								06a49338b2 
								
							 
						 
						
							
							
								
								make Test Outcomes inherit from BaseException instead of exception  
							
							... 
							
							
							
							fixes  #580  
						
							2017-07-28 15:28:51 +02:00  
				
					
						
							
							
								 
						
							
								26ee2355d9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into fix-flake8-errors  
							
							
							
						 
						
							2017-07-19 17:09:05 -03:00  
				
					
						
							
							
								 
						
							
								7d2ceb7872 
								
							 
						 
						
							
							
								
								Fixed E501 flake8 errors  
							
							... 
							
							
							
							line too long (> 120 characters) 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								7248b759e8 
								
							 
						 
						
							
							
								
								Fixed E303 flake8 errors  
							
							... 
							
							
							
							too many blank lines (3) 
							
						 
						
							2017-07-17 01:44:23 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								cf97159009 
								
							 
						 
						
							
							
								
								Fixed E128 flake8 errors  
							
							... 
							
							
							
							continuation line under-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								67fca04050 
								
							 
						 
						
							
							
								
								update docs and note; add virtualenv collection tests  
							
							
							
						 
						
							2017-07-11 23:14:38 -05:00  
				
					
						
							
							
								 
						
							
								73b07e1439 
								
							 
						 
						
							
							
								
								Add docs for Item.add_report_section in the docs  
							
							... 
							
							
							
							Fix  #2381  
						
							2017-07-11 21:45:27 -03:00  
				
					
						
							
							
								 
						
							
								b32cfc88da 
								
							 
						 
						
							
							
								
								use presence of activate script rather than sys.prefix to determine if a dir is a virtualenv  
							
							
							
						 
						
							2017-07-11 14:32:09 -05:00  
				
					
						
							
							
								 
						
							
								676c4f970d 
								
							 
						 
						
							
							
								
								trim trailing ws  
							
							
							
						 
						
							2017-07-11 13:31:11 -05:00  
				
					
						
							
							
								 
						
							
								89c73582ca 
								
							 
						 
						
							
							
								
								ignore the active python installation unless told otherwise  
							
							
							
						 
						
							2017-07-11 11:52:16 -05:00  
				
					
						
							
							
								 
						
							
								221f42c5ce 
								
							 
						 
						
							
							
								
								Change --strict help message to clarify it deals with unregistered markers  
							
							... 
							
							
							
							Fix  #2444  
						
							2017-07-04 20:14:57 -03:00  
				
					
						
							
							
								 
						
							
								6908d93ba1 
								
							 
						 
						
							
							
								
								Merge pull request  #2475  from ant31/master  
							
							... 
							
							
							
							[wip] Fix ignore_path condition 
							
						 
						
							2017-07-03 18:57:17 -03:00  
				
					
						
							
							
								 
						
							
								16df4da1f7 
								
							 
						 
						
							
							
								
								Fix exclude_path check  
							
							
							
						 
						
							2017-06-24 10:58:47 +02:00  
				
					
						
							
							
								 
						
							
								87e4a28351 
								
							 
						 
						
							
							
								
								Fix incorrect collected items report when specifying tests on the command-line  
							
							... 
							
							
							
							Fix  #2464  
						
							2017-06-03 20:39:53 -03:00  
				
					
						
							
							
								 
						
							
								d86c89e193 
								
							 
						 
						
							
							
								
								Revert refactor of old-style to new-style classes  
							
							... 
							
							
							
							As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398 ).
This reverts commit d4afa1554b#2179 . 
							
						 
						
							2017-05-17 18:20:51 -03:00  
				
					
						
							
							
								 
						
							
								25371ddbfd 
								
							 
						 
						
							
							
								
								Merge pull request  #2315  from RonnyPfannschmidt/namespace-hook  
							
							... 
							
							
							
							remove pytest internal usage of the namespace hook 
							
						 
						
							2017-04-21 16:24:20 -03:00  
				
					
						
							
							
								 
						
							
								cac82e71d8 
								
							 
						 
						
							
							
								
								Improve item.warn handling of fslocation parameter  
							
							... 
							
							
							
							Just pass fslocation forward and let the hook implementer decide what to do with the parameter 
							
						 
						
							2017-04-13 19:01:14 -03:00  
				
					
						
							
							
								 
						
							
								83c508eea3 
								
							 
						 
						
							
							
								
								Verify hooks after collection completes  
							
							... 
							
							
							
							Fix  #1821  
						
							2017-04-11 21:55:12 -03:00  
				
					
						
							
							
								 
						
							
								afb1778294 
								
							 
						 
						
							
							
								
								put in a singular namespace hook to work around the strange issue  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								147bb8aea5 
								
							 
						 
						
							
							
								
								correct setting pytest.config  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								92f6ab1881 
								
							 
						 
						
							
							
								
								fix all singular internal module imports and add a test for them  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								99c8f2d403 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.main  
							
							
							
						 
						
							2017-03-28 11:45:06 +02: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								ede4e9171f 
								
							 
						 
						
							
							
								
								Spelling fixes  
							
							
							
						 
						
							2017-02-15 17:00:58 +02:00  
				
					
						
							
							
								 
						
							
								91c6bef77a 
								
							 
						 
						
							
							
								
								Add venv to the default norecursedirs  
							
							... 
							
							
							
							venv (without a dot) is commonly used as a name for a virtualenv directory, and
we don't want to collect that. 
							
						 
						
							2017-02-15 14:55:12 +01:00  
				
					
						
							
							
								 
						
							
								713bdc1f9f 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2017-01-26 12:00:52 +01:00  
				
					
						
							
							
								 
						
							
								7b4afd8946 
								
							 
						 
						
							
							
								
								remove unused import  
							
							
							
						 
						
							2017-01-20 12:09:49 +01:00  
				
					
						
							
							
								 
						
							
								4082f4024a 
								
							 
						 
						
							
							
								
								comment out compatproperty deprecations  
							
							... 
							
							
							
							todo: reenable in the features branch 
							
						 
						
							2017-01-20 11:25:48 +01:00  
				
					
						
							
							
								 
						
							
								d4afa1554b 
								
							 
						 
						
							
							
								
								Refactored old style classes to new style classes  
							
							
							
						 
						
							2017-01-08 22:52:42 -06:00  
				
					
						
							
							
								 
						
							
								402fbe503a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							
							
						 
						
							2016-12-27 23:31:26 -02:00  
				
					
						
							
							
								 
						
							
								9c285dfc1d 
								
							 
						 
						
							
							
								
								fix   #2118  - rework Node._getcustomclass and Node compat properties  
							
							
							
						 
						
							2016-12-06 09:13:25 +01:00  
				
					
						
							
							
								 
						
							
								81528ea81f 
								
							 
						 
						
							
							
								
								Remove hook proxy cache  
							
							... 
							
							
							
							Fix  #2016  
						
							2016-12-02 07:32:11 -02:00  
				
					
						
							
							
								 
						
							
								4e1609b12e 
								
							 
						 
						
							
							
								
								Add `type` validation.  
							
							... 
							
							
							
							Argparse driven argument type validation is added for the
`--junit-xml` and `--confcutdir` arguments.
The commit partially reverts #2080 . Closes  #2089 . 
							
						 
						
							2016-11-28 02:16:01 +01:00  
				
					
						
							
							
								 
						
							
								b30a6d22c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							
							
						 
						
							2016-11-27 17:30:40 -02:00  
				
					
						
							
							
								 
						
							
								0a30f072e6 
								
							 
						 
						
							
							
								
								Show name argment in compatproperty deprecation message  
							
							
							
						 
						
							2016-11-27 14:24:55 -02:00  
				
					
						
							
							
								 
						
							
								b38fad4b82 
								
							 
						 
						
							
							
								
								Add compatproperty deprecation warning.  
							
							
							
						 
						
							2016-11-27 14:24:55 -02:00  
				
					
						
							
							
								 
						
							
								c1b83cdeea 
								
							 
						 
						
							
							
								
								Add hint of Issue  #478  to error text  
							
							
							
						 
						
							2016-11-26 10:47:15 +00:00  
				
					
						
							
							
								 
						
							
								01db0f1cd1 
								
							 
						 
						
							
							
								
								Merge pull request  #1923  from RonnyPfannschmidt/mark-internal-value  
							
							... 
							
							
							
							use consistent inner repressentation for marks 
							
						 
						
							2016-09-19 15:30:22 +01:00  
				
					
						
							
							
								 
						
							
								10094a3f09 
								
							 
						 
						
							
							
								
								use consistent inner repressentation for marks  
							
							
							
						 
						
							2016-09-08 09:52:22 +02:00