Ville Skyttä
							
						 
						
							 
							
							
							
							
								
							
							
								ede4e9171f 
								
							 
						 
						
							
							
								
								Spelling fixes  
							
							 
							
							
							
						 
						
							2017-02-15 17:00:58 +02:00  
						
					 
				
					
						
							
							
								 
								Ville Skyttä
							
						 
						
							 
							
							
							
							
								
							
							
								eeb6603d71 
								
							 
						 
						
							
							
								
								Python 3.6 invalid escape sequence deprecation fixes  
							
							 
							
							
							
						 
						
							2017-02-15 16:54:53 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								91c6bef77a 
								
							 
						 
						
							
							
								
								Add venv to the default norecursedirs  
							
							 
							
							... 
							
							
							
							venv (without a dot) is commonly used as a name for a virtualenv directory, and
we don't want to collect that. 
							
						 
						
							2017-02-15 14:55:12 +01:00  
						
					 
				
					
						
							
							
								 
								Patrick Hayes
							
						 
						
							 
							
							
							
							
								
							
							
								58ce3a9e8c 
								
							 
						 
						
							
							
								
								Safer sys.modules delete  
							
							 
							
							
							
						 
						
							2017-02-14 16:54:32 -08:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9eb1d73951 
								
							 
						 
						
							
							
								
								--override-ini now correctly overrides some fundamental options like "python_files"  
							
							 
							
							... 
							
							
							
							#2238  
							
						 
						
							2017-02-08 23:03:33 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								6a097aa0f1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into allow_skipping_unittests_with_pdb_active  
							
							 
							
							
							
						 
						
							2017-02-08 20:30:14 -02:00  
						
					 
				
					
						
							
							
								 
								Ran Benita
							
						 
						
							 
							
							
							
							
								
							
							
								3a0a0c2df9 
								
							 
						 
						
							
							
								
								Ignore errors raised from descriptors when collecting fixtures  
							
							 
							
							... 
							
							
							
							Descriptors (e.g. properties) such as in the added test case are
triggered during collection, executing arbitrary code which can raise.
Previously, such exceptions were propagated and failed the collection.
Now these exceptions are caught and the corresponding attributes are
silently ignored.
A better solution would be to completely skip access to all custom
descriptors, such that the offending code doesn't even trigger. However
I think this requires manually going through the instance and all of its
MRO for each and every attribute checking if it might be a proper
fixture before accessing it. So I took the easy route here.
In other words, putting something like this in your test class is still
a bad idea...:
    @property
    def innocent(self):
        os.system('rm -rf /')
Fixes  #2234 . 
							
						 
						
							2017-02-07 14:27:34 +02:00  
						
					 
				
					
						
							
							
								 
								Ran Benita
							
						 
						
							 
							
							
							
							
								
							
							
								87fb689ab1 
								
							 
						 
						
							
							
								
								Remove an unneeded `except KeyboardInterrupt`  
							
							 
							
							... 
							
							
							
							KeyboardInterrupt is a subclass of BaseException, but not of Exception.
Hence if we remove this except, KeyboardInterrupts will still be raised
so the behavior stays the same. 
							
						 
						
							2017-02-07 14:12:09 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ccf9877447 
								
							 
						 
						
							
							
								
								Merge pull request  #2232  from vidartf/patch-1  
							
							 
							
							... 
							
							
							
							Do not asssume `Item.obj` in 'skipping' plugin 
							
						 
						
							2017-02-03 21:39:42 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a4d2a5785b 
								
							 
						 
						
							
							
								
								Merge pull request  #2142  from barneygale/xfail_without_condition_getglobals  
							
							 
							
							... 
							
							
							
							'xfail' markers without a condition no longer rely on the underlying `Item` objects deriving from `PyobjMixin` 
							
						 
						
							2017-02-03 16:09:47 -02:00  
						
					 
				
					
						
							
							
								 
								Vidar Tonaas Fauske
							
						 
						
							 
							
							
							
							
								
							
							
								bad261279c 
								
							 
						 
						
							
							
								
								Do not asssume `Item.obj` in 'skipping' plugin  
							
							 
							
							... 
							
							
							
							See #2231  for discussion. 
							
						 
						
							2017-02-03 16:04:34 +01:00  
						
					 
				
					
						
							
							
								 
								Thomas Kriechbaumer
							
						 
						
							 
							
							
							
							
								
							
							
								43662ce789 
								
							 
						 
						
							
							
								
								allow error message matching in pytest.raises  
							
							 
							
							
							
						 
						
							2017-02-02 19:52:33 +01:00  
						
					 
				
					
						
							
							
								 
								mbyt
							
						 
						
							 
							
							
							
							
								
							
							
								ad56cd8027 
								
							 
						 
						
							
							
								
								extract a _handle_skip method, secure PY2 branch  
							
							 
							
							
							
						 
						
							2017-02-02 05:01:51 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								176c680e19 
								
							 
						 
						
							
							
								
								Merge branch 'master' into allow_skipping_unittests_with_pdb_active  
							
							 
							
							
							
						 
						
							2017-02-01 15:53:14 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								e1c5314d80 
								
							 
						 
						
							
							
								
								Replace 'raise StopIteration' usages in the code by 'return's in accordance to PEP-479  
							
							 
							
							... 
							
							
							
							Fix  #2160  
							
						 
						
							2017-02-01 02:37:55 -02:00  
						
					 
				
					
						
							
							
								 
								mbyt
							
						 
						
							 
							
							
							
							
								
							
							
								36b6f17727 
								
							 
						 
						
							
							
								
								fixing code-style, keep flake8 happy  
							
							 
							
							
							
						 
						
							2017-01-31 21:03:49 +01:00  
						
					 
				
					
						
							
							
								 
								mbyt
							
						 
						
							 
							
							
							
							
								
							
							
								d1c725078a 
								
							 
						 
						
							
							
								
								Allow to skip unittests if --pdb active  
							
							 
							
							... 
							
							
							
							closes  #2137  
							
						 
						
							2017-01-31 04:47:31 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								3b47cb45e6 
								
							 
						 
						
							
							
								
								Merge pull request  #2222  from RonnyPfannschmidt/features  
							
							 
							
							... 
							
							
							
							merge master into features 
							
						 
						
							2017-01-26 13:48:10 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								713bdc1f9f 
								
							 
						 
						
							
							
								
								merge master into features  
							
							 
							
							
							
						 
						
							2017-01-26 12:00:52 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								c9f327dc87 
								
							 
						 
						
							
							
								
								bump version to next dev  
							
							 
							
							
							
						 
						
							2017-01-22 22:21:08 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								01eaf9db51 
								
							 
						 
						
							
							
								
								fix the xfail docstring typo at the actual docstring + regendoc  
							
							 
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								55f21bd2b9 
								
							 
						 
						
							
							
								
								bump version  
							
							 
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
						
					 
				
					
						
							
							
								 
								Ravi Chandra
							
						 
						
							 
							
							
							
							
								
							
							
								0e58c3fa80 
								
							 
						 
						
							
							
								
								updates for PR review  #2198  
							
							 
							
							
							
						 
						
							2017-01-21 16:47:49 +13:00  
						
					 
				
					
						
							
							
								 
								Ravi Chandra
							
						 
						
							 
							
							
							
							
								
							
							
								c848d0a771 
								
							 
						 
						
							
							
								
								Pass parameter name to `make_parametrize_id` hook function  
							
							 
							
							
							
						 
						
							2017-01-21 16:46:45 +13:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								15a3b57ec7 
								
							 
						 
						
							
							
								
								Merge pull request  #2120  from RonnyPfannschmidt/fix-2118  
							
							 
							
							... 
							
							
							
							fix  #2118  - rework Node._getcustomclass and Node compat properties 
							
						 
						
							2017-01-20 14:38:55 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								7b4afd8946 
								
							 
						 
						
							
							
								
								remove unused import  
							
							 
							
							
							
						 
						
							2017-01-20 12:09:49 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3766060893 
								
							 
						 
						
							
							
								
								Merge branch 'master' into trial-envs  
							
							 
							
							
							
						 
						
							2017-01-20 08:37:34 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								4082f4024a 
								
							 
						 
						
							
							
								
								comment out compatproperty deprecations  
							
							 
							
							... 
							
							
							
							todo: reenable in the features branch 
							
						 
						
							2017-01-20 11:25:48 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								e0c48b4fe7 
								
							 
						 
						
							
							
								
								Merge pull request  #2212  from nicoddemus/pytester-rewrite  
							
							 
							
							... 
							
							
							
							Assert statements of the pytester plugin again benefit from assertion rewriting
fixes  #1920  
							
						 
						
							2017-01-20 10:04:12 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7b4368f3f4 
								
							 
						 
						
							
							
								
								Merge pull request  #2184  from eli-b/parseoutcomes-explicit-failure  
							
							 
							
							... 
							
							
							
							Fail assert_outcomes() on missing terminal report 
							
						 
						
							2017-01-19 21:38:54 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								c477f09177 
								
							 
						 
						
							
							
								
								Assert statements of the pytester plugin again benefit from assertion rewriting  
							
							 
							
							... 
							
							
							
							Fix  #1920  
							
						 
						
							2017-01-19 21:33:51 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								2574da8d32 
								
							 
						 
						
							
							
								
								Fix pytester internal plugin to work correctly with latest versions of zope.interface  
							
							 
							
							... 
							
							
							
							Fix  #1989  
							
						 
						
							2017-01-19 20:53:35 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								250597d468 
								
							 
						 
						
							
							
								
								get_real_func: use saferepr when formatting the error message  
							
							 
							
							
							
						 
						
							2017-01-19 13:05:58 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								123289a88e 
								
							 
						 
						
							
							
								
								fixes   #2208  by introducing a iteration limit  
							
							 
							
							
							
						 
						
							2017-01-19 11:38:15 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7cd7c283dd 
								
							 
						 
						
							
							
								
								Refactor plugin specs handling into an isolated function  
							
							 
							
							
							
						 
						
							2017-01-12 14:31:35 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								043aadeaf2 
								
							 
						 
						
							
							
								
								Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite  
							
							 
							
							... 
							
							
							
							Fix  #2185  
							
						 
						
							2017-01-11 17:15:16 -02:00  
						
					 
				
					
						
							
							
								 
								Eli Boyarski
							
						 
						
							 
							
							
							
							
								
							
							
								e18b2a427a 
								
							 
						 
						
							
							
								
								Fail assert_outcomes() on missing terminal report  
							
							 
							
							... 
							
							
							
							Currently if the terminal report of testdir.runpytest() is missing,
assert_outcomes() on its output fails because parseoutcomes()
returns an unexpected value (None).
It's better to fail parseoutcomes() directly. 
							
						 
						
							2017-01-11 17:09:37 +02:00  
						
					 
				
					
						
							
							
								 
								mandeep
							
						 
						
							 
							
							
							
							
								
							
							
								d4afa1554b 
								
							 
						 
						
							
							
								
								Refactored old style classes to new style classes  
							
							 
							
							
							
						 
						
							2017-01-08 22:52:42 -06:00  
						
					 
				
					
						
							
							
								 
								Jeff Widman
							
						 
						
							 
							
							
							
							
								
							
							
								6d81c684cc 
								
							 
						 
						
							
							
								
								Switch monkeypatch fixture to yield syntax  
							
							 
							
							
							
						 
						
							2017-01-04 15:06:52 -08:00  
						
					 
				
					
						
							
							
								 
								Loïc Estève
							
						 
						
							 
							
							
							
							
								
							
							
								9e9547a9e4 
								
							 
						 
						
							
							
								
								Simplify condition  
							
							 
							
							
							
						 
						
							2017-01-03 10:57:19 -02:00  
						
					 
				
					
						
							
							
								 
								Loïc Estève
							
						 
						
							 
							
							
							
							
								
							
							
								6fd0394c63 
								
							 
						 
						
							
							
								
								pytest.warns checks for subclass relationship  
							
							 
							
							... 
							
							
							
							rather than class equality. This makes it more similar to
pytest.raises. 
							
						 
						
							2017-01-03 10:57:19 -02:00  
						
					 
				
					
						
							
							
								 
								Barney Gale
							
						 
						
							 
							
							
							
							
								
							
							
								3d18c9c1c6 
								
							 
						 
						
							
							
								
								'xfail' markers without a condition no longer rely on the underlying `Item`  
							
							 
							
							... 
							
							
							
							deriving from `PyobjMixin` 
							
						 
						
							2017-01-02 22:01:04 +00:00  
						
					 
				
					
						
							
							
								 
								Rafael Bertoldi
							
						 
						
							 
							
							
							
							
								
							
							
								a9193a1531 
								
							 
						 
						
							
							
								
								No longer silently ignore errors in parametrize callable ids  
							
							 
							
							
							
						 
						
							2017-01-02 17:26:17 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								402fbe503a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2016-12-27 23:31:26 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								091148f843 
								
							 
						 
						
							
							
								
								Merge pull request  #2136  from hroncok/i2132  
							
							 
							
							... 
							
							
							
							Tests: Check for ModuleNotFoundError on Python 3.6+ 
							
						 
						
							2016-12-27 23:10:58 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								718f0b0255 
								
							 
						 
						
							
							
								
								Merge pull request  #2130  from malinoff/fix-2129  
							
							 
							
							... 
							
							
							
							Use inspect to properly detect generators. Fixes  #2129  
							
						 
						
							2016-12-27 22:11:46 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								515fb09995 
								
							 
						 
						
							
							
								
								Move module error compatibility code to _pytest.compat  
							
							 
							
							
							
						 
						
							2016-12-27 22:01:22 -02:00  
						
					 
				
					
						
							
							
								 
								Andreas Pelme
							
						 
						
							 
							
							
							
							
								
							
							
								0bb8a4a36d 
								
							 
						 
						
							
							
								
								Fixed   #2148  - parse directory names properly when args contains ::.  
							
							 
							
							... 
							
							
							
							This commit also improves readbility in get_dirs_from_args by using self
documenting local functions.
get_dirs_from_args also now only returns directories that actually exists,
and not files to avoid confusion.
This commit also removes redundant checks in get_common_ancestor that
was already performed in get_dirs_from_args.. 
							
						 
						
							2016-12-27 15:28:56 +01:00  
						
					 
				
					
						
							
							
								 
								Loïc Estève
							
						 
						
							 
							
							
							
							
								
							
							
								c5f0b751f4 
								
							 
						 
						
							
							
								
								Improve error message when pytest.warns fail  
							
							 
							
							... 
							
							
							
							The error message contains the expected type of warnings and the
warnings that were captured. Add tests. 
							
						 
						
							2016-12-20 13:45:39 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								caee5ce489 
								
							 
						 
						
							
							
								
								Avoid importing asyncio directly because that in turn initializes logging ( #8 )  
							
							 
							
							
							
						 
						
							2016-12-13 21:54:20 -02:00  
						
					 
				
					
						
							
							
								 
								Dmitry Malinovsky
							
						 
						
							 
							
							
							
							
								
							
							
								3a59acf69f 
								
							 
						 
						
							
							
								
								Use inspect to properly detect generators.  Fixes   #2129  
							
							 
							
							
							
						 
						
							2016-12-11 21:59:11 +06:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								9c285dfc1d 
								
							 
						 
						
							
							
								
								fix   #2118  - rework Node._getcustomclass and Node compat properties  
							
							 
							
							
							
						 
						
							2016-12-06 09:13:25 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3a0a1d2de3 
								
							 
						 
						
							
							
								
								Bump version to 3.0.6.dev0  
							
							 
							
							
							
						 
						
							2016-12-05 12:51:00 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								0febd855e1 
								
							 
						 
						
							
							
								
								Bump version to 3.0.5  
							
							 
							
							
							
						 
						
							2016-12-05 10:06:58 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								57c4489916 
								
							 
						 
						
							
							
								
								Use a simple ``+-`` ASCII string in the string representation of pytest.approx In Python 2  
							
							 
							
							... 
							
							
							
							Fix  #2111  
							
						 
						
							2016-12-02 20:01:53 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7480342710 
								
							 
						 
						
							
							
								
								Fix typo in docstring of register_assert_rewrite  
							
							 
							
							
							
						 
						
							2016-12-02 09:22:47 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								81528ea81f 
								
							 
						 
						
							
							
								
								Remove hook proxy cache  
							
							 
							
							... 
							
							
							
							Fix  #2016  
							
						 
						
							2016-12-02 07:32:11 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								bc0f7e6243 
								
							 
						 
						
							
							
								
								Fix false-positive assert rewrite warnings when using 'pytest_plugins'  
							
							 
							
							... 
							
							
							
							pytest would emit false positive warnings about assertion-rewrite when a
module appears multiple times in plugins which depend
on other plugins using the 'pytest_plugins' mechanism 
							
						 
						
							2016-12-01 15:50:08 -02:00  
						
					 
				
					
						
							
							
								 
								Luke Murphy
							
						 
						
							 
							
							
							
							
								
							
							
								c856537e71 
								
							 
						 
						
							
							
								
								Add warning for incorrect passing args to `-o`.  
							
							 
							
							
							
						 
						
							2016-12-01 13:20:42 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								30f0152ae6 
								
							 
						 
						
							
							
								
								Remove unused import  
							
							 
							
							
							
						 
						
							2016-11-30 22:34:02 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f8d195253e 
								
							 
						 
						
							
							
								
								Remove support code for earlier Python 3 version in Source.compile  
							
							 
							
							... 
							
							
							
							This code leaves None in sys.modules as a side effect but is no longer needed in the Python 3 versions we support.
Fix  #2103  
							
						 
						
							2016-11-30 22:23:02 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								669332b7e0 
								
							 
						 
						
							
							
								
								Merge pull request  #2101  from wheerd/doctest-encoding  
							
							 
							
							... 
							
							
							
							Added doctest encoding command line option 
							
						 
						
							2016-11-30 17:43:42 -02:00  
						
					 
				
					
						
							
							
								 
								Luke Murphy
							
						 
						
							 
							
							
							
							
								
							
							
								f5afd8cb54 
								
							 
						 
						
							
							
								
								Add missing `__test__` check for test discovery.  
							
							 
							
							
							
						 
						
							2016-11-30 17:05:42 +01:00  
						
					 
				
					
						
							
							
								 
								Manuel Krebber
							
						 
						
							 
							
							
							
							
								
							
							
								c043bbb854 
								
							 
						 
						
							
							
								
								Changed the doctest_encoding option to an ini option.  
							
							 
							
							... 
							
							
							
							Parametrized the tests for it. 
							
						 
						
							2016-11-30 11:43:33 +01:00  
						
					 
				
					
						
							
							
								 
								Manuel Krebber
							
						 
						
							 
							
							
							
							
								
							
							
								d254c6b0ae 
								
							 
						 
						
							
							
								
								Added some tests for --docstring-encoding option. Added option to specify encoding for internal testdir._makefile() for the tests.  
							
							 
							
							
							
						 
						
							2016-11-29 12:29:16 +01:00  
						
					 
				
					
						
							
							
								 
								Manuel Krebber
							
						 
						
							 
							
							
							
							
								
							
							
								ed977513ec 
								
							 
						 
						
							
							
								
								Added a console option to specify the encoding to use for doctest files. Defaults to UTF-8.  
							
							 
							
							
							
						 
						
							2016-11-29 12:29:14 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								8b4da9d955 
								
							 
						 
						
							
							
								
								Merge pull request  #2100  from blueyed/fix-help-grammar  
							
							 
							
							... 
							
							
							
							minor: fix grammar with help for --setup-{only,show} 
							
						 
						
							2016-11-28 20:11:56 -02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								40cffacadc 
								
							 
						 
						
							
							
								
								minor: fix grammar with help for --setup-{only,show}  
							
							 
							
							
							
						 
						
							2016-11-28 21:33:15 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Murphy
							
						 
						
							 
							
							
							
							
								
							
							
								4e1609b12e 
								
							 
						 
						
							
							
								
								Add `type` validation.  
							
							 
							
							... 
							
							
							
							Argparse driven argument type validation is added for the
`--junit-xml` and `--confcutdir` arguments.
The commit partially reverts #2080 . Closes  #2089 . 
							
						 
						
							2016-11-28 02:16:01 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								b30a6d22c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2016-11-27 17:30:40 -02:00  
						
					 
				
					
						
							
							
								 
								nmundar
							
						 
						
							 
							
							
							
							
								
							
							
								0a30f072e6 
								
							 
						 
						
							
							
								
								Show name argment in compatproperty deprecation message  
							
							 
							
							
							
						 
						
							2016-11-27 14:24:55 -02:00  
						
					 
				
					
						
							
							
								 
								nmundar
							
						 
						
							 
							
							
							
							
								
							
							
								b38fad4b82 
								
							 
						 
						
							
							
								
								Add compatproperty deprecation warning.  
							
							 
							
							
							
						 
						
							2016-11-27 14:24:55 -02:00  
						
					 
				
					
						
							
							
								 
								Duncan Betts
							
						 
						
							 
							
							
							
							
								
							
							
								c1b83cdeea 
								
							 
						 
						
							
							
								
								Add hint of Issue  #478  to error text  
							
							 
							
							
							
						 
						
							2016-11-26 10:47:15 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								33c0b06fdf 
								
							 
						 
						
							
							
								
								Fix error in approx's repr with complex numbers  
							
							 
							
							... 
							
							
							
							Fix  #2082  
							
						 
						
							2016-11-24 15:33:12 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								629d8e9fd6 
								
							 
						 
						
							
							
								
								Show an error if --confcutdir is not a valid directory  
							
							 
							
							... 
							
							
							
							Fixes  #2078  
							
						 
						
							2016-11-23 09:49:11 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								a5b5090c72 
								
							 
						 
						
							
							
								
								Merge pull request  #2070  from nedbat/bug2038  
							
							 
							
							... 
							
							
							
							Don't fail if imp can't find the source for a .pyc file. #2038  
							
						 
						
							2016-11-22 17:45:29 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								bd343ef757 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							 
							
							
							
						 
						
							2016-11-22 14:35:39 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								a3319ffe80 
								
							 
						 
						
							
							
								
								Merge pull request  #2071  from nicoddemus/fix-flake8  
							
							 
							
							... 
							
							
							
							Fix flake8 E305 and E306 errors 
							
						 
						
							2016-11-22 13:22:11 +01:00  
						
					 
				
					
						
							
							
								 
								Ned Batchelder
							
						 
						
							 
							
							
							
							
								
							
							
								632c4d5daf 
								
							 
						 
						
							
							
								
								Remove an accidental double space  
							
							 
							
							
							
						 
						
							2016-11-21 10:17:23 -05:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								26ca5a702e 
								
							 
						 
						
							
							
								
								Add tests and integrated the original code into the core  
							
							 
							
							
							
						 
						
							2016-11-21 08:26:43 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1da1906483 
								
							 
						 
						
							
							
								
								Rename code to _pytest.warnings and delete old files from the repository  
							
							 
							
							
							
						 
						
							2016-11-21 07:38:12 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Ned Batchelder
							
						 
						
							 
							
							
							
							
								
							
							
								06bb61bbe3 
								
							 
						 
						
							
							
								
								Don't fail if imp can't find the source for a .pyc file.  #2038  
							
							 
							
							
							
						 
						
							2016-11-20 13:09:32 -05:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								6876ba9ba6 
								
							 
						 
						
							
							
								
								Merge pull request  #1995  from mattduck/feat/restructure-assert-truncation  
							
							 
							
							... 
							
							
							
							Restructure truncation of assertion messages 
							
						 
						
							2016-11-13 19:07:35 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								efc54b2e56 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-features  
							
							 
							
							
							
						 
						
							2016-11-11 18:56:53 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3e01e83390 
								
							 
						 
						
							
							
								
								Bump version to 3.0.5.dev  
							
							 
							
							
							
						 
						
							2016-11-11 18:20:34 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ff72db2f1a 
								
							 
						 
						
							
							
								
								Version bump to 3.0.4, CHANGELOG, announcement  
							
							 
							
							
							
						 
						
							2016-11-09 19:38:11 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Michael Seifert
							
						 
						
							 
							
							
							
							
								
							
							
								1e5b21cd61 
								
							 
						 
						
							
							
								
								Fix memory leak with pytest.raises by using weakref  
							
							 
							
							
							
						 
						
							2016-11-08 22:12:23 -02:00  
						
					 
				
					
						
							
							
								 
								Dan Wandschneider
							
						 
						
							 
							
							
							
							
								
							
							
								e46e653794 
								
							 
						 
						
							
							
								
								Clean up unittest TestCase objects after tests are complete ( #1649 ).  
							
							 
							
							... 
							
							
							
							Fix  #1649 
Users of unittest style TestCases will create expensive objects
in setUp. We should clean up TestCase instances that are lying
around so that they don't fill up memory. 
							
						 
						
							2016-11-07 18:32:56 -08:00  
						
					 
				
					
						
							
							
								 
								Manuel Jacob
							
						 
						
							 
							
							
							
							
								
							
							
								a190ad27f2 
								
							 
						 
						
							
							
								
								Change version to be in normal form according to PEP 440.  
							
							 
							
							... 
							
							
							
							The version is changed from 3.0.4.dev to 3.0.4.dev0.  Note that
according to PEP 440 these are considered equivalent, but 3.0.4.dev0 is
the normal form.
This standard was followed when the version was set to 3.0.3.dev0 in
commit ee284ec5 , but in commit a87b1c79  the version was set to
3.0.4.dev, leaving the development number implicit again. 
							
						 
						
							2016-11-06 09:00:04 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								006a901b86 
								
							 
						 
						
							
							
								
								Properly handle exceptions in multiprocessing tasks  
							
							 
							
							... 
							
							
							
							Fix  #1984  
							
						 
						
							2016-11-03 10:48:43 -02:00  
						
					 
				
					
						
							
							
								 
								Georgy Dyuldin
							
						 
						
							 
							
							
							
							
								
							
							
								e2bb4f893b 
								
							 
						 
						
							
							
								
								Fix teardown error message in generated xUnit XML  
							
							 
							
							... 
							
							
							
							It was "test setup failure" even error happens on test teardown. 
							
						 
						
							2016-11-02 15:50:32 +03:00  
						
					 
				
					
						
							
							
								 
								Mathieu Clabaut
							
						 
						
							 
							
							
							
							
								
							
							
								6f93ffb5d4 
								
							 
						 
						
							
							
								
								Report teardown output on test failure  
							
							 
							
							... 
							
							
							
							Until now, teardown stdout/stderr output was not reported upon test failure.
However such output is sometime necessary to understand the failure.
fix  #442  
							
						 
						
							2016-10-30 09:52:46 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								e9668d75b8 
								
							 
						 
						
							
							
								
								turn RecordedWarning into a namedtuple  
							
							 
							
							... 
							
							
							
							fixes  #2013  
							
						 
						
							2016-10-24 15:23:53 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								377e649e61 
								
							 
						 
						
							
							
								
								local merge of  #1967  - Change exception raised by capture.DontReadFromInput.fileno()  
							
							 
							
							
							
						 
						
							2016-10-24 12:47:55 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								35d154f580 
								
							 
						 
						
							
							
								
								Merge pull request  #2011  from nicoddemus/false-rewrite-warnings  
							
							 
							
							... 
							
							
							
							Fix false-positive warnings from assertion rewrite hook 
							
						 
						
							2016-10-24 12:19:23 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								4e9c633185 
								
							 
						 
						
							
							
								
								Merge pull request  #2021  from nicoddemus/doctest-modules-ci  
							
							 
							
							... 
							
							
							
							Re-enable docstring testing of _pytest modules on CI 
							
						 
						
							2016-10-24 12:19:05 +02:00  
						
					 
				
					
						
							
							
								 
								Jason R. Coombs
							
						 
						
							 
							
							
							
							
								
							
							
								f2c01c5407 
								
							 
						 
						
							
							
								
								Restore pexpect tests and bypass isalive/wait on macOS. Ref  #2022 .  
							
							 
							
							
							
						 
						
							2016-10-21 12:36:42 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9d00615bbf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2016-10-20 21:51:42 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								2a2b8cee09 
								
							 
						 
						
							
							
								
								Fix false-positive warnings from assertion rewrite hook  
							
							 
							
							... 
							
							
							
							Fix  #2005  
							
						 
						
							2016-10-20 21:40:57 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								620b384b69 
								
							 
						 
						
							
							
								
								Fix cmdline help message for custom options with two or more metavars  
							
							 
							
							... 
							
							
							
							Fix  #2004  
							
						 
						
							2016-10-20 20:34:39 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								78eec0d7f8 
								
							 
						 
						
							
							
								
								Handle import errors with non-ascii messages when importing plugins  
							
							 
							
							... 
							
							
							
							Fix  #1998  
							
						 
						
							2016-10-12 18:19:32 -03:00  
						
					 
				
					
						
							
							
								 
								Matthew Duck
							
						 
						
							 
							
							
							
							
								
							
							
								0061d9bd3d 
								
							 
						 
						
							
							
								
								Fix flake8 (unused import, trailng whitespace)  
							
							 
							
							
							
						 
						
							2016-10-11 00:17:15 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Duck
							
						 
						
							 
							
							
							
							
								
							
							
								b629da424e 
								
							 
						 
						
							
							
								
								Restructure truncation of assertion messages  
							
							 
							
							... 
							
							
							
							This addresses ref https://github.com/pytest-dev/pytest/issues/1954 .
The current truncation for assertion explanations does not deal with long lines
properly:
- Previously if lines were too long it would display a "-n more lines"
  message.
- 999e7c6541  introduced a bug where long lines can
  cause index errors if there are < 10 lines.
Extract the truncation logic into its own file and ensure it can deal with
long lines properly. 
							
						 
						
							2016-10-10 23:38:27 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								cf13355d3f 
								
							 
						 
						
							
							
								
								Merge pull request  #1979  from nicoddemus/show-traceback-during-collection  
							
							 
							
							... 
							
							
							
							Show traceback during collection 
							
						 
						
							2016-10-05 16:18:43 -03:00  
						
					 
				
					
						
							
							
								 
								Tom V
							
						 
						
							 
							
							
							
							
								
							
							
								c93a9e3361 
								
							 
						 
						
							
							
								
								Fix   #1981 , improve ini-options help text  
							
							 
							
							
							
						 
						
							2016-10-04 14:41:09 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7d66e4eae1 
								
							 
						 
						
							
							
								
								Display full traceback from Import errors when collecting test modules  
							
							 
							
							... 
							
							
							
							Fix  #1976  
							
						 
						
							2016-10-03 20:47:44 -03:00  
						
					 
				
					
						
							
							
								 
								Nikolaus Rath
							
						 
						
							 
							
							
							
							
								
							
							
								57bb3c6922 
								
							 
						 
						
							
							
								
								Improve error message when using pytest.skip at module level  
							
							 
							
							... 
							
							
							
							As discussed in issue #1959 . 
							
						 
						
							2016-10-01 13:38:52 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4667b4decc 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							 
							
							
							
						 
						
							2016-09-29 19:03:26 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a87b1c79c1 
								
							 
						 
						
							
							
								
								post 3.0.3 release changes  
							
							 
							
							
							
						 
						
							2016-09-29 18:58:17 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								dda17994ec 
								
							 
						 
						
							
							
								
								Prepare for 3.0.3 release  
							
							 
							
							
							
						 
						
							2016-09-28 16:33:38 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								654af0ba25 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							 
							
							
							
						 
						
							2016-09-26 19:32:53 -03:00  
						
					 
				
					
						
							
							
								 
								Vlad Dragos
							
						 
						
							 
							
							
							
							
								
							
							
								3444796f3e 
								
							 
						 
						
							
							
								
								Fix formating error.  
							
							 
							
							
							
						 
						
							2016-09-26 13:59:28 +03:00  
						
					 
				
					
						
							
							
								 
								Vlad Dragos
							
						 
						
							 
							
							
							
							
								
							
							
								8985c0be3e 
								
							 
						 
						
							
							
								
								Change exception raised by DontReadFromInput.fileno() from ValueError to io.UnsupportedOperation  
							
							 
							
							
							
						 
						
							2016-09-26 13:15:35 +03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								835328d862 
								
							 
						 
						
							
							
								
								Vendor pluggy 0.4.0  
							
							 
							
							... 
							
							
							
							Fix  #1637  
							
						 
						
							2016-09-25 23:36:02 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5e96edd435 
								
							 
						 
						
							
							
								
								Merge pull request  #1952  from davidszotten/pdbcls_without_pdb_on_fail  
							
							 
							
							... 
							
							
							
							Pdbcls without pdb on fail 
							
						 
						
							2016-09-25 20:24:45 -03:00  
						
					 
				
					
						
							
							
								 
								Roy Williams
							
						 
						
							 
							
							
							
							
								
							
							
								f1c4cfea2c 
								
							 
						 
						
							
							
								
								Remove implementation of `__getslice__`  
							
							 
							
							... 
							
							
							
							`__getslice__` has been Deprecated since Python 2.0 and is removed in Python 3.  See
https://docs.python.org/2/reference/datamodel.html#object.__getslice__ 
Unfortunately, Python 2 will still dispatch to `__getslice__` over `__getitem__`, See
http://bugs.python.org/issue2041 , which causes Warnings when running with `-3` in 2.7. 
							
						 
						
							2016-09-23 09:52:30 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Roy Williams
							
						 
						
							 
							
							
							
							
								
							
							
								24db3c123d 
								
							 
						 
						
							
							
								
								Explicitly set  to None to have consistent behavior in Python 2 and Python 3  
							
							 
							
							
							
						 
						
							2016-09-22 09:22:12 -07:00  
						
					 
				
					
						
							
							
								 
								Roy Williams
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Tyler Goodlet
							
						 
						
							 
							
							
							
							
								
							
							
								6db2f315fa 
								
							 
						 
						
							
							
								
								Explain a bad scope value to the user  
							
							 
							
							
							
						 
						
							2016-09-21 16:40:58 -04:00  
						
					 
				
					
						
							
							
								 
								David Szotten
							
						 
						
							 
							
							
							
							
								
							
							
								0ac85218d1 
								
							 
						 
						
							
							
								
								allow pdbcls without implying usepdb  
							
							 
							
							
							
						 
						
							2016-09-21 09:45:20 +00:00  
						
					 
				
					
						
							
							
								 
								Lev Maximov
							
						 
						
							 
							
							
							
							
								
							
							
								65be1231b1 
								
							 
						 
						
							
							
								
								AttributeError chaining bug  #1944  fix  
							
							 
							
							
							
						 
						
							2016-09-20 02:20:13 +07:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								887c097f8e 
								
							 
						 
						
							
							
								
								Merge pull request  #1951  from mattduck/feat/1512-dict-compare-output  
							
							 
							
							... 
							
							
							
							Feat/1512 dict compare output 
							
						 
						
							2016-09-19 17:34:09 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								01db0f1cd1 
								
							 
						 
						
							
							
								
								Merge pull request  #1923  from RonnyPfannschmidt/mark-internal-value  
							
							 
							
							... 
							
							
							
							use consistent inner repressentation for marks 
							
						 
						
							2016-09-19 15:30:22 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Duck
							
						 
						
							 
							
							
							
							
								
							
							
								999e7c6541 
								
							 
						 
						
							
							
								
								Tidy formatting of assertion truncation  
							
							 
							
							... 
							
							
							
							Part two of https://github.com/pytest-dev/pytest/issues/1512 . Update the format
of the truncation message to help make it clear that pytest truncates the
entire assertion output when verbosity < 2. 
							
						 
						
							2016-09-19 15:27:38 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Duck
							
						 
						
							 
							
							
							
							
								
							
							
								dd64d823b9 
								
							 
						 
						
							
							
								
								Don't display dict common items if verbosity=1  
							
							 
							
							... 
							
							
							
							Part one of https://github.com/pytest-dev/pytest/issues/1512 .
If verbosity=1, assertion explanations are truncated at 10 lines. In this
situation, it's more important to tell the user which dictionary items are
different than which are the same. 
							
						 
						
							2016-09-19 15:27:28 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								dc16fe2bb9 
								
							 
						 
						
							
							
								
								Merge junit-xml url attribute branch  
							
							 
							
							... 
							
							
							
							Merge branch 'url_attr' of https://github.com/fushi/pytest  into junitxml-url 
							
						 
						
							2016-09-19 12:57:05 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								5b260d80f9 
								
							 
						 
						
							
							
								
								Merge pull request  #1883  from RonnyPfannschmidt/kill-memoized-call  
							
							 
							
							... 
							
							
							
							Kill memoized call 
							
						 
						
							2016-09-19 12:47:52 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								f484e7c9ca 
								
							 
						 
						
							
							
								
								Merge pkg_resources workaround  
							
							 
							
							... 
							
							
							
							Merge branch 'pkg_resources_bugfix' of github.com:raquel-ucl/pytest into pkg-resources
This is an odd case and doesn't really make sense, it is working around a bug
in maven/jython and the old version or weird packaging of setuptools they use.
But we used to do this in the past so might as well keep doing this. 
							
						 
						
							2016-09-19 10:14:41 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								04cf5e1df4 
								
							 
						 
						
							
							
								
								Fixed assertion rewriting for plugins in development mode  
							
							 
							
							... 
							
							
							
							Fix  #1934  
							
						 
						
							2016-09-14 21:59:33 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								45524241a5 
								
							 
						 
						
							
							
								
								mark: fix introduced linting error  
							
							 
							
							
							
						 
						
							2016-09-08 10:16:45 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								1812387bf0 
								
							 
						 
						
							
							
								
								Mark: fix python 3 compatibility  
							
							 
							
							
							
						 
						
							2016-09-08 10:03:45 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								10094a3f09 
								
							 
						 
						
							
							
								
								use consistent inner repressentation for marks  
							
							 
							
							
							
						 
						
							2016-09-08 09:52:22 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								1c9bd9278e 
								
							 
						 
						
							
							
								
								Merge pull request  #1913  from flub/builtin-assertion  
							
							 
							
							... 
							
							
							
							Remove BuiltinAssertionError 
							
						 
						
							2016-09-05 16:53:13 +02:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								8a41b26f56 
								
							 
						 
						
							
							
								
								Merge pull request  #1908  from nicoddemus/parametrize-unicode-id  
							
							 
							
							... 
							
							
							
							The "ids" argument to "parametrize" again accepts unicode strings in Python 2 
							
						 
						
							2016-09-05 15:09:12 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								e1674f60e7 
								
							 
						 
						
							
							
								
								remove memocollect anmd memoized_call  
							
							 
							
							
							
						 
						
							2016-09-05 14:41:28 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								e572c16d3f 
								
							 
						 
						
							
							
								
								remove memoizedcall in Module  
							
							 
							
							
							
						 
						
							2016-09-05 14:41:28 +02:00  
						
					 
				
					
						
							
							
								 
								Huayi Zhang
							
						 
						
							 
							
							
							
							
								
							
							
								c60854474a 
								
							 
						 
						
							
							
								
								Fix keyword docs  
							
							 
							
							
							
						 
						
							2016-09-05 16:48:04 +08:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1e10de574d 
								
							 
						 
						
							
							
								
								The "ids" argument to "parametrize" again accepts unicode strings in Python 2  
							
							 
							
							... 
							
							
							
							Fixes  #1905  
							
						 
						
							2016-09-02 18:38:15 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f5d900d972 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							 
							
							
							
						 
						
							2016-09-01 23:07:49 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ee284ec587 
								
							 
						 
						
							
							
								
								Set version to 3.0.3.dev0  
							
							 
							
							... 
							
							
							
							Also, using "dev0" as development suffix otherwise distutils gives a warning during "setup.py develop":
UserWarning: Normalizing '3.0.3.dev' to '3.0.3.dev0'
  normalized_version, 
							
						 
						
							2016-09-01 21:34:54 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4e58c9a7d0 
								
							 
						 
						
							
							
								
								Fix use of deprecated getfuncargvalue method in the internal doctest plugin  
							
							 
							
							... 
							
							
							
							Fix  #1898  
							
						 
						
							2016-09-01 07:19:11 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4c45b93007 
								
							 
						 
						
							
							
								
								Changes for 3.0.2 release  
							
							 
							
							
							
						 
						
							2016-08-31 20:28:38 -04:00  
						
					 
				
					
						
							
							
								 
								mbyt
							
						 
						
							 
							
							
							
							
								
							
							
								696a9112be 
								
							 
						 
						
							
							
								
								integrating review commets of @nicoddemus  
							
							 
							
							... 
							
							
							
							plus small scale refactoring 
							
						 
						
							2016-08-31 22:33:47 +02:00