125e89b7f8 
								
							 
						 
						
							
							
								
								Merge pull request  #2194  from rjprins/remove-reinterp-from-docs  
							
							... 
							
							
							
							Remove mention of --assert=reinterp in documentation 
							
						 
						
							2017-01-14 14:58:50 +01:00  
				
					
						
							
							
								 
						
							
								46a9861d29 
								
							 
						 
						
							
							
								
								Remove mention of --assert=reinterp in documentation  
							
							... 
							
							
							
							Related to #1940  
							
						 
						
							2017-01-13 22:35:37 +01:00  
				
					
						
							
							
								 
						
							
								3dfdbaf490 
								
							 
						 
						
							
							
								
								Merge pull request  #2186  from nicoddemus/pytest-plugins-env-rewrite  
							
							... 
							
							
							
							Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite 
							
						 
						
							2017-01-12 23:29:58 -02:00  
				
					
						
							
							
								 
						
							
								7cd7c283dd 
								
							 
						 
						
							
							
								
								Refactor plugin specs handling into an isolated function  
							
							
							
						 
						
							2017-01-12 14:31:35 -02:00  
				
					
						
							
							
								 
						
							
								043aadeaf2 
								
							 
						 
						
							
							
								
								Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite  
							
							... 
							
							
							
							Fix  #2185  
						
							2017-01-11 17:15:16 -02:00  
				
					
						
							
							
								 
						
							
								ff309b3584 
								
							 
						 
						
							
							
								
								Merge pull request  #2182  from pombredanne/patch-1  
							
							... 
							
							
							
							Ensure the LICENSE is included in built wheels 
							
						 
						
							2017-01-10 21:44:43 +01:00  
				
					
						
							
							
								 
						
							
								aa82db9fe2 
								
							 
						 
						
							
							
								
								Ensure the LICENSE is included in built wheels  
							
							... 
							
							
							
							Otherwise it is not included by default as wheels do not honor the MANIFEST.in
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com> 
							
						 
						
							2017-01-10 19:25:57 +01:00  
				
					
						
							
							
								 
						
							
								64cb67b703 
								
							 
						 
						
							
							
								
								Merge pull request  #2174  from nicoddemus/appveyor-py36  
							
							... 
							
							
							
							Test py36 on AppVeyor 
							
						 
						
							2017-01-05 22:35:20 -02:00  
				
					
						
							
							
								 
						
							
								7559400183 
								
							 
						 
						
							
							
								
								Add py36 to test on AppVeyor  
							
							... 
							
							
							
							Fix  #2134  
						
							2017-01-05 19:18:03 -02:00  
				
					
						
							
							
								 
						
							
								9477f598d8 
								
							 
						 
						
							
							
								
								Merge pull request  #2173  from jeffwidman/patch-1  
							
							... 
							
							
							
							Switch monkeypatch fixture to yield syntax 
							
						 
						
							2017-01-04 23:17:30 -02:00  
				
					
						
							
							
								 
						
							
								6d81c684cc 
								
							 
						 
						
							
							
								
								Switch monkeypatch fixture to yield syntax  
							
							
							
						 
						
							2017-01-04 15:06:52 -08:00  
				
					
						
							
							
								 
						
							
								b769e41d8f 
								
							 
						 
						
							
							
								
								Merge pull request  #2170  from gogoengie/broken-links  
							
							... 
							
							
							
							Fix broken links 
							
						 
						
							2017-01-02 21:57:17 -02:00  
				
					
						
							
							
								 
						
							
								ef903460b1 
								
							 
						 
						
							
							
								
								Fix broken links  
							
							
							
						 
						
							2017-01-02 14:19:49 -08:00  
				
					
						
							
							
								 
						
							
								78f03888f4 
								
							 
						 
						
							
							
								
								Merge pull request  #2168  from jwilk/spelling  
							
							... 
							
							
							
							Fix typos 
							
						 
						
							2017-01-01 20:08:08 -02:00  
				
					
						
							
							
								 
						
							
								03a7a2cd3e 
								
							 
						 
						
							
							
								
								Fix typos  
							
							
							
						 
						
							2016-12-31 19:01:15 +01:00  
				
					
						
							
							
								 
						
							
								7592c5b491 
								
							 
						 
						
							
							
								
								Sort issues and user references in CHANGELOG  
							
							
							
						 
						
							2016-12-27 23:20:34 -02:00  
				
					
						
							
							
								 
						
							
								091148f843 
								
							 
						 
						
							
							
								
								Merge pull request  #2136  from hroncok/i2132  
							
							... 
							
							
							
							Tests: Check for ModuleNotFoundError on Python 3.6+ 
							
						 
						
							2016-12-27 23:10:58 -02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								b4295aa19e 
								
							 
						 
						
							
							
								
								Merge pull request  #2144  from sscherfke/patch-1  
							
							... 
							
							
							
							Explicitly add setuptools to install_requires 
							
						 
						
							2016-12-27 22:08:39 -02:00  
				
					
						
							
							
								 
						
							
								7d259401cd 
								
							 
						 
						
							
							
								
								Merge pull request  #2161  from nicoddemus/silence-trial-on-ci  
							
							... 
							
							
							
							Allow trial environments to fail on CI for now 
							
						 
						
							2016-12-27 22:04:50 -02:00  
				
					
						
							
							
								 
						
							
								515fb09995 
								
							 
						 
						
							
							
								
								Move module error compatibility code to _pytest.compat  
							
							
							
						 
						
							2016-12-27 22:01:22 -02:00  
				
					
						
							
							
								 
						
							
								088b742d40 
								
							 
						 
						
							
							
								
								Merge pull request  #2149  from pelme/issue2148  
							
							... 
							
							
							
							Fix handling of ini configuration in subdirs when specifying :: 
							
						 
						
							2016-12-27 21:54:14 -02:00  
				
					
						
							
							
								 
						
							
								6b24ce2a9d 
								
							 
						 
						
							
							
								
								Test Python 3.6 on Travis CI  
							
							... 
							
							
							
							Partial fix for https://github.com/pytest-dev/pytest/issues/2134  
							
						 
						
							2016-12-27 23:16:25 +01:00  
				
					
						
							
							
								 
						
							
								1680eeb3a3 
								
							 
						 
						
							
							
								
								Tests: Check for ModuleNotFoundError on Python 3.6+  
							
							... 
							
							
							
							Those tests originally checked for ImportError. Since Python 3.6
ModuleNotFoundError is raised in this context instead, the tests didn't work
as they are text based (so exception inheritance does not save the day).
Fixes https://github.com/pytest-dev/pytest/issues/2132  
							
						 
						
							2016-12-27 23:15:12 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								f7a1d369c3 
								
							 
						 
						
							
							
								
								Allow trial environments to fail on CI for now  
							
							... 
							
							
							
							While I agree this is *far* from ideal, IMHO It is better to ignore them for now otherwise we hamper contributors with unrelated errors.
We should fix this before the next release.
#1989  
							
						 
						
							2016-12-26 21:47:50 -02:00  
				
					
						
							
							
								 
						
							
								316406291d 
								
							 
						 
						
							
							
								
								Merge pull request  #2150  from lesteve/add-caught-warnings-info-when-warns-fail  
							
							... 
							
							
							
							Improve error message when pytest.warns fail 
							
						 
						
							2016-12-26 21:42:15 -02:00  
				
					
						
							
							
								 
						
							
								a27c824fd0 
								
							 
						 
						
							
							
								
								Merge pull request  #2146  from lwm/minor-docs-fixup  
							
							... 
							
							
							
							Fix fixture/parametrize override example. 
							
						 
						
							2016-12-26 20:13:00 -02:00  
				
					
						
							
							
								 
						
							
								fc74eb332b 
								
							 
						 
						
							
							
								
								Merge pull request  #2128  from nicoddemus/pytest-m  
							
							... 
							
							
							
							Mention that Python also adds CWD to sys.path using python -m 
							
						 
						
							2016-12-26 20:11:59 -02:00  
				
					
						
							
							
								 
						
							
								bfada968d3 
								
							 
						 
						
							
							
								
								Update AUTHORS and CHANGELOG.rst  
							
							... 
							
							
							
							following contribution guidelines 
							
						 
						
							2016-12-20 14:36:10 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								f94189b48b 
								
							 
						 
						
							
							
								
								Fix wrong fixture name.  Closes   #2143 .  
							
							
							
						 
						
							2016-12-20 01:48:32 +01:00  
				
					
						
							
							
								 
						
							
								3f5edc705a 
								
							 
						 
						
							
							
								
								Explicitly add setuptools to install_requires  
							
							... 
							
							
							
							Setuptools is used in `_pytest/config.py` but was not explicitly listed as requirement. This led to an error when creating a Conda package for pytest since setuptools is not necessarily installed by default in Conda envs. 
							
						 
						
							2016-12-19 13:22:25 +01:00  
				
					
						
							
							
								 
						
							
								caee5ce489 
								
							 
						 
						
							
							
								
								Avoid importing asyncio directly because that in turn initializes logging ( #8 )  
							
							
							
						 
						
							2016-12-13 21:54:20 -02:00  
				
					
						
							
							
								 
						
							
								1312b83866 
								
							 
						 
						
							
							
								
								Add CHANGELOG entry for  #2129  
							
							
							
						 
						
							2016-12-13 21:33:01 -02:00  
				
					
						
							
							
								 
						
							
								45eb9b566c 
								
							 
						 
						
							
							
								
								Move compat tests to a single file using testdir  
							
							... 
							
							
							
							This avoids having to resort to skipping modules in conftest.py file and avoids flake8 errors 
							
						 
						
							2016-12-13 21:28:07 -02:00  
				
					
						
							
							
								 
						
							
								3a59acf69f 
								
							 
						 
						
							
							
								
								Use inspect to properly detect generators.  Fixes   #2129  
							
							
							
						 
						
							2016-12-11 21:59:11 +06:00  
				
					
						
							
							
								 
						
							
								81c9bdcd0b 
								
							 
						 
						
							
							
								
								Mention that Python also adds CWD to sys.path using python -m  
							
							
							
						 
						
							2016-12-10 16:55:04 -02:00  
				
					
						
							
							
								 
						
							
								da40bcf97f 
								
							 
						 
						
							
							
								
								Merge pull request  #2119  from nicoddemus/changelog-dates  
							
							... 
							
							
							
							Add release dates to CHANGELOG entries 
							
						 
						
							2016-12-08 19:49:22 -02:00  
				
					
						
							
							
								 
						
							
								a4a30ae4a2 
								
							 
						 
						
							
							
								
								Merge pull request  #2123  from oscarh/documentation-issue-687  
							
							... 
							
							
							
							Also update yield teardown for Issue #687  
							
						 
						
							2016-12-07 12:46:43 -02:00  
				
					
						
							
							
								 
						
							
								f42a954cb3 
								
							 
						 
						
							
							
								
								Also update yield teardown for Issue  #687  
							
							
							
						 
						
							2016-12-07 15:08:38 +01:00  
				
					
						
							
							
								 
						
							
								8afca5d0fa 
								
							 
						 
						
							
							
								
								Add release dates to CHANGELOG entry  
							
							... 
							
							
							
							Fix  #721  
						
							2016-12-05 17:21:01 -02:00  
				
					
						
							
							
								 
						
							
								3a0a1d2de3 
								
							 
						 
						
							
							
								
								Bump version to 3.0.6.dev0  
							
							
							
						 
						
							2016-12-05 12:51:00 -02:00  
				
					
						
							
							
								 
						
							
								6a52afc8c9 
								
							 
						 
						
							
							
								
								Merge pull request  #2116  from nicoddemus/release-3.0.5  
							
							... 
							
							
							
							Release 3.0.5 
							
						 
						
							2016-12-05 12:42:32 -02:00  
				
					
						
							
							
								 
						
							
								f592c7746a 
								
							 
						 
						
							
							
								
								Regendocs for 3.0.5  
							
							
							
						 
						
							2016-12-05 07:22:06 -05:00  
				
					
						
							
							
								 
						
							
								31f114e51f 
								
							 
						 
						
							
							
								
								Add release announcement for 3.0.5  
							
							
							
						 
						
							2016-12-05 10:19:27 -02:00  
				
					
						
							
							
								 
						
							
								833acb9d3c 
								
							 
						 
						
							
							
								
								Finalize CHANGELOG for 3.0.5  
							
							
							
						 
						
							2016-12-05 10:07:37 -02:00  
				
					
						
							
							
								 
						
							
								0febd855e1 
								
							 
						 
						
							
							
								
								Bump version to 3.0.5  
							
							
							
						 
						
							2016-12-05 10:06:58 -02:00  
				
					
						
							
							
								 
						
							
								3c81f83602 
								
							 
						 
						
							
							
								
								Merge pull request  #2113  from nicoddemus/approx-repr-unicode  
							
							... 
							
							
							
							Use a simple ``+-`` ASCII string in the string representation of pytest.approx In Python 2 
							
						 
						
							2016-12-05 13:02:07 +01:00  
				
					
						
							
							
								 
						
							
								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