Bruno Oliveira
98acda426f
Remove yieldctx variable being passed around
2016-06-08 21:07:50 -03:00
Bruno Oliveira
d712428d33
Fix custom name for yield_fixtures
2016-06-08 21:07:49 -03:00
Bruno Oliveira
366879db27
Make normal fixtures work with "yield"
2016-06-08 21:07:47 -03:00
Bruno Oliveira
92323895c9
Use same python which invoked tox for "doctesting" env
...
This will work for Travis and AppVeyor because both start tox using Python 3
2016-06-08 21:06:19 -03:00
marscher
09d163aa3a
[exception handling] Fix case the current working directory (CWD) gets deleted during testing.
...
Fixes #1235 .
2016-06-08 15:18:23 +02:00
Ronny Pfannschmidt
70fdab4cfa
Merge pull request #1584 from mgedmin/patch-1
...
Docs: config.option is deprecated
2016-06-02 09:27:32 +02:00
Marius Gedminas
3ad5b9de86
Docs: config.option is deprecated
...
https://pytest.org/latest/writing_plugins.html#_pytest.config.Config says config.option is deprecated and one should use config.getoption() instead.
2016-06-02 09:52:56 +03:00
Ronny Pfannschmidt
9b6dc93496
Merge pull request #1583 from nicoddemus/fix-tox-doctesting
...
Use same python which invoked tox for "doctesting" env
2016-06-02 08:10:33 +02:00
Bruno Oliveira
2c4b76b754
Use same python which invoked tox for "doctesting" env
...
This will work for Travis and AppVeyor because both start tox using Python 3
2016-06-01 20:30:26 -03:00
Bruno Oliveira
63ced4d486
List contributors alphabetically in AUTHORS
2016-06-01 20:21:51 -03:00
Bruno Oliveira
97c89e6dc3
Merge branch 'fix-all-skipped-but-none-exist'
2016-06-01 20:20:50 -03:00
Bruno Oliveira
dd9c81ca26
Mention #1580 in the CHANGELOG and add Thomas Grainger to AUTHORS
2016-06-01 19:56:45 -03:00
Thomas Grainger
74862b8f2f
Don't mark empty doctest files as skipped, fixes #1578
2016-06-01 19:19:14 +01:00
Florian Bruhin
057007fb52
Merge pull request #1582 from graingert/patch-1
...
Fix rst-lint CHANGELOG error
2016-06-01 19:25:18 +02:00
Thomas Grainger
2898dffb9e
Fix rst-lint CHANGELOG error
2016-06-01 17:43:41 +01:00
Ronny Pfannschmidt
7305adfdba
fix another copy&paste error in the announcement list
2016-06-01 08:55:44 +02:00
Ronny Pfannschmidt
fad6266a47
finish up the version bump in __init__ i forgot
2016-06-01 08:18:10 +02:00
Ronny Pfannschmidt
b5bd4d959d
merge master to features
2016-06-01 08:13:26 +02:00
Ronny Pfannschmidt
f423f08b45
prepare cangelog for the next bugfix release
2016-06-01 08:04:21 +02:00
Ronny Pfannschmidt
5c8b0fb523
fix minor typos
2016-06-01 08:03:22 +02:00
Ronny Pfannschmidt
978bb190a1
add release announcement
2016-05-31 19:06:29 +02:00
Ronny Pfannschmidt
a2a904466c
alter changelog header
2016-05-31 19:05:36 +02:00
Ronny Pfannschmidt
77c28825df
regendoc and comment out a python2.7 example as per #1573
2016-05-31 19:05:36 +02:00
Ronny Pfannschmidt
d3dcc2b8f1
bump regendoc python version to 3.5
2016-05-31 19:05:36 +02:00
Ronny Pfannschmidt
85541113eb
update version
2016-05-31 19:05:36 +02:00
Ronny Pfannschmidt
7ef06822cb
ignore hypothesis temp folder
2016-05-31 19:05:36 +02:00
Ronny Pfannschmidt
289e0091de
Merge pull request #1577 from pytest-dev/docs-hookwrapper-experimental
...
Remove "experimental" status from hookwrapper
2016-05-31 17:56:08 +02:00
Bruno Oliveira
28efdebfcd
Remove "experimental" status from hookwrapper
2016-05-31 12:17:55 -03:00
Ronny Pfannschmidt
fb2e7cc727
Merge pull request #1575 from hackebrot/fix-showfixtures-for-multiple-fixturedefs
...
Fix showfixtures for multiple fixturedefs
2016-05-31 13:53:13 +02:00
Raphael Pierzina
fb8ad714b1
Implement a test for showfixtures to show fixtures with same name
2016-05-31 11:47:16 +01:00
Raphael Pierzina
945072b89a
Update changelog with --fixtures fix
2016-05-31 11:47:16 +01:00
Raphael Pierzina
0d80a9c729
Change _showfixtures_main to loop over fixturedefs
2016-05-31 11:47:16 +01:00
Ronny Pfannschmidt
357a7c79ef
Merge branch 'tomviner-issue-1496-xfail-cond-kw'
...
fixes #1496
2016-05-31 11:25:15 +02:00
Ronny Pfannschmidt
158f3cfaea
merge master
2016-05-31 11:24:53 +02:00
Bruno Oliveira
82c74fe7e6
Merge pull request #1530 from RonnyPfannschmidt/fix-510
...
fix #510 by adding a describing skip marker on empty parameterize
2016-05-30 10:54:33 -03:00
Ronny Pfannschmidt
afc5c7e4f6
better message for empty argument skip
...
include the argument names to help determining the fixture/parametrization
2016-05-30 14:42:55 +02:00
Ronny Pfannschmidt
03eb9203fd
remove the old empty argument triggers
...
unlike the marker based one its not composable
2016-05-30 14:41:00 +02:00
Ronny Pfannschmidt
ae4dff0e0a
add missing link to changelog
2016-05-30 14:34:38 +02:00
Ronny Pfannschmidt
d217b52508
fix #510 by adding a describing skip marker on empty parameterize
2016-05-30 14:34:38 +02:00
Bruno Oliveira
8c1be624a6
Merge pull request #1554 from RonnyPfannschmidt/merge-master
...
Merge master into features
2016-05-24 11:09:33 -03:00
Ronny Pfannschmidt
16794feaf6
Merge branch 'master' into merge-master
2016-05-24 08:15:10 +02:00
Ronny Pfannschmidt
436e13ac25
Merge pull request #1566 from nicoddemus/fix-win32-path
...
Fix shell argument split in win32
2016-05-24 08:14:01 +02:00
Bruno Oliveira
9fb5ddf778
Fix shell argument split in win32
...
This fixes the bug inserted by accident in #1523
2016-05-23 20:41:47 -03:00
Bruno Oliveira
5ab5a11544
Merge pull request #1565 from tomviner/issue1544/ignore-build-dist-dirs
...
Issue 1544: norecursedirs build & dist dirs
2016-05-23 19:30:20 -03:00
Ronny Pfannschmidt
26b526967e
merge from master again
2016-05-23 22:33:00 +02:00
TomV
d6dfb1a393
issue 1544: norecursedirs build & dist dirs
2016-05-23 21:02:29 +01:00
Ronny Pfannschmidt
85393d34b6
Merge pull request #1561 from AbdealiJK/ajk/1558_feature
...
unittest.UnitTestCase: Allow __test__ for methods
2016-05-19 10:17:28 +02:00
Ronny Pfannschmidt
be7a86270c
Merge pull request #1541 from RonnyPfannschmidt/document-1540
...
Document #1540
2016-05-19 10:15:33 +02:00
AbdealiJK
d4c9fa9f1a
unittest.UnitTestCase: Allow __test__ for methods
...
__test__ needs to be checked for methods of a class too. Earlier,
this was not done, and all methods in a class was assumed to be
a test. This commit adds the appropriate condition to ensure that
if the __test__ is set to False, it does not collect that method.
Fixes https://github.com/pytest-dev/pytest/issues/1558
2016-05-19 08:19:57 +05:30
Ronny Pfannschmidt
ec5e05834f
fix typo
2016-05-18 21:35:31 +02:00