b3c337db00
add changelog entry and documentation note about RecordedWarning
2016-10-24 15:28:35 +02:00
377e649e61
local merge of #1967 - Change exception raised by capture.DontReadFromInput.fileno()
2016-10-24 12:47:55 +02:00
9d00615bbf
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2016-10-20 21:51:42 -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
bc1f8666aa
Fix link in CHANGELOG for #1853
2016-10-12 18:19:34 -03:00
78eec0d7f8
Handle import errors with non-ascii messages when importing plugins
...
Fix #1998
2016-10-12 18:19:32 -03:00
7d66e4eae1
Display full traceback from Import errors when collecting test modules
...
Fix #1976
2016-10-03 20:47:44 -03:00
4667b4decc
Merge branch 'master' into features
2016-09-29 19:03:26 -03:00
a87b1c79c1
post 3.0.3 release changes
2016-09-29 18:58:17 -03:00
dda17994ec
Prepare for 3.0.3 release
2016-09-28 16:33:38 -04:00
654af0ba25
Merge remote-tracking branch 'upstream/master' into features
2016-09-26 19:32:53 -03:00
acac78adc0
Add link to profile.
2016-09-26 16:09:25 +03:00
ff492ca73f
Thanked my self in the change log :)
2016-09-26 13:27:41 +03:00
835328d862
Vendor pluggy 0.4.0
...
Fix #1637
2016-09-25 23:36:02 -03:00
3fce78498f
Mention #1952 on the CHANGELOG
...
Also created "New Features" and "Changes" sections.
2016-09-25 20:31:03 -03:00
6db2f315fa
Explain a bad scope value to the user
2016-09-21 16:40:58 -04:00
6b56c36ae7
added to changelog and authors
2016-09-20 02:47:59 +07:00
4df74a5cfb
Add AUTHORS and CHANGELOG for #1512
2016-09-19 15:29:37 +01:00
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
8639bf7554
fixup! Merge pkg_resources workaround
2016-09-19 10:20:36 +01: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
8a41b26f56
Merge pull request #1908 from nicoddemus/parametrize-unicode-id
...
The "ids" argument to "parametrize" again accepts unicode strings in Python 2
2016-09-05 15:09:12 +02:00
ceeb5149f3
Mention register_assert_rewrite explicitly
...
It helps mentioning this explicitly in the changelog.
Fixes #1871 .
2016-09-05 13:09:36 +01:00
1e10de574d
The "ids" argument to "parametrize" again accepts unicode strings in Python 2
...
Fixes #1905
2016-09-02 18:38:15 -03: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
d3f4b3d14a
mend
2016-08-23 16:50:00 +01:00
a1597aca89
Added #1853 to changelog as requested on PR.
2016-08-23 16:48:24 +01: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
Ronny Pfannschmidt
Bruno Oliveira
Vlad Dragos
Tyler Goodlet
Lev Maximov
Matthew Duck
Floris Bruynooghe
Florian Bruhin
mbyt
Ahn Ki-Wook
John Towler
Jordan Guymon
Raquel Alegre
Daniel Hahler