78baa7b575 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into mm  
							
							... 
							
							
							
							Conflicts:
	src/_pytest/main.py
	src/_pytest/mark/structures.py
	src/_pytest/python.py
	testing/test_main.py
	testing/test_parseopt.py 
							
						 
						
							2020-02-11 19:22:28 -03:00  
				
					
						
							
							
								 
						
							
								449290406c 
								
							 
						 
						
							
							
								
								test_argcomplete: remove usage of `distutils.spawn` ( #6703 )  
							
							... 
							
							
							
							Fixes collection error with Python 3.5.3 (Travis):
    testing/test_parseopt.py:2: in <module>
        import distutils.spawn
    .tox/py35-coverage/lib/python3.5/distutils/__init__.py:4: in <module>
        import imp
    .tox/py35-coverage/lib/python3.5/imp.py:33: in <module>
        PendingDeprecationWarning, stacklevel=2)
    E   PendingDeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses
Build log: https://travis-ci.org/blueyed/pytest/builds/648305304  
							
						 
						
							2020-02-10 11:52:19 +01:00  
				
					
						
							
							
								 
						
							
								93b74d28d2 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into mm  
							
							... 
							
							
							
							Conflicts:
 * 	src/_pytest/_code/code.py
 * 	src/_pytest/main.py
 * 	testing/python/metafunc.py
 * 	testing/test_parseopt.py
 * 	testing/test_pytester.py 
							
						 
						
							2020-01-22 11:03:45 -03:00  
				
					
						
							
							
								 
						
							
								5049e25a6a 
								
							 
						 
						
							
							
								
								tests: cleanup unused fixtures  
							
							
							
						 
						
							2020-01-16 21:12:48 +01:00  
				
					
						
							
							
								 
						
							
								dac16cd9e5 
								
							 
						 
						
							
							
								
								Add type annotations to _pytest.config.argparsing and corresponding Config code  
							
							
							
						 
						
							2019-11-20 22:02:27 +02:00  
				
					
						
							
							
								 
						
							
								51f9cd0e02 
								
							 
						 
						
							
							
								
								argparsing: remove "map_long_option" Action attribute support  
							
							... 
							
							
							
							This feature was added in commit
007a77c2ba 
							
						 
						
							2019-11-20 17:09:24 +02:00  
				
					
						
							
							
								 
						
							
								abc890079f 
								
							 
						 
						
							
							
								
								typos  
							
							
							
						 
						
							2019-10-31 23:19:35 -05:00  
				
					
						
							
							
								 
						
							
								19c9e53604 
								
							 
						 
						
							
							
								
								Make sure to quote `sys.executable` as we're running a shell  
							
							
							
						 
						
							2019-09-23 08:58:56 -07:00  
				
					
						
							
							
								 
						
							
								04c01fb606 
								
							 
						 
						
							
							
								
								test_argcomplete do not call python directly  #5872  
							
							... 
							
							
							
							Use sys.executable to detect which python we should actually be testing. 
							
						 
						
							2019-09-23 16:38:15 +02:00  
				
					
						
							
							
								 
						
							
								d72fb73fa0 
								
							 
						 
						
							
							
								
								Do not allow abbreviated arguments  
							
							
							
						 
						
							2019-06-25 13:51:33 +10:00  
				
					
						
							
							
								 
						
							
								a91fe1fedd 
								
							 
						 
						
							
							
								
								pre-commit run pyupgrade --all-files  
							
							
							
						 
						
							2019-06-03 12:08:02 -03:00  
				
					
						
							
							
								 
						
							
								3f1ec520fc 
								
							 
						 
						
							
							
								
								pre-commit run reorder-python-imports --all-files  
							
							
							
						 
						
							2019-06-03 12:08:01 -03:00  
				
					
						
							
							
								 
						
							
								5034399d7a 
								
							 
						 
						
							
							
								
								pre-commit run fix-encoding-pragma --all-files  
							
							
							
						 
						
							2019-06-03 12:08:01 -03:00  
				
					
						
							
							
								 
						
							
								dc75b6af47 
								
							 
						 
						
							
							
								
								Use fix-encoding-pragma pre-commit hook  
							
							
							
						 
						
							2019-05-14 15:56:31 -07:00  
				
					
						
							
							
								 
						
							
								ccab469a0c 
								
							 
						 
						
							
							
								
								Fix test_argcomplete: use python -m pytest  
							
							... 
							
							
							
							Previously it was not run with a) xdist ("-c"), and b) "python -m
pytest" ("…/pytest.py", not executable). 
							
						 
						
							2019-02-27 16:52:46 +01:00  
				
					
						
							
							
								 
						
							
								f13935da53 
								
							 
						 
						
							
							
								
								Display --help/--version with ArgumentErrors  
							
							
							
						 
						
							2019-02-11 15:49:48 +01:00  
				
					
						
							
							
								 
						
							
								92a2c1a9c4 
								
							 
						 
						
							
							
								
								remove and ban py.io.BytesIO, py.process, py.path.local.sysfind  
							
							
							
						 
						
							2019-01-21 19:51:16 -08:00  
				
					
						
							
							
								 
						
							
								3445eae737 
								
							 
						 
						
							
							
								
								argparsing: Parser: allow to forward prog to argparse  
							
							... 
							
							
							
							Ref: https://github.com/pytest-dev/pytest-xdist/pull/388 . 
							
						 
						
							2018-12-11 06:22:35 +01:00  
				
					
						
							
							
								 
						
							
								1bba0a9714 
								
							 
						 
						
							
							
								
								Deprecate `raises(..., 'code(as_a_string)')` / `warns(..., 'code(as_a_string)')  
							
							
							
						 
						
							2018-11-29 09:34:51 -08:00  
				
					
						
							
							
								 
						
							
								2368fbb63c 
								
							 
						 
						
							
							
								
								Apply reorder-python-imports to all files  
							
							
							
						 
						
							2018-10-25 00:01:29 -07:00  
				
					
						
							
							
								 
						
							
								8bb8b91357 
								
							 
						 
						
							
							
								
								pyupgrade 1.4: tests  
							
							
							
						 
						
							2018-08-22 18:47:21 -07:00  
				
					
						
							
							
								 
						
							
								cbaa7dd56a 
								
							 
						 
						
							
							
								
								Upgrade pre-commit hooks except pyupgrade  
							
							
							
						 
						
							2018-06-26 06:35:27 -07:00  
				
					
						
							
							
								 
						
							
								464117b472 
								
							 
						 
						
							
							
								
								fix imports in tests  
							
							
							
						 
						
							2018-06-05 10:20:36 +02:00  
				
					
						
							
							
								 
						
							
								703e4b11ba 
								
							 
						 
						
							
							
								
								run black  
							
							
							
						 
						
							2018-05-23 16:48:46 +02:00  
				
					
						
							
							
								 
						
							
								9aacb4635e 
								
							 
						 
						
							
							
								
								run pyupgrade  
							
							
							
						 
						
							2018-05-23 16:45:09 +02:00  
				
					
						
							
							
								 
						
							
								bd1d17e8de 
								
							 
						 
						
							
							
								
								Replace py.std with stdlib imports  
							
							
							
						 
						
							2018-01-09 12:44:10 -08:00  
				
					
						
							
							
								 
						
							
								ef732fc51d 
								
							 
						 
						
							
							
								
								Remove code for unsupported Python versions  
							
							
							
						 
						
							2017-10-10 08:54:56 +03:00  
				
					
						
							
							
								 
						
							
								15610289ac 
								
							 
						 
						
							
							
								
								Fixed E712 flake8 errors  
							
							... 
							
							
							
							comparison to True should be ‘if cond is True:’ or ‘if cond:’ 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								45ac863069 
								
							 
						 
						
							
							
								
								Fixed E401 flake8 errors  
							
							... 
							
							
							
							multiple imports on one line 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
								c9a081d1a3 
								
							 
						 
						
							
							
								
								Fixed E271 flake8 errors  
							
							... 
							
							
							
							multiple spaces after keyword 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								b226454582 
								
							 
						 
						
							
							
								
								Fixed E251 flake8 errors  
							
							... 
							
							
							
							unexpected spaces around keyword / parameter equals 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								57438f3efe 
								
							 
						 
						
							
							
								
								Fixed E127 flake8 errors  
							
							... 
							
							
							
							continuation line over-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								fa56114115 
								
							 
						 
						
							
							
								
								Clean up warnings generated by pytest's own suite  
							
							
							
						 
						
							2017-03-20 22:13:17 -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  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01: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  
				
					
						
							
							
								 
						
							
								620b384b69 
								
							 
						 
						
							
							
								
								Fix cmdline help message for custom options with two or more metavars  
							
							... 
							
							
							
							Fix  #2004  
						
							2016-10-20 20:34:39 -02:00  
				
					
						
							
							
								 
						
							
								b9a91dc112 
								
							 
						 
						
							
							
								
								merge from master to features  
							
							
							
						 
						
							2016-07-06 11:51:48 +02:00  
				
					
						
							
							
								 
						
							
								939407ef63 
								
							 
						 
						
							
							
								
								Simplify Argument.__repr__  
							
							... 
							
							
							
							I have came across this when noticing that universal-ctags fails to parse
this correctly (https://github.com/universal-ctags/ctags/issues/997 ). 
							
						 
						
							2016-06-25 09:31:31 +02:00  
				
					
						
							
							
								 
						
							
								69bab4ab04 
								
							 
						 
						
							
							
								
								added check for already existing option names to OptionGroup.addoption()  
							
							
							
						 
						
							2016-06-22 18:01:35 +02:00  
				
					
						
							
							
								 
						
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							... 
							
							
							
							Fixes  #1629  
						
							2016-06-21 16:16:57 +02:00  
				
					
						
							
							
								 
						
							
								af893aab26 
								
							 
						 
						
							
							
								
								Remove code related to support python <= 2.5  
							
							... 
							
							
							
							Fix  #1226  
						
							2015-12-16 16:16:22 -02:00  
				
					
						
							
							
								 
						
							
								4533a50542 
								
							 
						 
						
							
							
								
								Fix regression caused by changing the signature for parse_known_args  
							
							... 
							
							
							
							Fix  #973  
						
							2015-08-27 19:35:32 -03:00  
				
					
						
							
							
								 
						
							
								42b43a7d7b 
								
							 
						 
						
							
							
								
								Paths after normal options are now properly used to discover rootdir and ini files  
							
							... 
							
							
							
							Fix  #949  
						
							2015-08-25 22:08:05 -03:00  
				
					
						
							
							
								 
						
							
								4e8438afc8 
								
							 
						 
						
							
							
								
								Simply show the node ID for verbose output  
							
							... 
							
							
							
							This strips the line number, /@\d/, from the verbose output so it is
directly the node ID of the test.  This in turn means no special logic
for accepting the line number as part of the node ID is needed when
parsing the command line. 
							
						 
						
							2014-08-01 00:29:35 +01:00  
				
					
						
							
							
								 
						
							
								0d17dc1e19 
								
							 
						 
						
							
							
								
								add a comment for why we only consider .py files when removing @  
							
							... 
							
							
							
							--HG--
branch : fix_initial_parsing 
							
						 
						
							2014-07-28 13:56:10 +02:00