b5bd4d959d
merge master to features
2016-06-01 08:13:26 +02:00
f423f08b45
prepare cangelog for the next bugfix release
2016-06-01 08:04:21 +02:00
5c8b0fb523
fix minor typos
2016-06-01 08:03:22 +02:00
978bb190a1
add release announcement
2016-05-31 19:06:29 +02:00
a2a904466c
alter changelog header
2016-05-31 19:05:36 +02:00
77c28825df
regendoc and comment out a python2.7 example as per #1573
2016-05-31 19:05:36 +02:00
d3dcc2b8f1
bump regendoc python version to 3.5
2016-05-31 19:05:36 +02:00
85541113eb
update version
2016-05-31 19:05:36 +02:00
7ef06822cb
ignore hypothesis temp folder
2016-05-31 19:05:36 +02:00
289e0091de
Merge pull request #1577 from pytest-dev/docs-hookwrapper-experimental
...
Remove "experimental" status from hookwrapper
2016-05-31 17:56:08 +02:00
28efdebfcd
Remove "experimental" status from hookwrapper
2016-05-31 12:17:55 -03:00
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
fb8ad714b1
Implement a test for showfixtures to show fixtures with same name
2016-05-31 11:47:16 +01:00
945072b89a
Update changelog with --fixtures fix
2016-05-31 11:47:16 +01:00
0d80a9c729
Change _showfixtures_main to loop over fixturedefs
2016-05-31 11:47:16 +01:00
357a7c79ef
Merge branch 'tomviner-issue-1496-xfail-cond-kw'
...
fixes #1496
2016-05-31 11:25:15 +02:00
158f3cfaea
merge master
2016-05-31 11:24:53 +02:00
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
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
03eb9203fd
remove the old empty argument triggers
...
unlike the marker based one its not composable
2016-05-30 14:41:00 +02:00
ae4dff0e0a
add missing link to changelog
2016-05-30 14:34:38 +02:00
d217b52508
fix #510 by adding a describing skip marker on empty parameterize
2016-05-30 14:34:38 +02:00
8c1be624a6
Merge pull request #1554 from RonnyPfannschmidt/merge-master
...
Merge master into features
2016-05-24 11:09:33 -03:00
16794feaf6
Merge branch 'master' into merge-master
2016-05-24 08:15:10 +02:00
436e13ac25
Merge pull request #1566 from nicoddemus/fix-win32-path
...
Fix shell argument split in win32
2016-05-24 08:14:01 +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
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
26b526967e
merge from master again
2016-05-23 22:33:00 +02:00
d6dfb1a393
issue 1544: norecursedirs build & dist dirs
2016-05-23 21:02:29 +01:00
85393d34b6
Merge pull request #1561 from AbdealiJK/ajk/1558_feature
...
unittest.UnitTestCase: Allow __test__ for methods
2016-05-19 10:17:28 +02:00
be7a86270c
Merge pull request #1541 from RonnyPfannschmidt/document-1540
...
Document #1540
2016-05-19 10:15:33 +02:00
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
ec5e05834f
fix typo
2016-05-18 21:35:31 +02:00
6f98cd6faa
Merge pull request #1560 from nicoddemus/fix-py26-tox-comment
...
Move comment in tox.ini due to recent bug in pip
2016-05-18 21:31:56 +02:00
561a5fb558
Move comment in tox.ini due to recent bug in pip
...
As discussed in #1554
* https://bitbucket.org/hpk42/tox/issues/332/
* https://github.com/pypa/pip/issues/3667
2016-05-18 16:15:29 -03:00
47739291cf
Merge pull request #1557 from adamchainz/readthedocs.io
...
Convert readthedocs link for their .org -> .io migration for hosted projects
2016-05-18 13:24:03 -03:00
8a39869347
Convert readthedocs link for their .org -> .io migration for hosted projects
...
As per their email ‘Changes to project subdomains’:
> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.
Test Plan: Manually visited all the links I’ve modified. One was not modified - `http://media.readthedocs.org/epub/pytest/latest/pytest.epub ` - since it doesn't work on `readthedocs.io`.
2016-05-18 17:12:39 +01:00
eab762ea99
Merge branch 'master' into merge-master
2016-05-13 19:37:41 +02:00
c49863aa63
merge next chunk from master and fix changelog linting issue
2016-05-13 19:36:47 +02:00
01d2ff804b
Merge commit '56156bb119194014129ac08c4a2c370f0b893104' into merge-master
2016-05-13 17:55:02 +02:00
68f658b6cc
Merge commit '890c2fa555314a67a8d97a1b8ea4881a14be69c4' into merge-master
2016-05-13 17:52:59 +02:00
4bde70d060
Merge commit 'ec62a3c9e47c3b5b07aa1656815145ffa2882a09' into merge-master
2016-05-13 17:40:14 +02:00
8a94c66e68
Merge pull request #1551 from fushi/master
...
Fix #1549 - count skips in junit-xml
2016-05-05 22:03:30 +02:00
0d07b64571
Fixes Issue 1549
2016-05-05 11:29:05 -07:00
98dd2ce75c
document reason for #1540
2016-04-28 16:22:31 +02:00
308e76e19c
add xfailing test for #1540
2016-04-28 16:11:30 +02:00
60212e8831
Merge pull request #1537 from ben4ever/patch-1
...
Fix typo in doc
2016-04-27 22:13:51 -07:00
75abfbe8d4
Fix typo in doc
2016-04-28 14:40:17 +10:00
6cc56b4a1b
Merge pull request #1535 from palaviv/parametrize-test-ids-hook
...
introduce pytest_make_parametrize_id hook
2016-04-27 16:16:16 +02:00
9733127951
pytest_make_parametrize_id receive config object
2016-04-26 10:23:57 +03:00
Ronny Pfannschmidt
Bruno Oliveira
Raphael Pierzina
TomV
AbdealiJK
Adam Chainz
John Towler
Ronny Pfannschmidt
Florian Bruhin
Benjamin Dopplinger
palaviv