83034bbd48 
								
							 
						 
						
							
							
								
								#1642  Fix rootdir option  
							
							
							
						 
						
							2018-01-20 22:30:01 +03:00  
				
					
						
							
							
								 
						
							
								ce30896cd2 
								
							 
						 
						
							
							
								
								Also blacklist pytest-capturelog plugin  
							
							... 
							
							
							
							This is the older plugin before pytest-catchlog was around. Apparently there are
people still using it.
Fixes  #3004  
							
						 
						
							2017-12-05 20:02:56 +01:00  
				
					
						
							
							
								 
						
							
								4ea7bbc197 
								
							 
						 
						
							
							
								
								fix issue  #2920  
							
							
							
						 
						
							2017-11-28 16:47:12 +01: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  
				
					
						
							
							
								 
						
							
								95de11a44e 
								
							 
						 
						
							
							
								
								Block pytest-catchlog and issue a warning  
							
							... 
							
							
							
							Trying to install pytest-3.3 and pytest-catchlog will result in an
option conflicts because both declare the same options. 
							
						 
						
							2017-11-23 19:53:12 -02:00  
				
					
						
							
							
								 
						
							
								05cfdcc8cb 
								
							 
						 
						
							
							
								
								Revert making TerminalWriter public in TerminalReporter plugin  
							
							... 
							
							
							
							We eventually want to replace py.io.TerminalWriter (exposed as
"_tw" in TerminalReporter) by something else, so deprecating access
to "_tw" and making it public as "writer" is contrary to that. 
							
						 
						
							2017-11-23 19:53:12 -02:00  
				
					
						
							
							
								 
						
							
								983a09a2d4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-11-10 18:33:02 -02:00  
				
					
						
							
							
								 
						
							
								03829fde8a 
								
							 
						 
						
							
							
								
								Fix linting E741: ambiguous variable name  
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00  
				
					
						
							
							
								 
						
							
								f743e95cfc 
								
							 
						 
						
							
							
								
								Merge pull request  #2791  from OfirOshir/features  
							
							... 
							
							
							
							bugfix for issue #2491  
							
						 
						
							2017-10-25 09:04:01 +02:00  
				
					
						
							
							
								 
						
							
								537fc3c315 
								
							 
						 
						
							
							
								
								Merge pull request  #2824  from dirk-thomas/pytest_addopts_before_initini  
							
							... 
							
							
							
							get PYTEST_ADDOPTS before calling _initini 
							
						 
						
							2017-10-18 18:35:12 -02:00  
				
					
						
							
							
								 
						
							
								c750a5beec 
								
							 
						 
						
							
							
								
								Merge pull request  #2794  from thisch/catchlog  
							
							... 
							
							
							
							Merge pytest-catchlog plugin 
							
						 
						
							2017-10-12 09:02:46 +02:00  
				
					
						
							
							
								 
						
							
								66e9a79472 
								
							 
						 
						
							
							
								
								get PYTEST_ADDOPTS before calling _initini  
							
							
							
						 
						
							2017-10-11 09:38:44 -07:00  
				
					
						
							
							
								 
						
							
								3b30c93f73 
								
							 
						 
						
							
							
								
								Deprecate TerminalReporter._tw  
							
							... 
							
							
							
							Fix  #2803  
						
							2017-09-27 17:16:34 -03:00  
				
					
						
							
							
								 
						
							
								8eafbd05ca 
								
							 
						 
						
							
							
								
								Merge the pytest-catchlog plugin  
							
							
							
						 
						
							2017-09-22 22:27:49 +02:00  
				
					
						
							
							
								 
						
							
								062a0e3e68 
								
							 
						 
						
							
							
								
								If an exception happens while loading a plugin, PyTest no longer hides the original traceback.  
							
							... 
							
							
							
							In python2 it will show the original traceback with a new message that explains in which plugin.
 In python3 it will show 2 canonized exceptions, the original exception while loading the plugin in addition to an exception that PyTest throws about loading a plugin. 
							
						 
						
							2017-09-19 15:14:08 +03:00  
				
					
						
							
							
								 
						
							
								d01f08e96f 
								
							 
						 
						
							
							
								
								Merge branch 'features' into pluggy-master  
							
							
							
						 
						
							2017-09-06 13:13:35 -03:00  
				
					
						
							
							
								 
						
							
								f825b4979b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2017-09-05 19:44:33 -03:00  
				
					
						
							
							
								 
						
							
								3dc0da9339 
								
							 
						 
						
							
							
								
								Remove __multicall__ warning and usages in testing  
							
							... 
							
							
							
							pluggy>=0.5 already warns about those 
							
						 
						
							2017-09-01 18:53:06 -03:00  
				
					
						
							
							
								 
						
							
								ff35c17ecf 
								
							 
						 
						
							
							
								
								Drop wrapper module; import directly  
							
							
							
						 
						
							2017-08-25 11:46:55 -04:00  
				
					
						
							
							
								 
						
							
								9ab83083d1 
								
							 
						 
						
							
							
								
								Update docs  
							
							
							
						 
						
							2017-08-24 16:53:37 -04:00  
				
					
						
							
							
								 
						
							
								a0101f024e 
								
							 
						 
						
							
							
								
								remove os.sep as it behaves differently linux and windows.  
							
							... 
							
							
							
							* on linux it is '/'
* on windows it is '\' 
							
						 
						
							2017-08-05 23:21:43 +05:30  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								c68a89b4a7 
								
							 
						 
						
							
							
								
								remove preinit, its no longer needed  
							
							
							
						 
						
							2017-07-31 13:44:05 +02: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								17a21d540b 
								
							 
						 
						
							
							
								
								Fixed E301 flake8 errors  
							
							... 
							
							
							
							expected 1 blank line, 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  
				
					
						
							
							
								 
						
							
								3fabc4d219 
								
							 
						 
						
							
							
								
								Fixed E222 flake8 errors  
							
							... 
							
							
							
							multiple spaces after operator 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								df54bf0db5 
								
							 
						 
						
							
							
								
								Fixed E131 flake8 errors  
							
							... 
							
							
							
							continuation line unaligned for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								cf97159009 
								
							 
						 
						
							
							
								
								Fixed E128 flake8 errors  
							
							... 
							
							
							
							continuation line under-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								57438f3efe 
								
							 
						 
						
							
							
								
								Fixed E127 flake8 errors  
							
							... 
							
							
							
							continuation line over-indented for visual 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  
				
					
						
							
							
								 
						
							
								425665cf25 
								
							 
						 
						
							
							
								
								Fixed E122 flake8 errors  
							
							... 
							
							
							
							continuation line missing indentation or outdented 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								54a90e9555 
								
							 
						 
						
							
							
								
								docs: Create links for objects to show the api  
							
							
							
						 
						
							2017-06-06 01:10:32 +02:00  
				
					
						
							
							
								 
						
							
								f74f14f038 
								
							 
						 
						
							
							
								
								Fix --help with required options  
							
							... 
							
							
							
							This works by adding an argparse Action that will raise an exception in
order to skip the rest of the argument parsing. This prevents argparse
from quitting due to missing required arguments, similar to the way that
the builtin argparse --help option is implemented by raising SystemExit.
Fixes : #1999  
							
						 
						
							2017-06-01 21:29:50 +03:00  
				
					
						
							
							
								 
						
							
								d343f9497c 
								
							 
						 
						
							
							
								
								Merge branch 'release-3.1'  
							
							
							
						 
						
							2017-05-22 19:10:06 -03:00  
				
					
						
							
							
								 
						
							
								c9c2c34b44 
								
							 
						 
						
							
							
								
								Remove unused parameter  
							
							
							
						 
						
							2017-05-20 04:39:45 -04:00  
				
					
						
							
							
								 
						
							
								9beeef970e 
								
							 
						 
						
							
							
								
								Parse the filename in the generator expression  
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
				
					
						
							
							
								 
						
							
								43aa037ebd 
								
							 
						 
						
							
							
								
								Reindent  
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
				
					
						
							
							
								 
						
							
								2abf2070f2 
								
							 
						 
						
							
							
								
								Collapse nested for loops into a generator expression  
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
				
					
						
							
							
								 
						
							
								ce0ff0040f 
								
							 
						 
						
							
							
								
								Reindent and add docstring  
							
							
							
						 
						
							2017-05-20 04:38:27 -04:00  
				
					
						
							
							
								 
						
							
								6d2e11b7d1 
								
							 
						 
						
							
							
								
								Extract method for _mark_plugins_for_rewrite  
							
							
							
						 
						
							2017-05-20 04:18:41 -04:00