b30a6d22c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							
							
						 
						
							2016-11-27 17:30:40 -02:00  
				
					
						
							
							
								 
						
							
								33c0b06fdf 
								
							 
						 
						
							
							
								
								Fix error in approx's repr with complex numbers  
							
							... 
							
							
							
							Fix  #2082  
						
							2016-11-24 15:33:12 -02:00  
				
					
						
							
							
								 
						
							
								5ce551e469 
								
							 
						 
						
							
							
								
								Merge pull request  #2075  from pytest-dev/master  
							
							... 
							
							
							
							Merge master into features after fixing flake8 errors 
							
						 
						
							2016-11-22 14:10:31 -02: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  
				
					
						
							
							
								 
						
							
								efc54b2e56 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-features  
							
							
							
						 
						
							2016-11-11 18:56:53 -02:00  
				
					
						
							
							
								 
						
							
								1130b9f742 
								
							 
						 
						
							
							
								
								Fix the stubborn test about cyclic references left by pytest.raises  
							
							... 
							
							
							
							In Python 2, a context manager's __exit__() leaves sys.exc_info with the exception values even when it was supposed
to suppress the exception, so we explicitly call sys.exc_clear() which removes the traceback and allow the object
to be released.
Also updated the test to not depend on the immediate destruction of the object but instead to ensure it is not being
tracked as a cyclic reference.
Fix  #1965  
							
						 
						
							2016-11-08 22:20:27 -02:00  
				
					
						
							
							
								 
						
							
								37dcdfbc58 
								
							 
						 
						
							
							
								
								Re-enable docstring testing of _pytest modules on CI  
							
							... 
							
							
							
							* Fix doctests
* List one env per line in tox.ini
* "doctesting" tox env now also tests docstrings using doctest 
							
						 
						
							2016-10-21 08:55:53 -02:00  
				
					
						
							
							
								 
						
							
								9d00615bbf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2016-10-20 21:51:42 -02:00  
				
					
						
							
							
								 
						
							
								a1d446b8e8 
								
							 
						 
						
							
							
								
								Display traceback from Import errors using pytest's short representation  
							
							... 
							
							
							
							Also omit pytest's own modules and internal libraries (py and pluggy) in low verbosity
Fix  #1976  
							
						 
						
							2016-10-03 21:46:44 -03:00  
				
					
						
							
							
								 
						
							
								7d66e4eae1 
								
							 
						 
						
							
							
								
								Display full traceback from Import errors when collecting test modules  
							
							... 
							
							
							
							Fix  #1976  
						
							2016-10-03 20:47:44 -03:00  
				
					
						
							
							
								 
						
							
								57bb3c6922 
								
							 
						 
						
							
							
								
								Improve error message when using pytest.skip at module level  
							
							... 
							
							
							
							As discussed in issue #1959 . 
							
						 
						
							2016-10-01 13:38:52 -03:00  
				
					
						
							
							
								 
						
							
								654af0ba25 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2016-09-26 19:32:53 -03:00  
				
					
						
							
							
								 
						
							
								e5deb8a927 
								
							 
						 
						
							
							
								
								Merge pull request  #1955  from rowillia/fix_python3_deprecation_warnings  
							
							... 
							
							
							
							Fix `DeprecationWarnings` found when running py.test in Python 2.7 with the -3 flag. 
							
						 
						
							2016-09-22 17:37:52 -03:00  
				
					
						
							
							
								 
						
							
								24db3c123d 
								
							 
						 
						
							
							
								
								Explicitly set  to None to have consistent behavior in Python 2 and Python 3  
							
							
							
						 
						
							2016-09-22 09:22:12 -07:00  
				
					
						
							
							
								 
						
							
								940ed7e943 
								
							 
						 
						
							
							
								
								Fix `DeprecationWarnings` found when running py.test in Python 2.7 with the -3 flag.  
							
							... 
							
							
							
							Running through some of my tests with the `-3` flag in python2.7 I encountered some errors within py.test itself.  This fixes those errors so we can use py.test in order to identify problems with Python 3. 
							
						 
						
							2016-09-21 17:44:25 -07:00  
				
					
						
							
							
								 
						
							
								6db2f315fa 
								
							 
						 
						
							
							
								
								Explain a bad scope value to the user  
							
							
							
						 
						
							2016-09-21 16:40:58 -04:00  
				
					
						
							
							
								 
						
							
								65be1231b1 
								
							 
						 
						
							
							
								
								AttributeError chaining bug  #1944  fix  
							
							
							
						 
						
							2016-09-20 02:20:13 +07:00  
				
					
						
							
							
								 
						
							
								5b260d80f9 
								
							 
						 
						
							
							
								
								Merge pull request  #1883  from RonnyPfannschmidt/kill-memoized-call  
							
							... 
							
							
							
							Kill memoized call 
							
						 
						
							2016-09-19 12:47:52 +01:00  
				
					
						
							
							
								 
						
							
								1c9bd9278e 
								
							 
						 
						
							
							
								
								Merge pull request  #1913  from flub/builtin-assertion  
							
							... 
							
							
							
							Remove BuiltinAssertionError 
							
						 
						
							2016-09-05 16:53:13 +02:00  
				
					
						
							
							
								 
						
							
								28b1896e9a 
								
							 
						 
						
							
							
								
								Remove BuiltinAssertionError  
							
							... 
							
							
							
							We used to have this when we where patching the real Python
AssertionError for use with reinterpret, but reinterpret is now
gone so we no longer need this as it is not used by rewrite. 
							
						 
						
							2016-09-05 15:29:09 +02:00  
				
					
						
							
							
								 
						
							
								e572c16d3f 
								
							 
						 
						
							
							
								
								remove memoizedcall in Module  
							
							
							
						 
						
							2016-09-05 14:41:28 +02:00  
				
					
						
							
							
								 
						
							
								1e10de574d 
								
							 
						 
						
							
							
								
								The "ids" argument to "parametrize" again accepts unicode strings in Python 2  
							
							... 
							
							
							
							Fixes  #1905  
						
							2016-09-02 18:38:15 -03:00  
				
					
						
							
							
								 
						
							
								519f02b014 
								
							 
						 
						
							
							
								
								docs warnings as errors and initial page similar to README  
							
							... 
							
							
							
							* Changed "index" to be more similar to the README (#1708 ).
* Fixes numerous issues like missing documents, syntax errors, etc (#1829 , #432 ).
* Mention all docs in "contents.rst" so it's easier for users to locate (#1112 ).
* Add doc generation and checking to Travis and AppVeyor, to avoid re-introducing errors.
Fixes  #432 , Fixes  #1112 , Fixes  #1708 , Fixes  #1829  
							
						 
						
							2016-08-26 17:47:18 -03:00  
				
					
						
							
							
								 
						
							
								972a5fb5d5 
								
							 
						 
						
							
							
								
								Improve error message when passing non-string ids to pytest.mark.parametrize  
							
							... 
							
							
							
							Fix  #1857  
						
							2016-08-23 23:31:45 -03:00  
				
					
						
							
							
								 
						
							
								df200297e2 
								
							 
						 
						
							
							
								
								Fix internal error when parametrizing using and empty list of ids()  
							
							... 
							
							
							
							Fix  #1849  
						
							2016-08-23 18:18:46 -03:00  
				
					
						
							
							
								 
						
							
								53a0e2b118 
								
							 
						 
						
							
							
								
								Fix code which guesses parametrized scope based on arguments  
							
							... 
							
							
							
							Fix  #1832  
						
							2016-08-22 21:05:41 -03:00  
				
					
						
							
							
								 
						
							
								406777d104 
								
							 
						 
						
							
							
								
								mark plugin: move the unclean marked parameter extraction  
							
							
							
						 
						
							2016-08-21 20:44:37 +02:00  
				
					
						
							
							
								 
						
							
								a20c3f9c44 
								
							 
						 
						
							
							
								
								Merge pull request  #1827  from blueyed/Fix-spelling-s-outside-a-outside-of-a-  
							
							... 
							
							
							
							Fix spelling: s/outside a/outside of a/ 
							
						 
						
							2016-08-20 20:04:58 +02:00  
				
					
						
							
							
								 
						
							
								e306a53999 
								
							 
						 
						
							
							
								
								Fix spelling: s/outside a/outside of a/  
							
							
							
						 
						
							2016-08-20 18:43:39 +02:00  
				
					
						
							
							
								 
						
							
								63dc71c57e 
								
							 
						 
						
							
							
								
								Fix regression when using importorskip at module level  
							
							... 
							
							
							
							Fix  #1822  
						
							2016-08-19 18:21:25 -03:00  
				
					
						
							
							
								 
						
							
								463e6572c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							... 
							
							
							
							Preparing for 3.0 
							
						 
						
							2016-08-17 22:39:23 -03:00  
				
					
						
							
							
								 
						
							
								c8ab79402c 
								
							 
						 
						
							
							
								
								Merge pull request  #1811  from nicoddemus/revert-invocation-fixtures  
							
							... 
							
							
							
							Revert invocation-fixtures code 
							
						 
						
							2016-08-17 20:32:54 +02:00  
				
					
						
							
							
								 
						
							
								707b6b5e3f 
								
							 
						 
						
							
							
								
								Revert all invocation-fixtures code  
							
							... 
							
							
							
							Due to a serious regression found in #1794 , it was decided to pull off
invocation features from 3.0 so it can be (hopefully) re-introduced
in 3.1 
							
						 
						
							2016-08-17 08:12:55 -03:00  
				
					
						
							
							
								 
						
							
								c163cc7937 
								
							 
						 
						
							
							
								
								Improve display of continuation lines with multiline errors  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/717 .
Follow-up to https://github.com/pytest-dev/pytest/pull/1762 . 
							
						 
						
							2016-08-14 22:34:31 +02:00  
				
					
						
							
							
								 
						
							
								1a79137d04 
								
							 
						 
						
							
							
								
								Add originalname attribute to Function  
							
							... 
							
							
							
							Related to #1790  
							
						 
						
							2016-08-03 22:56:12 -03:00  
				
					
						
							
							
								 
						
							
								553dc2600f 
								
							 
						 
						
							
							
								
								Strip invocation-scope suffix when displaying fixture lookup error  
							
							
							
						 
						
							2016-08-01 20:34:56 -03:00  
				
					
						
							
							
								 
						
							
								44ecf2ab2f 
								
							 
						 
						
							
							
								
								invocation-scoped fixtures show up once with --fixtures  
							
							
							
						 
						
							2016-08-01 18:48:29 -03:00  
				
					
						
							
							
								 
						
							
								510a6083ba 
								
							 
						 
						
							
							
								
								Merge pull request  #1758  from nicoddemus/deprecated-module  
							
							... 
							
							
							
							Add deprecation module to centralize deprecation messages and bits of… 
							
						 
						
							2016-07-28 22:36:55 +01:00  
				
					
						
							
							
								 
						
							
								c2864aba3d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/monkeypatch.py
#	_pytest/python.py 
							
						 
						
							2016-07-25 19:06:29 -03:00  
				
					
						
							
							
								 
						
							
								d911bfcb8a 
								
							 
						 
						
							
							
								
								Merge branch 'issue634-scopes' of  https://github.com/Stranger6667/pytest  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.rst 
							
						 
						
							2016-07-25 18:26:50 -03:00  
				
					
						
							
							
								 
						
							
								8f29ce26e9 
								
							 
						 
						
							
							
								
								Merge branch 'mark_missing_fixture_error' of  https://github.com/eolo999/pytest  
							
							
							
						 
						
							2016-07-25 18:20:17 -03:00  
				
					
						
							
							
								 
						
							
								6c8b0a28e1 
								
							 
						 
						
							
							
								
								Add deprecation module to centralize deprecation messages and bits of code  
							
							
							
						 
						
							2016-07-25 18:14:39 -03:00  
				
					
						
							
							
								 
						
							
								d72afe7e08 
								
							 
						 
						
							
							
								
								Fixed scope override inside metafunc.parametrize.  Fixes   #634  
							
							
							
						 
						
							2016-07-25 12:42:50 +02:00  
				
					
						
							
							
								 
						
							
								f7ad173fee 
								
							 
						 
						
							
							
								
								Fixed collection of classes with custom ``__new__`` method  
							
							
							
						 
						
							2016-07-25 11:33:37 +02:00  
				
					
						
							
							
								 
						
							
								d000f2536a 
								
							 
						 
						
							
							
								
								added a test for when the indirect is just a string  
							
							
							
						 
						
							2016-07-24 10:47:06 +02:00  
				
					
						
							
							
								 
						
							
								6799a47c78 
								
							 
						 
						
							
							
								
								Start FixtureLookupErrorRepr with an 'E'  
							
							
							
						 
						
							2016-07-23 23:43:34 +02:00  
				
					
						
							
							
								 
						
							
								f26fa5a441 
								
							 
						 
						
							
							
								
								changed error message for unused parametrize name  
							
							
							
						 
						
							2016-07-23 16:49:20 +02:00  
				
					
						
							
							
								 
						
							
								7e37497d5a 
								
							 
						 
						
							
							
								
								Uppercase first word in docstrings. Change to an imperative form. Add name to authors.  
							
							
							
						 
						
							2016-07-22 12:39:06 +02:00  
				
					
						
							
							
								 
						
							
								4f2bf965cb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures  
							
							
							
						 
						
							2016-07-20 21:16:27 -03:00  
				
					
						
							
							
								 
						
							
								ff8fb4950e 
								
							 
						 
						
							
							
								
								setup_* and teardown_* functions argument now optional  
							
							... 
							
							
							
							setup_module, setup_function and setup_method
extra argument are now optional and may be omitted.
Fix  #1728  
							
						 
						
							2016-07-14 23:41:40 -03:00