b5b710b3ae 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							... 
							
							
							
							Several conflicts, mostly due to 2c402f4bd 
							
						 
						
							2019-08-02 16:52:51 +02:00  
				
					
						
							
							
								 
						
							
								a82dd2f064 
								
							 
						 
						
							
							
								
								Fix linting  
							
							
							
						 
						
							2019-07-23 10:55:22 -03:00  
				
					
						
							
							
								 
						
							
								8c47db724c 
								
							 
						 
						
							
							
								
								Improve output when parsing an ini configuration fails  
							
							
							
						 
						
							2019-07-23 15:27:27 +02:00  
				
					
						
							
							
								 
						
							
								3c7438969a 
								
							 
						 
						
							
							
								
								Replace internal config._origargs with invocation_params.args  
							
							... 
							
							
							
							Added in https://github.com/pytest-dev/pytest/pull/5564 . 
							
						 
						
							2019-07-23 06:46:56 +02:00  
				
					
						
							
							
								 
						
							
								602cd5e21f 
								
							 
						 
						
							
							
								
								Introduce Config.invocation_params ( #5564 )  
							
							... 
							
							
							
							Introduce Config.invocation_params 
							
						 
						
							2019-07-10 07:46:34 -03:00  
				
					
						
							
							
								 
						
							
								31738155b5 
								
							 
						 
						
							
							
								
								Remove deprecated features ( #5529 )  
							
							... 
							
							
							
							Remove deprecated features 
							
						 
						
							2019-07-09 19:04:06 -03:00  
				
					
						
							
							
								 
						
							
								4cda7093f6 
								
							 
						 
						
							
							
								
								Add note about PYTEST_ADDOPTS  
							
							
							
						 
						
							2019-07-06 17:27:54 -03:00  
				
					
						
							
							
								 
						
							
								6a9bf2852a 
								
							 
						 
						
							
							
								
								Apply review suggestions: use a simple struct for invocation params  
							
							
							
						 
						
							2019-07-06 12:22:19 -03:00  
				
					
						
							
							
								 
						
							
								3e669a262a 
								
							 
						 
						
							
							
								
								Introduce Config.invocation_args and Config.invocation_plugins  
							
							... 
							
							
							
							These attributes can be used to access the unchanged arguments passed
to pytest.main().
The intention is to use these attributes to initialize workers in
the same manner as the master node is initialized in pytest-xdist. 
							
						 
						
							2019-07-05 19:45:23 -03:00  
				
					
						
							
							
								 
						
							
								c54cbd63c8 
								
							 
						 
						
							
							
								
								Replace importlib_metadata with importlib.metadata on Python 3.8+  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/5537  
							
						 
						
							2019-07-04 15:00:10 +02:00  
				
					
						
							
							
								 
						
							
								f2b7809d5d 
								
							 
						 
						
							
							
								
								Move setup.cfg error message and tests to an appropriate location  
							
							... 
							
							
							
							Those are not really deprecated anymore and are part of the normal
code for config 
							
						 
						
							2019-06-30 13:18:07 -03:00  
				
					
						
							
							
								 
						
							
								647d89c444 
								
							 
						 
						
							
							
								
								Move code about 'pytest_plugins' error to a more appropriate place  
							
							... 
							
							
							
							It is no longer deprecated, but part of the normal code for 'config' 
							
						 
						
							2019-06-30 13:18:07 -03:00  
				
					
						
							
							
								 
						
							
								4e723d6750 
								
							 
						 
						
							
							
								
								Fix crash when discovery fails while using `-p no:terminal`  
							
							
							
						 
						
							2019-06-27 10:24:29 -07:00  
				
					
						
							
							
								 
						
							
								2b92fee1c3 
								
							 
						 
						
							
							
								
								initial conversion of exit codes to enum  
							
							
							
						 
						
							2019-06-15 06:48:00 +02:00  
				
					
						
							
							
								 
						
							
								883db6a216 
								
							 
						 
						
							
							
								
								Add test for packages with broken metadata  
							
							... 
							
							
							
							Related to #5389  
							
						 
						
							2019-06-04 17:04:15 -03: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  
				
					
						
							
							
								 
						
							
								4d49ba6529 
								
							 
						 
						
							
							
								
								Drop Python 2.7 and 3.4 support  
							
							... 
							
							
							
							* Update setup.py requires and classifiers
* Drop Python 2.7 and 3.4 from CI
* Update docs dropping 2.7 and 3.4 support
* Fix mock imports and remove tests related to pypi's mock module
* Add py27 and 34 support docs to the sidebar
* Remove usage of six from tmpdir
* Remove six.PY* code blocks
* Remove sys.version_info related code
* Cleanup compat
* Remove obsolete safe_str
* Remove obsolete __unicode__ methods
* Remove compat.PY35 and compat.PY36: not really needed anymore
* Remove unused UNICODE_TYPES
* Remove Jython specific code
* Remove some Python 2 references from docs
Related to #5275  
							
						 
						
							2019-06-02 14:39:11 -03:00  
				
					
						
							
							
								 
						
							
								e032904413 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							
							
						 
						
							2019-05-28 01:46:16 +02:00  
				
					
						
							
							
								 
						
							
								13f02af97d 
								
							 
						 
						
							
							
								
								Switch to importlib-metadata  
							
							
							
						 
						
							2019-05-27 13:24:08 -07:00  
				
					
						
							
							
								 
						
							
								66f20b6f5e 
								
							 
						 
						
							
							
								
								Fix invalid Python file encoding "utf8" ( #5252 )  
							
							... 
							
							
							
							Fix invalid Python file encoding "utf8" 
							
						 
						
							2019-05-23 20:24:23 -03:00  
				
					
						
							
							
								 
						
							
								93fd9debe3 
								
							 
						 
						
							
							
								
								Allow disabling of python plugin  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/5277 . 
							
						 
						
							2019-05-17 18:17:14 +02:00  
				
					
						
							
							
								 
						
							
								dc75b6af47 
								
							 
						 
						
							
							
								
								Use fix-encoding-pragma pre-commit hook  
							
							
							
						 
						
							2019-05-14 15:56:31 -07:00  
				
					
						
							
							
								 
						
							
								65133018f3 
								
							 
						 
						
							
							
								
								Terminal plugin is not semi-essential anymore  
							
							... 
							
							
							
							Thanks to https://github.com/pytest-dev/pytest/pull/5138 . 
							
						 
						
							2019-04-27 03:39:00 +02:00  
				
					
						
							
							
								 
						
							
								7f519f8ab7 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							
							
						 
						
							2019-04-27 00:43:00 +02:00  
				
					
						
							
							
								 
						
							
								d67d68f6d3 
								
							 
						 
						
							
							
								
								Eliminate core dependency on 'terminal' plugin  
							
							
							
						 
						
							2019-04-17 11:19:19 -07:00  
				
					
						
							
							
								 
						
							
								8b2fcf517c 
								
							 
						 
						
							
							
								
								Merge master  
							
							
							
						 
						
							2019-04-11 13:28:36 +02:00  
				
					
						
							
							
								 
						
							
								8011ff5bda 
								
							 
						 
						
							
							
								
								Add _sys_snapshot fixture and use it with more tests  
							
							
							
						 
						
							2019-04-05 11:55:23 +02:00  
				
					
						
							
							
								 
						
							
								8c734dfc2f 
								
							 
						 
						
							
							
								
								Split out list of essential plugins  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4976 . 
							
						 
						
							2019-04-02 14:39:56 +02:00  
				
					
						
							
							
								 
						
							
								e7ade066b6 
								
							 
						 
						
							
							
								
								Merge pull request  #5011  from blueyed/merge-master-into-features  
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2019-03-29 18:35:13 +01:00  
				
					
						
							
							
								 
						
							
								4e931b258d 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							
							
						 
						
							2019-03-29 11:05:46 +01:00  
				
					
						
							
							
								 
						
							
								bfda2a0050 
								
							 
						 
						
							
							
								
								setup.cfg: use existing [tool:pytest] (ignoring [pytest])  
							
							
							
						 
						
							2019-03-29 10:59:27 +01:00  
				
					
						
							
							
								 
						
							
								d17ea7a9c0 
								
							 
						 
						
							
							
								
								tests: ensure cleanup with configs via get_config()  
							
							... 
							
							
							
							Also done in test_pluginmanager, although no resource warnings are
there at least.
Fixes https://github.com/pytest-dev/pytest/issues/4355 . 
							
						 
						
							2019-03-28 00:14:13 +01:00  
				
					
						
							
							
								 
						
							
								08f3b02dfc 
								
							 
						 
						
							
							
								
								tests: fnmatch_lines: use list  
							
							... 
							
							
							
							For strings fnmatch_lines converts it into a Source objects, splitted on
newlines.  This is not necessary here, and it is more consistent to use
lists here in the first place. 
							
						 
						
							2019-03-23 11:36:18 +01:00  
				
					
						
							
							
								 
						
							
								553951c443 
								
							 
						 
						
							
							
								
								Fix some issues related to "-p no:X" with default_plugins  
							
							
							
						 
						
							2019-03-21 17:01:50 +01:00  
				
					
						
							
							
								 
						
							
								c7c120fba6 
								
							 
						 
						
							
							
								
								terminal: handle "capture" option not being available  
							
							... 
							
							
							
							This is the case with `-p no:capture` now. 
							
						 
						
							2019-03-20 03:01:26 +01:00  
				
					
						
							
							
								 
						
							
								415899d428 
								
							 
						 
						
							
							
								
								config: handle `-p no:plugin` with default plugins  
							
							... 
							
							
							
							`-p no:capture` should not load its fixtures in the first place. 
							
						 
						
							2019-03-20 02:47:13 +01:00  
				
					
						
							
							
								 
						
							
								0deb7b1696 
								
							 
						 
						
							
							
								
								Do not show "inifile:" string if there's no configuration file  
							
							
							
						 
						
							2019-03-02 11:45:08 -03:00  
				
					
						
							
							
								 
						
							
								a0207274f4 
								
							 
						 
						
							
							
								
								-p option now can be used to early-load plugins by entry-point name  
							
							... 
							
							
							
							Fixes  #4718  
						
							2019-02-24 13:20:17 -03:00  
				
					
						
							
							
								 
						
							
								a68f4fd2b9 
								
							 
						 
						
							
							
								
								Fix test failures after pluggy 1.8 release  
							
							... 
							
							
							
							pluggy now calls iter_entry_points with different arguments, and tests
which mocked that call need to be updated accordingly. 
							
						 
						
							2019-02-22 18:58:54 -03:00  
				
					
						
							
							
								 
						
							
								f13935da53 
								
							 
						 
						
							
							
								
								Display --help/--version with ArgumentErrors  
							
							
							
						 
						
							2019-02-11 15:49:48 +01:00  
				
					
						
							
							
								 
						
							
								b7e8171cf8 
								
							 
						 
						
							
							
								
								Merge branch 'features' into remove-legacy-warn  
							
							
							
						 
						
							2018-12-17 10:37:31 -02:00  
				
					
						
							
							
								 
						
							
								8e287c5c77 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							
							
						 
						
							2018-12-14 16:44:43 +01:00  
				
					
						
							
							
								 
						
							
								fd48cd57f9 
								
							 
						 
						
							
							
								
								Remove config.warn, Node.warn; pytest_logwarning issues a warning when implemented  
							
							... 
							
							
							
							Fix  #3078  
						
							2018-12-14 12:50:18 -02:00  
				
					
						
							
							
								 
						
							
								6af674a3ac 
								
							 
						 
						
							
							
								
								Merge pull request  #4520  from blueyed/PYTEST_DISABLE_PLUGIN_AUTOLOAD-del  
							
							... 
							
							
							
							tests: fix tests that require PYTEST_DISABLE_PLUGIN_AUTOLOAD to be unset 
							
						 
						
							2018-12-12 18:40:46 +01:00  
				
					
						
							
							
								 
						
							
								0db5ccb0dd 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							
							
						 
						
							2018-12-10 05:42:07 +01:00  
				
					
						
							
							
								 
						
							
								f3babf13ea 
								
							 
						 
						
							
							
								
								Ensure that PYTEST_ADDOPTS are valid by themselves  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4265 . 
							
						 
						
							2018-12-09 21:57:10 +01:00  
				
					
						
							
							
								 
						
							
								64ee1ee81b 
								
							 
						 
						
							
							
								
								tests: fix tests that require PYTEST_DISABLE_PLUGIN_AUTOLOAD to be unset  
							
							... 
							
							
							
							Fix pytest's own tests with PYTEST_DISABLE_PLUGIN_AUTOLOAD=1. 
							
						 
						
							2018-12-09 12:06:18 +01:00  
				
					
						
							
							
								 
						
							
								1bba0a9714 
								
							 
						 
						
							
							
								
								Deprecate `raises(..., 'code(as_a_string)')` / `warns(..., 'code(as_a_string)')  
							
							
							
						 
						
							2018-11-29 09:34:51 -08:00