dc16fe2bb9
Merge junit-xml url attribute branch
...
Merge branch 'url_attr' of https://github.com/fushi/pytest into junitxml-url
2016-09-19 12:57:05 +01:00
f5d900d972
Merge remote-tracking branch 'upstream/master' into features
2016-09-01 23:07:49 -03:00
ee284ec587
Set version to 3.0.3.dev0
...
Also, using "dev0" as development suffix otherwise distutils gives a warning during "setup.py develop":
UserWarning: Normalizing '3.0.3.dev' to '3.0.3.dev0'
normalized_version,
2016-09-01 21:34:54 -03:00
4e58c9a7d0
Fix use of deprecated getfuncargvalue method in the internal doctest plugin
...
Fix #1898
2016-09-01 07:19:11 -04:00
4c45b93007
Changes for 3.0.2 release
2016-08-31 20:28:38 -04:00
696a9112be
integrating review commets of @nicoddemus
...
plus small scale refactoring
2016-08-31 22:33:47 +02:00
be08223d5a
Merge branch 'master' into disable_tearDown_and_cleanups_for_post_mortem_debugging
...
Conflicts:
CHANGELOG.rst
2016-08-31 20:35:31 +02:00
10b3274924
adding corresponding test, authors and changelog
2016-08-31 20:22:54 +02:00
edf8283bd8
Add CHANGELOG entry for #1888
2016-08-30 23:13:27 -03:00
9d2149d9c0
Merge pull request #1884 from pytest-dev/master
...
merge master into features
2016-08-30 18:47:57 -03:00
86b8801470
Update AUTHORS and CHANGELOG
2016-08-26 09:42:17 +09:00
1b259f70f3
Testcase reports with a url attribute will now properly write this to junitxml
2016-08-25 13:08:51 -07:00
a152ea2dbb
Add buffer attribute to stdin stub
2016-08-24 16:26:34 -07:00
c5675d3efc
Remove merge-conflict marker merged by accident
...
Unfortunately rst-lint didn't catch that
2016-08-23 23:43:05 -03:00
972a5fb5d5
Improve error message when passing non-string ids to pytest.mark.parametrize
...
Fix #1857
2016-08-23 23:31:45 -03:00
7704f73db9
Merge branch 'master' into merge-master-into-features
2016-08-23 21:36:42 -03:00
ea0febad28
Updates for new patch version 3.0.2
2016-08-23 21:33:57 -03:00
49fc4e5e4c
Changes for 3.0.1 release
2016-08-23 18:15:43 -04:00
df200297e2
Fix internal error when parametrizing using and empty list of ids()
...
Fix #1849
2016-08-23 18:18:46 -03:00
53a0e2b118
Fix code which guesses parametrized scope based on arguments
...
Fix #1832
2016-08-22 21:05:41 -03:00
b54ea74d4d
Update AUTHORS and CHANGELOG for #1837
2016-08-22 17:59:42 -03:00
a20c3f9c44
Merge pull request #1827 from blueyed/Fix-spelling-s-outside-a-outside-of-a-
...
Fix spelling: s/outside a/outside of a/
2016-08-20 20:04:58 +02:00
e306a53999
Fix spelling: s/outside a/outside of a/
2016-08-20 18:43:39 +02:00
90fb8cb08b
Merge pull request #1823 from nicoddemus/importorskip-regression
...
Fix regression when using importorskip at module level
2016-08-20 18:37:14 +02:00
87d2d1d838
Remove duplicate entry for #717 in CHANGELOG
2016-08-20 15:12:08 +02:00
63dc71c57e
Fix regression when using importorskip at module level
...
Fix #1822
2016-08-19 18:21:25 -03:00
db922403cc
Bump version to 3.1.0.dev
2016-08-19 17:44:07 -03:00
3a200b75c9
Bump version to 3.0.1.dev
2016-08-19 17:41:45 -03:00
745c8c17f1
Merge remote-tracking branch 'upstream/master'
2016-08-19 17:38:21 -03:00
b85a3b0d71
Merge pull request #1820 from The-Compiler/changelog-duplicates
...
Remove duplicate CHANGELOG messages
2016-08-19 17:35:23 -03:00
31ede2432c
Remove duplicate CHANGELOG messages
...
Those are both already mentioned in the breaking changes at the top.
2016-08-19 17:05:02 +02:00
3455dfc804
add missing @matthiasha link
2016-08-19 14:01:07 +02:00
cd39cc1eec
Mention doc update in CHANGELOG
2016-08-19 09:08:11 +02:00
7f18367582
Finalize CHANGELOG
2016-08-18 11:43:21 -04:00
56df9fcc72
Tweak CHANGELOG: move "change" entry to the proper place
2016-08-17 23:08:13 -03:00
030c42203d
Fix conflicts in CHANGELOG
2016-08-17 22:58:12 -03:00
463e6572c5
Merge branch 'master' into merge-master-into-features
...
Preparing for 3.0
2016-08-17 22:39:23 -03:00
0fb34cd2a1
Update CHANGELOG entries
2016-08-17 21:32:07 -03:00
789e4670e7
Merge pull request #1813 from nicoddemus/pytest-setup.cfg
...
Support [tool:pytest] in setup.cfg files
2016-08-17 20:33:57 +02:00
c8ab79402c
Merge pull request #1811 from nicoddemus/revert-invocation-fixtures
...
Revert invocation-fixtures code
2016-08-17 20:32:54 +02: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
707b6b5e3f
Revert all invocation-fixtures code
...
Due to a serious regression found in #1794 , it was decided to pull off
invocation features from 3.0 so it can be (hopefully) re-introduced
in 3.1
2016-08-17 08:12:55 -03:00
f25771a101
Deprecate --resultlog cmdline option
...
Fix #830
2016-08-16 21:40:34 -03:00
497152505e
Add CHANGELOG entry for #1809
2016-08-15 19:31:00 -03:00
ca5957932b
Merge pull request #1806 from blueyed/fix-off-by-one-error-with-warnings
...
Fix off-by-one error with lines from request.node.warn
2016-08-15 19:04:00 -03:00
c163cc7937
Improve display of continuation lines with multiline errors
...
Fixes https://github.com/pytest-dev/pytest/issues/717 .
Follow-up to https://github.com/pytest-dev/pytest/pull/1762 .
2016-08-14 22:34:31 +02:00
16cb5d01b1
Fix off-by-one error with lines from request.node.warn
...
The line numbers in `node.location` seem to be zero-based?!
2016-08-14 22:10:01 +02:00
c4d9c7ea55
Add thanks as requested.
2016-08-08 13:45:10 +01:00
e4028b4505
Fix #1798 to include errors in total tests in junit xml output.
2016-08-08 13:35:49 +01:00
802755ceed
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2016-08-06 17:58:17 -03:00
Floris Bruynooghe
Bruno Oliveira
mbyt
Ahn Ki-Wook
John Towler
Jordan Guymon
Florian Bruhin
Daniel Hahler
Florian Bruhin
matthiasha
Christian Boelsen