|  Ronny Pfannschmidt | de0d19ca09 | Merge pull request #2790 from nicoddemus/merge-master-into-features Merge master into features | 2017-09-20 10:25:56 +02:00 | 
				
					
						|  Bruno Oliveira | a2da5a691a | Update tox and appveyor environments to use py36 by default | 2017-09-18 21:38:15 -03:00 | 
				
					
						|  Bruno Oliveira | afe7966683 | Fix call to outcome.get_result now that outcome.result is deprecated | 2017-09-18 21:36:54 -03:00 | 
				
					
						|  Bruno Oliveira | 3ebfb881c9 | Merge remote-tracking branch 'upstream/master' into features | 2017-09-18 19:10:31 -03:00 | 
				
					
						|  Ronny Pfannschmidt | bf77daa2ee | Merge pull request #2785 from nicoddemus/py36 Change to py36 as main environment for Python 3 environments in tox | 2017-09-17 09:19:06 +02:00 | 
				
					
						|  Bruno Oliveira | 9933635cf7 | Change to py36 as main environment for Python 3 environments in tox This also has the benefit of working around Travis recent failures
in Python 3.5 environments. | 2017-09-16 19:18:07 -03:00 | 
				
					
						|  Bruno Oliveira | ac5c5cc1ef | Merge pull request #2750 from evanunderscore/fix-filescompleter Fix crash in FastFilesCompleter with no prefix | 2017-09-14 20:11:43 -03:00 | 
				
					
						|  Bruno Oliveira | 810320f591 | Small fixes to development_guide: title and label names * Fix title to use a proper "title" section marker
* Fix labels by adding a " " after the ":"
* Fix OS labels after obvious mishap
* Sort labels | 2017-09-14 19:58:56 -03:00 | 
				
					
						|  Bruno Oliveira | 25d2acbdb2 | Merge pull request #2760 from nicoddemus/labels Add development guide to docs | 2017-09-14 19:20:45 -03:00 | 
				
					
						|  Bruno Oliveira | 52c134aed3 | Add development guide to docs | 2017-09-13 19:32:40 -03:00 | 
				
					
						|  Ronny Pfannschmidt | 70cdfaf661 | Merge pull request #2754 from nicoddemus/xfail_strict Set xfail_strict=True in pytest's own test suite | 2017-09-13 09:01:32 +02:00 | 
				
					
						|  Bruno Oliveira | abfd9774ef | Remove xfail mark from passing test in py26 | 2017-09-12 17:59:09 -03:00 | 
				
					
						|  Bruno Oliveira | e57cc55719 | Merge pull request #2766 from xuanluong/issue-1548-docs-multiple-calls-metafunc-parametrize Update documentation on multiple calls of metafunc.parametrize | 2017-09-10 02:07:06 -03:00 | 
				
					
						|  Xuan Luong | 696c702da7 | Update documentation on multiple calls of metafunc.parametrize | 2017-09-10 00:23:23 -04:00 | 
				
					
						|  Bruno Oliveira | bee2c864d8 | Merge pull request #2765 from xuanluong/pass-callable-to-marker-typo Fix typo in example of passing a callable to markers | 2017-09-09 21:03:13 -03:00 | 
				
					
						|  Xuan Luong | e27a0d69aa | Rename changelog file to PR id number | 2017-09-09 18:26:15 -04:00 | 
				
					
						|  Xuan Luong | 15222ceca2 | Fix typo in example of passing a callable to markers | 2017-09-09 18:22:23 -04:00 | 
				
					
						|  Bruno Oliveira | 3c1ca03b9c | Merge pull request #2763 from jhamman/docs/skipif_class_warning add warning to skipping docs re marker inheritance | 2017-09-09 15:15:47 -03:00 | 
				
					
						|  Ronny Pfannschmidt | 25ed4edbc7 | Merge pull request #2764 from xuanluong/issue-2758-fix-mark-decorator-equality [bugfix] Checking MarkDecorator equality returns False for non-MarkDecorator object | 2017-09-09 10:03:49 +02:00 | 
				
					
						|  Xuan Luong | 1e93089165 | [bugfix] Checking MarkDecorator equality returns False for non-MarkDecorator object | 2017-09-09 01:31:08 -04:00 | 
				
					
						|  Joe Hamman | b2a8e06e4f | add warning to skipping docs re marker inheritance | 2017-09-08 12:01:33 -07:00 | 
				
					
						|  Bruno Oliveira | 9273e11f21 | Merge branch 'master' into features | 2017-09-07 13:59:10 -03:00 | 
				
					
						|  Bruno Oliveira | 09349c344e | Merge pull request #2757 from nicoddemus/release-3.2.2 Preparing release version 3.2.2 | 2017-09-07 13:54:31 -03:00 | 
				
					
						|  Evan | 6cf515b164 | Fix crash in FastFilesCompleter with no prefix | 2017-09-08 00:14:56 +10:00 | 
				
					
						|  Ronny Pfannschmidt | 6967f3070e | Merge pull request #2711 from massich/mimic_raises_signature_in_warns [MRG][feature] Change warns signature to mimic the raises call | 2017-09-07 13:19:09 +02:00 | 
				
					
						|  Joan Massich | a0c6758202 | Add changelog | 2017-09-07 10:51:14 +02:00 | 
				
					
						|  Joan Massich | 80d165475b | Add documentation | 2017-09-07 10:28:52 +02:00 | 
				
					
						|  Joan Massich | aa6a67044f | Add match_regex functionality to warns | 2017-09-07 09:58:03 +02:00 | 
				
					
						|  Bruno Oliveira | c52f87ede3 | Preparing release version 3.2.2 | 2017-09-06 21:37:57 +00:00 | 
				
					
						|  Bruno Oliveira | 549f5c1a47 | Merge pull request #2736 from xuanluong/issue-2604-documents-mark.with_args [DOC] Add examples for mark.with_args | 2017-09-06 16:33:01 -03:00 | 
				
					
						|  Xuan Luong | 3f8ff7f090 | [DOC] Add examples for mark.with_args | 2017-09-06 14:26:28 -04:00 | 
				
					
						|  Bruno Oliveira | b55a4f805f | Merge pull request #2744 from nicoddemus/pluggy-master Add test environment using pluggy from master branch | 2017-09-06 15:03:19 -03:00 | 
				
					
						|  Bruno Oliveira | d01f08e96f | Merge branch 'features' into pluggy-master | 2017-09-06 13:13:35 -03:00 | 
				
					
						|  Ronny Pfannschmidt | ad36407747 | Merge pull request #2700 from nicoddemus/staticmethods-fixtures Allow tests declared as @staticmethod to use fixtures | 2017-09-06 08:24:00 +02:00 | 
				
					
						|  Bruno Oliveira | e1f2254fc2 | Merge pull request #2734 from RonnyPfannschmidt/simplify-string-safening simplyfy ascii escaping by using backslashreplace error handling | 2017-09-05 21:14:27 -03:00 | 
				
					
						|  Bruno Oliveira | 10d43bd3bf | Set xfail_strict=True in pytest's own test suite Fix #2722 | 2017-09-05 19:57:26 -03:00 | 
				
					
						|  Bruno Oliveira | f825b4979b | Merge remote-tracking branch 'upstream/master' into features | 2017-09-05 19:44:33 -03:00 | 
				
					
						|  Bruno Oliveira | 3d70727021 | Improve wording in changelog entry | 2017-09-05 19:36:53 -03:00 | 
				
					
						|  Bruno Oliveira | 1fc185b640 | Add comment about possible future refactoring in the fixture mechanism | 2017-09-05 19:28:39 -03:00 | 
				
					
						|  Bruno Oliveira | 7d59b2e350 | Fix call to outcome.force_result Even though the test is not running at the moment (xfail), at least
we avoid future confusion | 2017-09-05 19:08:20 -03:00 | 
				
					
						|  Bruno Oliveira | d9992558fc | Refactor tox.ini so pluggymaster envs share definitions | 2017-09-05 19:04:58 -03:00 | 
				
					
						|  Bruno Oliveira | d1f71b0575 | Merge pull request #2752 from tarcisiofischer/issue-2751-fix-flaky-testdir Issue 2751 fix flaky testdir | 2017-09-05 18:51:08 -03:00 | 
				
					
						|  Tarcisio Fischer | de6b41e318 | Update changelog and AUTHORS files, following the CONTRIBUTING guidelines | 2017-09-05 15:46:32 -03:00 | 
				
					
						|  Tarcisio Fischer | 8d1903fed3 | Avoid creating arbitrary filenames for tmpdir on Testdir's constructor Fixes #2751 | 2017-09-05 15:22:04 -03:00 | 
				
					
						|  Ronny Pfannschmidt | 13eac944ae | restore ascii escaping for python 3.3/3.4 | 2017-09-04 21:25:46 +02:00 | 
				
					
						|  Joan Massich | d8ecca5ebd | Add test to design warns signature in TDD mimicking raises signature | 2017-09-04 15:26:00 +02:00 | 
				
					
						|  Bruno Oliveira | 9bbf14d0f6 | Create explicit 'pluggymaster' env definitions For some reason, the previous approach brakes 'coveralls' because
pip still tries to install the 'pluggy' master requirement
(git+https://...) | 2017-09-01 20:40:14 -03:00 | 
				
					
						|  Bruno Oliveira | c42d966a40 | Change all pytest report options to the more concise '-ra' in tox.ini | 2017-09-01 18:57:42 -03:00 | 
				
					
						|  Bruno Oliveira | 3dc0da9339 | Remove __multicall__ warning and usages in testing pluggy>=0.5 already warns about those | 2017-09-01 18:53:06 -03:00 | 
				
					
						|  Bruno Oliveira | 11ec6aeafb | Add test environment using pluggy from master branch Fix #2737 | 2017-09-01 18:33:30 -03:00 |