54a90e9555 
								
							 
						 
						
							
							
								
								docs: Create links for objects to show the api  
							
							
							
						 
						
							2017-06-06 01:10:32 +02:00  
				
					
						
							
							
								 
						
							
								f74f14f038 
								
							 
						 
						
							
							
								
								Fix --help with required options  
							
							... 
							
							
							
							This works by adding an argparse Action that will raise an exception in
order to skip the rest of the argument parsing. This prevents argparse
from quitting due to missing required arguments, similar to the way that
the builtin argparse --help option is implemented by raising SystemExit.
Fixes : #1999  
							
						 
						
							2017-06-01 21:29:50 +03:00  
				
					
						
							
							
								 
						
							
								d343f9497c 
								
							 
						 
						
							
							
								
								Merge branch 'release-3.1'  
							
							
							
						 
						
							2017-05-22 19:10:06 -03:00  
				
					
						
							
							
								 
						
							
								c9c2c34b44 
								
							 
						 
						
							
							
								
								Remove unused parameter  
							
							
							
						 
						
							2017-05-20 04:39:45 -04:00  
				
					
						
							
							
								 
						
							
								9beeef970e 
								
							 
						 
						
							
							
								
								Parse the filename in the generator expression  
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
				
					
						
							
							
								 
						
							
								43aa037ebd 
								
							 
						 
						
							
							
								
								Reindent  
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
				
					
						
							
							
								 
						
							
								2abf2070f2 
								
							 
						 
						
							
							
								
								Collapse nested for loops into a generator expression  
							
							
							
						 
						
							2017-05-20 04:38:30 -04:00  
				
					
						
							
							
								 
						
							
								ce0ff0040f 
								
							 
						 
						
							
							
								
								Reindent and add docstring  
							
							
							
						 
						
							2017-05-20 04:38:27 -04:00  
				
					
						
							
							
								 
						
							
								6d2e11b7d1 
								
							 
						 
						
							
							
								
								Extract method for _mark_plugins_for_rewrite  
							
							
							
						 
						
							2017-05-20 04:18:41 -04:00  
				
					
						
							
							
								 
						
							
								d86c89e193 
								
							 
						 
						
							
							
								
								Revert refactor of old-style to new-style classes  
							
							... 
							
							
							
							As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398 ).
This reverts commit d4afa1554b#2179 . 
							
						 
						
							2017-05-17 18:20:51 -03:00  
				
					
						
							
							
								 
						
							
								8bcf88ec12 
								
							 
						 
						
							
							
								
								try to consider all modules after registration as plugin  
							
							
							
						 
						
							2017-05-05 11:16:05 +02:00  
				
					
						
							
							
								 
						
							
								25371ddbfd 
								
							 
						 
						
							
							
								
								Merge pull request  #2315  from RonnyPfannschmidt/namespace-hook  
							
							... 
							
							
							
							remove pytest internal usage of the namespace hook 
							
						 
						
							2017-04-21 16:24:20 -03:00  
				
					
						
							
							
								 
						
							
								83c508eea3 
								
							 
						 
						
							
							
								
								Verify hooks after collection completes  
							
							... 
							
							
							
							Fix  #1821  
						
							2017-04-11 21:55:12 -03:00  
				
					
						
							
							
								 
						
							
								417b54abed 
								
							 
						 
						
							
							
								
								added option to unicode plugin name  
							
							
							
						 
						
							2017-04-05 13:03:11 +00:00  
				
					
						
							
							
								 
						
							
								fab9b993f8 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.freeze_support  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								9f85584656 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							
							
						 
						
							2017-03-20 19:59:05 -03:00  
				
					
						
							
							
								 
						
							
								42a5d6bdfa 
								
							 
						 
						
							
							
								
								Add __future__ imports to all pytest modules  
							
							... 
							
							
							
							This prevents silly errors from creeping in Python 2 when testing in Python 3 
							
						 
						
							2017-03-16 22:45:40 -03:00  
				
					
						
							
							
								 
						
							
								78194093af 
								
							 
						 
						
							
							
								
								Improve warning representation in terminal plugin and fix tests  
							
							
							
						 
						
							2017-03-16 21:57:32 -03:00  
				
					
						
							
							
								 
						
							
								0baed781fe 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							
							
						 
						
							2017-03-16 20:02:06 -03:00  
				
					
						
							
							
								 
						
							
								1e0cf5ce4d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py 
							
						 
						
							2017-03-10 15:54:05 -03:00  
				
					
						
							
							
								 
						
							
								a7643a5fbe 
								
							 
						 
						
							
							
								
								Merge branch 'features' into integrate-pytest-warnings  
							
							
							
						 
						
							2017-02-18 11:03:15 -02:00  
				
					
						
							
							
								 
						
							
								9eb1d73951 
								
							 
						 
						
							
							
								
								--override-ini now correctly overrides some fundamental options like "python_files"  
							
							... 
							
							
							
							#2238  
						
							2017-02-08 23:03:33 -02:00  
				
					
						
							
							
								 
						
							
								713bdc1f9f 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2017-01-26 12:00:52 +01:00  
				
					
						
							
							
								 
						
							
								c477f09177 
								
							 
						 
						
							
							
								
								Assert statements of the pytester plugin again benefit from assertion rewriting  
							
							... 
							
							
							
							Fix  #1920  
						
							2017-01-19 21:33:51 -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  
				
					
						
							
							
								 
						
							
								d4afa1554b 
								
							 
						 
						
							
							
								
								Refactored old style classes to new style classes  
							
							
							
						 
						
							2017-01-08 22:52:42 -06: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  
				
					
						
							
							
								 
						
							
								c856537e71 
								
							 
						 
						
							
							
								
								Add warning for incorrect passing args to `-o`.  
							
							
							
						 
						
							2016-12-01 13:20:42 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								629d8e9fd6 
								
							 
						 
						
							
							
								
								Show an error if --confcutdir is not a valid directory  
							
							... 
							
							
							
							Fixes  #2078  
						
							2016-11-23 09:49:11 -02:00  
				
					
						
							
							
								 
						
							
								bd343ef757 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							
							
						 
						
							2016-11-22 14:35:39 -02:00  
				
					
						
							
							
								 
						
							
								a3319ffe80 
								
							 
						 
						
							
							
								
								Merge pull request  #2071  from nicoddemus/fix-flake8  
							
							... 
							
							
							
							Fix flake8 E305 and E306 errors 
							
						 
						
							2016-11-22 13:22:11 +01:00  
				
					
						
							
							
								 
						
							
								632c4d5daf 
								
							 
						 
						
							
							
								
								Remove an accidental double space  
							
							
							
						 
						
							2016-11-21 10:17:23 -05:00  
				
					
						
							
							
								 
						
							
								26ca5a702e 
								
							 
						 
						
							
							
								
								Add tests and integrated the original code into the core  
							
							
							
						 
						
							2016-11-21 08:26:43 -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  
				
					
						
							
							
								 
						
							
								620b384b69 
								
							 
						 
						
							
							
								
								Fix cmdline help message for custom options with two or more metavars  
							
							... 
							
							
							
							Fix  #2004  
						
							2016-10-20 20:34:39 -02:00  
				
					
						
							
							
								 
						
							
								78eec0d7f8 
								
							 
						 
						
							
							
								
								Handle import errors with non-ascii messages when importing plugins  
							
							... 
							
							
							
							Fix  #1998  
						
							2016-10-12 18:19:32 -03:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								04cf5e1df4 
								
							 
						 
						
							
							
								
								Fixed assertion rewriting for plugins in development mode  
							
							... 
							
							
							
							Fix  #1934  
						
							2016-09-14 21:59:33 -03:00  
				
					
						
							
							
								 
						
							
								c8a366e551 
								
							 
						 
						
							
							
								
								Fix issue where pytest_plugins as string was marking wrong modules for rewrite  
							
							... 
							
							
							
							Fix  #1888  
						
							2016-08-30 22:53:50 -03:00  
				
					
						
							
							
								 
						
							
								8f516d27fa 
								
							 
						 
						
							
							
								
								Moved import pkg_resources to else clause.  
							
							
							
						 
						
							2016-08-24 10:25:01 +01:00  
				
					
						
							
							
								 
						
							
								2f11a85698 
								
							 
						 
						
							
							
								
								Import pkg_resources only when necessary.  
							
							
							
						 
						
							2016-08-23 16:41:11 +01:00  
				
					
						
							
							
								 
						
							
								ab86dea529 
								
							 
						 
						
							
							
								
								Support [tool:pytest] in setup.cfg files  
							
							... 
							
							
							
							Also deprecate [pytest] usage in setup.cfg files
Fix  #567  
							
						 
						
							2016-08-17 08:19:38 -03:00  
				
					
						
							
							
								 
						
							
								802755ceed 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2016-08-06 17:58:17 -03:00  
				
					
						
							
							
								 
						
							
								a2891420de 
								
							 
						 
						
							
							
								
								Fix determining rootdir from common_ancestor  
							
							
							
						 
						
							2016-08-06 19:35:40 +02: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  
				
					
						
							
							
								 
						
							
								6c8b0a28e1 
								
							 
						 
						
							
							
								
								Add deprecation module to centralize deprecation messages and bits of code  
							
							
							
						 
						
							2016-07-25 18:14:39 -03:00  
				
					
						
							
							
								 
						
							
								ab6aef1d1f 
								
							 
						 
						
							
							
								
								feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths.  
							
							
							
						 
						
							2016-07-25 12:41:58 +02:00  
				
					
						
							
							
								 
						
							
								e0f08a73ab 
								
							 
						 
						
							
							
								
								Merge branch 'features' into conftest-exception-printing  
							
							
							
						 
						
							2016-07-20 19:33:36 -03:00  
				
					
						
							
							
								 
						
							
								61cc5c4d4e 
								
							 
						 
						
							
							
								
								argument parsing: always warn for string types  
							
							... 
							
							
							
							fix  #1741  
						
							2016-07-19 10:33:25 +02:00  
				
					
						
							
							
								 
						
							
								317b3f257d 
								
							 
						 
						
							
							
								
								optparse compatibility - add float and complex  
							
							... 
							
							
							
							also documents the implementation quality
fixes  #457  
							
						 
						
							2016-07-19 10:20:41 +02:00  
				
					
						
							
							
								 
						
							
								d1852a48b7 
								
							 
						 
						
							
							
								
								Remove assertion reinterpretation  
							
							... 
							
							
							
							The assertion reinterpretation is an old backwards compatibility
mode which was no longer being maintained on feature-parity with
the assertion rewriting mode.  It was also responsible for some
dubious patching of builtins and test with side-effects would
suddenly start passing.  Since re-writing has been the default for
a long time and plugins are now also re-written it is time to
retire reinterpretation. 
							
						 
						
							2016-07-15 00:33:39 +01:00  
				
					
						
							
							
								 
						
							
								24fbbbef1f 
								
							 
						 
						
							
							
								
								Merge pull request  #1641  from flub/rewrite-plugins  
							
							... 
							
							
							
							Rewrite plugins 
							
						 
						
							2016-07-14 19:39:15 +01:00  
				
					
						
							
							
								 
						
							
								51ee7f8734 
								
							 
						 
						
							
							
								
								Fixup things after rebase  
							
							... 
							
							
							
							Some changes to make things work on top of current features branch. 
							
						 
						
							2016-07-14 12:42:29 +01:00  
				
					
						
							
							
								 
						
							
								ab0b6faa5f 
								
							 
						 
						
							
							
								
								Deprecate support for passing command-line as string to pytest.main()  
							
							... 
							
							
							
							Fixes  #1723  
						
							2016-07-14 08:11:43 -03:00  
				
					
						
							
							
								 
						
							
								743f59afb2 
								
							 
						 
						
							
							
								
								Introduce pytest.register_assert_rewrite()  
							
							... 
							
							
							
							Plugins can now explicitly mark modules to be re-written.  By default
only the modules containing the plugin entrypoint are re-written. 
							
						 
						
							2016-07-13 17:31:09 +01:00  
				
					
						
							
							
								 
						
							
								a98e3cefc5 
								
							 
						 
						
							
							
								
								Enable re-writing of setuptools-installed plugins  
							
							... 
							
							
							
							Hook up the PEP 302 import hook very early in pytest startup so
that it gets installed before setuptools-installed plugins are
imported.  Also iterate over all installed plugins and mark them
for rewriting.  If an installed plugin is already imported then
a warning is issued, we can not break since that might break
existing plugins and the fallback will still be gracefull to
plain asserts.
Some existing tests are failing in this commit because of the new
warning triggered by inline pytest runs due to the hypothesis
plugin already being imported.  The tests will be fixed in the next
commit. 
							
						 
						
							2016-07-13 17:29:19 +01:00  
				
					
						
							
							
								 
						
							
								8c49561470 
								
							 
						 
						
							
							
								
								split most fixture related code into own plugin  
							
							
							
						 
						
							2016-07-09 20:36:00 +02:00  
				
					
						
							
							
								 
						
							
								b9a91dc112 
								
							 
						 
						
							
							
								
								merge from master to features  
							
							
							
						 
						
							2016-07-06 11:51:48 +02:00  
				
					
						
							
							
								 
						
							
								61e605f60b 
								
							 
						 
						
							
							
								
								Making conftest import failures easier to debug  
							
							
							
						 
						
							2016-07-05 10:04:42 +01:00  
				
					
						
							
							
								 
						
							
								1b0dbd8c40 
								
							 
						 
						
							
							
								
								Move the freezing function from genscript.py to a new module freeze_support.py  
							
							
							
						 
						
							2016-06-26 19:37:24 +02:00  
				
					
						
							
							
								 
						
							
								0e2ebc96ff 
								
							 
						 
						
							
							
								
								Remove deprecated cmd options  
							
							... 
							
							
							
							Fixes  #1657  
						
							2016-06-26 19:26:04 +02:00  
				
					
						
							
							
								 
						
							
								856e6cab75 
								
							 
						 
						
							
							
								
								add --override-ini option to overrides ini values  
							
							... 
							
							
							
							Signed-off-by: Ted Xiao <xiao.xj@gmail.com> 
							
						 
						
							2016-06-25 23:45:32 +08:00  
				
					
						
							
							
								 
						
							
								13a188fe37 
								
							 
						 
						
							
							
								
								Merge pull request  #1647  from sallner/features  
							
							... 
							
							
							
							Add new options to report fixture setup and teardown 
							
						 
						
							2016-06-25 16:38:37 +02:00  
				
					
						
							
							
								 
						
							
								c519b9517a 
								
							 
						 
						
							
							
								
								Merge pull request  #1663  from aostr/master  
							
							... 
							
							
							
							Rename the default plugin "pdb" into "debugging" 
							
						 
						
							2016-06-25 09:56:54 -03:00  
				
					
						
							
							
								 
						
							
								df17f862fa 
								
							 
						 
						
							
							
								
								Merge pull request  #1648  from blueyed/simplify-Argument-__repr__  
							
							... 
							
							
							
							Simplify Argument.__repr__ 
							
						 
						
							2016-06-25 09:26:50 -03:00  
				
					
						
							
							
								 
						
							
								9a5224e2f8 
								
							 
						 
						
							
							
								
								Renamed the pdb module and changed unit tests accordingly  
							
							
							
						 
						
							2016-06-25 12:37:31 +02:00  
				
					
						
							
							
								 
						
							
								032ce8baf6 
								
							 
						 
						
							
							
								
								Switch setuponly and setupplan options to a hook-based implementation.  
							
							
							
						 
						
							2016-06-25 12:19:46 +02:00  
				
					
						
							
							
								 
						
							
								757f37f445 
								
							 
						 
						
							
							
								
								Don't ignore ImportError with setuptools plugins  
							
							... 
							
							
							
							This was added in b2d66b9e7bFixes  #1479 , also see #1307  and #1497  
							
						 
						
							2016-06-25 09:56:22 +02:00  
				
					
						
							
							
								 
						
							
								939407ef63 
								
							 
						 
						
							
							
								
								Simplify Argument.__repr__  
							
							... 
							
							
							
							I have came across this when noticing that universal-ctags fails to parse
this correctly (https://github.com/universal-ctags/ctags/issues/997 ). 
							
						 
						
							2016-06-25 09:31:31 +02:00  
				
					
						
							
							
								 
						
							
								69bab4ab04 
								
							 
						 
						
							
							
								
								added check for already existing option names to OptionGroup.addoption()  
							
							
							
						 
						
							2016-06-22 18:01:35 +02:00  
				
					
						
							
							
								 
						
							
								9fb5ddf778 
								
							 
						 
						
							
							
								
								Fix shell argument split in win32  
							
							... 
							
							
							
							This fixes the bug inserted by accident in #1523  
							
						 
						
							2016-05-23 20:41:47 -03:00  
				
					
						
							
							
								 
						
							
								1a37035d71 
								
							 
						 
						
							
							
								
								Add test test_absolute_win32_path  
							
							
							
						 
						
							2016-04-20 01:27:37 +08:00  
				
					
						
							
							
								 
						
							
								dd2425675b 
								
							 
						 
						
							
							
								
								Fix a small issue about shlex.split not working well with win32 path  
							
							
							
						 
						
							2016-04-19 13:08:08 +08:00  
				
					
						
							
							
								 
						
							
								3ea987ef9d 
								
							 
						 
						
							
							
								
								Copy over name and path attributes to the re-raised exception  
							
							
							
						 
						
							2016-03-10 18:13:59 -03:00  
				
					
						
							
							
								 
						
							
								7a186df271 
								
							 
						 
						
							
							
								
								Improve error message when a plugin fails to import  
							
							
							
						 
						
							2016-03-08 19:18:13 -03:00  
				
					
						
							
							
								 
						
							
								a965386b9e 
								
							 
						 
						
							
							
								
								Add bool type to addini  
							
							
							
						 
						
							2016-02-14 20:52:27 -02:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								0e55a8793f 
								
							 
						 
						
							
							
								
								all tests pass  
							
							
							
						 
						
							2015-10-09 09:58:12 -07:00  
				
					
						
							
							
								 
						
							
								49d46a0059 
								
							 
						 
						
							
							
								
								an ugly patch to fix all but the most important part =/  
							
							
							
						 
						
							2015-10-08 10:44:58 -07:00  
				
					
						
							
							
								 
						
							
								b3727438d6 
								
							 
						 
						
							
							
								
								Add missing nodeid on pytest_logwarning call in addhook.  
							
							... 
							
							
							
							Otherwise KeyError: 'nodeid' gets thrown, killing pytest. This may fix
issue 1034, but the details of it may be caused by something similar
somewhere else. 
							
						 
						
							2015-09-28 20:23:54 -04:00  
				
					
						
							
							
								 
						
							
								971ebcbd77 
								
							 
						 
						
							
							
								
								simplify by removing the single-call "exclude_pytest_names" function  
							
							
							
						 
						
							2015-09-28 15:43:55 +02:00  
				
					
						
							
							
								 
						
							
								4e3a807733 
								
							 
						 
						
							
							
								
								fix issue  #1073  -- shortcut plugin hook lookup if the attrname is not  
							
							... 
							
							
							
							prefixed with pytest_. 
							
						 
						
							2015-09-28 13:34:28 +02:00  
				
					
						
							
							
								 
						
							
								2575053697 
								
							 
						 
						
							
							
								
								Merge pull request  #1015  from hpk42/cache-integration  
							
							... 
							
							
							
							refined pytest-cache integration 
							
						 
						
							2015-09-16 21:46:46 +02:00  
				
					
						
							
							
								 
						
							
								e20216a1a8 
								
							 
						 
						
							
							
								
								merge the pytest-cache plugin into core  
							
							
							
						 
						
							2015-09-13 19:55:44 +02:00  
				
					
						
							
							
								 
						
							
								0b3f1b4a7c 
								
							 
						 
						
							
							
								
								Create `_pytest.vendored_packages` and _pytest._pluggy  
							
							... 
							
							
							
							- Replace imports from "pluggy" to "_pytest._pluggy"
- Fallback to import "pluggy" from global namespace if
  not found in _pytest.vendored_packges 
							
						 
						
							2015-09-07 13:01:54 -03:00  
				
					
						
							
							
								 
						
							
								8625eb643e 
								
							 
						 
						
							
							
								
								Merge pull request  #986  from RonnyPfannschmidt/early-logging  
							
							... 
							
							
							
							replay initial warnings when terminalreporter is loaded 
							
						 
						
							2015-09-02 19:10:53 -03:00  
				
					
						
							
							
								 
						
							
								76f0988551 
								
							 
						 
						
							
							
								
								turn the pytest_logwarning hook historic  
							
							
							
						 
						
							2015-09-02 18:49:49 +02:00  
				
					
						
							
							
								 
						
							
								3fa261564b 
								
							 
						 
						
							
							
								
								replay initial warnings when terminalreporter is loaded  
							
							
							
						 
						
							2015-08-31 21:54:12 +02:00  
				
					
						
							
							
								 
						
							
								4533a50542 
								
							 
						 
						
							
							
								
								Fix regression caused by changing the signature for parse_known_args  
							
							... 
							
							
							
							Fix  #973  
						
							2015-08-27 19:35:32 -03:00  
				
					
						
							
							
								 
						
							
								42b43a7d7b 
								
							 
						 
						
							
							
								
								Paths after normal options are now properly used to discover rootdir and ini files  
							
							... 
							
							
							
							Fix  #949  
						
							2015-08-25 22:08:05 -03:00  
				
					
						
							
							
								 
						
							
								e103932aad 
								
							 
						 
						
							
							
								
								Reintroduce hasplugin to PytestPluginManager  
							
							... 
							
							
							
							Fix  #932  
						
							2015-08-09 19:30:49 -03:00  
				
					
						
							
							
								 
						
							
								023687d8d0 
								
							 
						 
						
							
							
								
								Merge pull request  #872  from nicoddemus/confcutdir-inifile  
							
							... 
							
							
							
							Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini by default 
							
						 
						
							2015-07-25 14:03:24 +02:00  
				
					
						
							
							
								 
						
							
								9f94e443ff 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	testing/conftest.py 
							
						 
						
							2015-07-24 19:24:21 -03:00  
				
					
						
							
							
								 
						
							
								35bbcc39a2 
								
							 
						 
						
							
							
								
								Interpret strings to "plugins" arg in pytest.main() as module names  
							
							... 
							
							
							
							See #855  
							
						 
						
							2015-07-23 23:37:09 -03:00  
				
					
						
							
							
								 
						
							
								ab9e246ab0 
								
							 
						 
						
							
							
								
								Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini files by default  
							
							... 
							
							
							
							As discussed in #82  
							
						 
						
							2015-07-23 23:21:07 -03:00  
				
					
						
							
							
								 
						
							
								df29120abe 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini 
							
						 
						
							2015-07-23 22:35:51 -03:00  
				
					
						
							
							
								 
						
							
								2f7d0f8bd9 
								
							 
						 
						
							
							
								
								Consider --color option in more places which deal with TerminalWriters  
							
							
							
						 
						
							2015-07-18 16:39:55 -03:00  
				
					
						
							
							
								 
						
							
								1baa1a4d01 
								
							 
						 
						
							
							
								
								Merge pull request  #822  from nicoddemus/extra-usage-info  
							
							... 
							
							
							
							Print inifile and rootdir when there's usage errors 
							
						 
						
							2015-07-11 13:43:20 -03:00