b5b710b3ae 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							... 
							
							
							
							Several conflicts, mostly due to 2c402f4bd 
							
						 
						
							2019-08-02 16:52:51 +02:00  
				
					
						
							
							
								 
						
							
								d19fe3c410 
								
							 
						 
						
							
							
								
								didnt -> didn't  
							
							
							
						 
						
							2019-08-01 15:10:39 +02:00  
				
					
						
							
							
								 
						
							
								c470ade0a5 
								
							 
						 
						
							
							
								
								Remove 'RemovedInPytest4Warning'  
							
							
							
						 
						
							2019-06-30 13:31:39 -03:00  
				
					
						
							
							
								 
						
							
								683b2632b4 
								
							 
						 
						
							
							
								
								Remove explicit kwargs handling from raises, warns and ParameterSet.param  
							
							
							
						 
						
							2019-06-30 13:18:06 -03:00  
				
					
						
							
							
								 
						
							
								279733a30b 
								
							 
						 
						
							
							
								
								Remove support for 'code as string' from pytest.raises and pytest.warns  
							
							
							
						 
						
							2019-06-30 11:40:24 -03:00  
				
					
						
							
							
								 
						
							
								2b92fee1c3 
								
							 
						 
						
							
							
								
								initial conversion of exit codes to enum  
							
							
							
						 
						
							2019-06-15 06:48:00 +02:00  
				
					
						
							
							
								 
						
							
								4df529e5b9 
								
							 
						 
						
							
							
								
								Clean up __future__ and coding: in tests  
							
							
							
						 
						
							2019-06-03 12:08:02 -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  
				
					
						
							
							
								 
						
							
								cafb13c95f 
								
							 
						 
						
							
							
								
								Fix `pytest.mark.parametrize` when the argvalue is an iterator  
							
							
							
						 
						
							2019-06-01 15:09:17 -07:00  
				
					
						
							
							
								 
						
							
								dc75b6af47 
								
							 
						 
						
							
							
								
								Use fix-encoding-pragma pre-commit hook  
							
							
							
						 
						
							2019-05-14 15:56:31 -07:00  
				
					
						
							
							
								 
						
							
								0594dba5ce 
								
							 
						 
						
							
							
								
								Remove unused markers and enable --strict-markers  
							
							
							
						 
						
							2019-05-09 19:36:39 -03:00  
				
					
						
							
							
								 
						
							
								f1183c2422 
								
							 
						 
						
							
							
								
								Remove the 'issue' marker from test suite  
							
							... 
							
							
							
							It doesn't seem to add much value (why would one execute tests
based on that marker?), plus using the docstring for that
encourages one to write a more descriptive message about the test 
							
						 
						
							2019-05-09 19:36:38 -03:00  
				
					
						
							
							
								 
						
							
								685ca96c71 
								
							 
						 
						
							
							
								
								Change ``--strict`` to ``--strict-markers``, preserving the old one  
							
							... 
							
							
							
							Fix  #5023  
						
							2019-05-09 19:36:38 -03:00  
				
					
						
							
							
								 
						
							
								45ba736c81 
								
							 
						 
						
							
							
								
								Merge pull request  #5128  from blueyed/mark-is  
							
							... 
							
							
							
							Fix error message with unregistered markers 
							
						 
						
							2019-04-15 16:23:54 +02:00  
				
					
						
							
							
								 
						
							
								cc005af47e 
								
							 
						 
						
							
							
								
								Fix error message with unregistered markers  
							
							
							
						 
						
							2019-04-15 10:15:37 +02:00  
				
					
						
							
							
								 
						
							
								6f0a5789fb 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							
							
						 
						
							2019-04-14 23:22:21 +02:00  
				
					
						
							
							
								 
						
							
								43e7401c91 
								
							 
						 
						
							
							
								
								Produce a warning when unknown arguments are passed to pytest.param()  
							
							
							
						 
						
							2019-04-12 13:00:39 -07:00  
				
					
						
							
							
								 
						
							
								00810b9b2a 
								
							 
						 
						
							
							
								
								Register "issue" mark for self-tests  
							
							
							
						 
						
							2019-03-31 14:22:30 +11:00  
				
					
						
							
							
								 
						
							
								76c70cbf4c 
								
							 
						 
						
							
							
								
								Fix off-by-one error with lineno in mark collection error  
							
							
							
						 
						
							2019-03-27 17:44:52 +01:00  
				
					
						
							
							
								 
						
							
								f28b834426 
								
							 
						 
						
							
							
								
								fix   #4649  - also transfer markers to keywordmapping  
							
							... 
							
							
							
							as it turns out it is distinct from nodekeywords and behaves completely different 
							
						 
						
							2019-01-18 23:18:51 +01:00  
				
					
						
							
							
								 
						
							
								9f9f6ee48b 
								
							 
						 
						
							
							
								
								remove most of markertransfer  
							
							... 
							
							
							
							keywords are still a big issue 
							
						 
						
							2018-12-21 14:02:38 +01:00  
				
					
						
							
							
								 
						
							
								c378cb4793 
								
							 
						 
						
							
							
								
								Remove support for applying marks to values in parametrize  
							
							... 
							
							
							
							Fix  #3082  
						
							2018-12-20 16:16:13 -02:00  
				
					
						
							
							
								 
						
							
								33b877cc01 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-11-23 23:27:41 -02:00  
				
					
						
							
							
								 
						
							
								b3700f61ba 
								
							 
						 
						
							
							
								
								Fix formatting of print() calls  
							
							
							
						 
						
							2018-11-22 00:15:14 -08:00  
				
					
						
							
							
								 
						
							
								8395b9e25d 
								
							 
						 
						
							
							
								
								Require id=... to be a string  
							
							... 
							
							
							
							This was documented before, but never enforced.  Passing non-strings could
have strange side-effects and enforcing a string simplifies other
implementation. 
							
						 
						
							2018-11-19 11:03:52 -08:00  
				
					
						
							
							
								 
						
							
								dc20dedbc7 
								
							 
						 
						
							
							
								
								Change RemovedInPytest4Warnings to errors by default  
							
							... 
							
							
							
							To keep existing tests which emit RemovedInPytest4Warnings running, decided
to go with a command line option because:
* Is harder to integrate an ini option with tests which already use an ini file
* It also marks tests which need to be removed/updated in 4.1, when
  RemovedInPytest4Warning and related functionality are removed.
Fix  #3737  
							
						 
						
							2018-11-12 16:10:57 -02:00  
				
					
						
							
							
								 
						
							
								2368fbb63c 
								
							 
						 
						
							
							
								
								Apply reorder-python-imports to all files  
							
							
							
						 
						
							2018-10-25 00:01:29 -07:00  
				
					
						
							
							
								 
						
							
								5436e42990 
								
							 
						 
						
							
							
								
								Use pytest.fail(..., pytrace=False) when treating user errors  
							
							... 
							
							
							
							This prevents an enormous and often useless stack trace from showing
to end users.
Fix  #3867 
Fix  #2293  
							
						 
						
							2018-10-10 19:16:53 -03:00  
				
					
						
							
							
								 
						
							
								1101a20408 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-10-02 18:13:54 -03:00  
				
					
						
							
							
								 
						
							
								5d2d64c190 
								
							 
						 
						
							
							
								
								Merge pull request  #4057  from jeffreyrack/4051-improve-error-messaging  
							
							... 
							
							
							
							Improve error messaging when invalid syntax is passed to the -m option 
							
						 
						
							2018-10-01 07:16:59 +02:00  
				
					
						
							
							
								 
						
							
								c2179c3127 
								
							 
						 
						
							
							
								
								Improve error messaging when invalid syntax is passed to the -m option  
							
							
							
						 
						
							2018-09-30 18:34:56 -07:00  
				
					
						
							
							
								 
						
							
								05155e4db0 
								
							 
						 
						
							
							
								
								Fail at parametrize option for empty parameter set  
							
							... 
							
							
							
							Optionally raise an exception when parametrize collects no arguments.
Provide the name of the test causing the failure in the exception
message.
See: #3849  
							
						 
						
							2018-09-15 09:18:03 +02:00  
				
					
						
							
							
								 
						
							
								ddb308455a 
								
							 
						 
						
							
							
								
								Make sure warn is called in test_parameterset_extractfrom  
							
							
							
						 
						
							2018-09-05 09:01:29 -03:00  
				
					
						
							
							
								 
						
							
								47bf58d69e 
								
							 
						 
						
							
							
								
								Make Node.warn support two forms, new and deprecated  
							
							... 
							
							
							
							As suggested during review, it now accepts two forms:
Node.warn(warning_instance)  (recommended)
Node.warn(code, message)  (deprecated) 
							
						 
						
							2018-09-04 15:53:17 -03:00  
				
					
						
							
							
								 
						
							
								b42518acd5 
								
							 
						 
						
							
							
								
								Change std_warn to receive a single warning instance, addressed review suggestions  
							
							
							
						 
						
							2018-09-04 14:20:42 -03:00  
				
					
						
							
							
								 
						
							
								19a01c9849 
								
							 
						 
						
							
							
								
								Make PytestWarning and RemovedInPytest4Warning part of the public API  
							
							
							
						 
						
							2018-09-04 11:35:34 -03:00  
				
					
						
							
							
								 
						
							
								0100f61b62 
								
							 
						 
						
							
							
								
								Start the laywork to capture standard warnings  
							
							
							
						 
						
							2018-09-04 11:35:15 -03:00  
				
					
						
							
							
								 
						
							
								7696d5371a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2018-07-04 18:49:35 -03:00  
				
					
						
							
							
								 
						
							
								5bd5b8c68a 
								
							 
						 
						
							
							
								
								fix   #3631  - don't store legacy markinfo when its impossible  
							
							
							
						 
						
							2018-06-29 14:01:20 +02:00  
				
					
						
							
							
								 
						
							
								3c73d6298a 
								
							 
						 
						
							
							
								
								merge from master to features  
							
							
							
						 
						
							2018-06-28 17:32:41 +02:00  
				
					
						
							
							
								 
						
							
								b8486037d3 
								
							 
						 
						
							
							
								
								fix   #3605  - unpack markdecorators from parameterization  
							
							
							
						 
						
							2018-06-26 21:57:31 +02:00  
				
					
						
							
							
								 
						
							
								78a82c05ef 
								
							 
						 
						
							
							
								
								consistent failure on all python versions for test_markers_from_parametrize  
							
							
							
						 
						
							2018-06-26 21:57:31 +02:00  
				
					
						
							
							
								 
						
							
								853975d93b 
								
							 
						 
						
							
							
								
								add failing test for  #3605  
							
							
							
						 
						
							2018-06-26 21:57:31 +02:00  
				
					
						
							
							
								 
						
							
								89e0a3ec27 
								
							 
						 
						
							
							
								
								merge from master to features  
							
							
							
						 
						
							2018-06-26 17:01:05 +02:00  
				
					
						
							
							
								 
						
							
								cbaa7dd56a 
								
							 
						 
						
							
							
								
								Upgrade pre-commit hooks except pyupgrade  
							
							
							
						 
						
							2018-06-26 06:35:27 -07:00  
				
					
						
							
							
								 
						
							
								deff54aae0 
								
							 
						 
						
							
							
								
								Try import mock, but on python 3.3+ can use also stdlib unittest.mock  
							
							... 
							
							
							
							From Python 3.3 is mock part of python standard library in unittest namespace 
							
						 
						
							2018-06-23 23:27:07 +02:00  
				
					
						
							
							
								 
						
							
								eb0c6a8287 
								
							 
						 
						
							
							
								
								fix addmarker - extract mark from markdecorator  
							
							
							
						 
						
							2018-06-13 17:27:00 +02:00