a24126effb
Add credit for pytest.mark.skip to the CHANGELOG
2015-10-03 14:15:22 -03:00
750442909c
Add unconditional skip entry to CHANGELOG
2015-10-03 17:04:06 +01:00
cb58eaa611
Merge remote-tracking branch 'upstream/master' into features
...
Conflicts:
_pytest/__init__.py
testing/test_recwarn.py
2015-09-29 15:56:41 +02:00
c5fd42b699
start 2.8.2 development
2015-09-29 15:32:33 +02:00
95245b935c
- fix a flaky test on py35-xdist by calling
...
importlib.invalidate_caches()
- bump version to 2.8.1
- regen docs
- amend changelog, authors
2015-09-29 13:10:59 +02:00
4194c9cce2
Check `deprecated_call` specific to deprecation
...
`deprecated_call` used to accept any warning. As of #897 , it
is now specific to DeprecationWarnings, and another commit in
this PR extends this to PendingDeprecationWarnings. This commit
makes sure this stays the case.
2015-09-28 12:35:24 -04:00
03aca9ea79
add changelog entry for fix #1073
2015-09-28 14:17:58 +02:00
d29084ec2c
add changelog note for fix #704
2015-09-28 11:45:51 +02:00
0c05ca1fd5
Merge branch 'master' into features
2015-09-26 10:03:42 +02:00
e4b18ea5c3
Update CHANGELOG
2015-09-26 03:28:30 -03:00
4867554eec
Merge branch 'master' into features
2015-09-23 16:42:42 +02:00
acb6b186f2
Merge pull request #1056 from icemac/patch-1
...
Remove duplicate line.
2015-09-23 09:10:20 +02:00
730114d088
Remove duplicate line.
2015-09-23 08:53:13 +02:00
716fa97fa1
Update CHANGELOG
2015-09-22 23:21:36 -03:00
9d1ae0a149
Merge pull request #1048 from RonnyPfannschmidt/pytest-1029
...
fixes #1029 by handling access errors for cache dirs as pytest warning
2015-09-22 19:04:04 -03:00
6e51918353
update changelog
2015-09-22 16:33:27 +02:00
1d2afada83
Minor typo in CHANGELOG
2015-09-22 11:30:00 -03:00
36924b59bd
Merge branch '653-deprecated-context-manager' of https://github.com/chiller/pytest into features
2015-09-22 15:14:06 +02:00
7c088d1104
remove nonsense line
2015-09-22 11:23:24 +02:00
48df2f6842
Merge branch 'master' into features
2015-09-22 11:23:05 +02:00
bf9b94595c
fix changelog
2015-09-22 11:18:19 +02:00
41d61ed221
Merge pull request #1023 from RonnyPfannschmidt/fix-877
...
Fix 877
2015-09-22 11:17:02 +02:00
79587d4b70
Merge branch 'master' into features
...
Conflicts:
_pytest/__init__.py
2015-09-22 11:06:21 +02:00
8a4517fd17
re-add 2.8.x changelog so that MASTER can be merged into features wrt
...
to the changelog
2015-09-22 11:05:19 +02:00
d8fbb0b8e3
start features branch
2015-09-22 11:00:55 +02:00
e2f72ffed8
start bugfix changelog on master
2015-09-22 10:59:23 +02:00
a5ff345f7b
fix another occurence of "macro" to "major"
2015-09-22 10:45:55 +02:00
745cd26850
Merge branch 'master' into newbranching
2015-09-22 10:22:05 +02:00
71c5883d52
update according to discussion on pytest-dev and in PR
2015-09-22 10:21:01 +02:00
beaa8e55bd
Fixes #653 use deprecated_call as context_manager
2015-09-21 19:01:23 +01:00
c30eafa254
Update changelog for merged PR.
2015-09-21 14:59:48 +01:00
65de43e67d
Mention fix for issue 766 in changelog
...
Fixes issue #766 .
2015-09-21 12:21:24 +01:00
49c99a41ea
reencode non-ascii python2 assertion reprs, fixes #877
...
i decided against using a warning since the problem goes away with python3
the support code can be removed once we drop python2 in 10 years or so
2015-09-19 00:30:01 +02:00
f02d9425f9
Bump version to 2.8.0
2015-09-18 19:04:20 -03:00
baf5b5d005
update changelog/author info, bump version number
2015-09-17 13:43:39 +02:00
a62d12634c
revert importing test module behaviour to prepend by default
2015-09-16 22:12:20 +02:00
9a90aaca96
improve and integrate docs
2015-09-16 17:15:31 +02:00
c06ff2a992
update docs on the json usage of builtin cache
2015-09-13 19:55:44 +02:00
e20216a1a8
merge the pytest-cache plugin into core
2015-09-13 19:55:44 +02:00
c7888d1d97
Add note in changelog about issue 960
2015-09-12 11:17:50 -03:00
348e519437
Merge pull request #962 from nicoddemus/doctest-skip
...
Make doctest SKIP option register doctests as SKIPPED rather than PASSED
2015-09-01 12:31:35 +02:00
7292212d5a
Merge pull request #976 from nicoddemus/ren-warnings-on-terminal
...
Rename "warnings" to "pytest-warnings" in terminal output
2015-09-01 07:56:42 +02:00
4ad56e84a8
Make doctest SKIP option register doctests as SKIPPED rather than PASSED
...
Fix 957
2015-08-31 21:25:11 -03:00
e3734ef337
Add CHANGELOG entry about renaming "warnings" to "pytest-warnings"
2015-08-31 21:21:29 -03:00
c493f263b6
Merge branch 'Elizaveta239-master' closes #908
2015-08-29 17:34:35 +10:00
dd7112d5ea
Show a few diff lines when truncating string diffs
...
Fix #934
2015-08-27 22:20:13 -03:00
b49bedcf0c
Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master
2015-08-28 11:10:22 +10:00
42b43a7d7b
Paths after normal options are now properly used to discover rootdir and ini files
...
Fix #949
2015-08-25 22:08:05 -03:00
e67d66a5d4
Merge branch 'pytest-dev'
...
# Conflicts:
# AUTHORS
2015-08-24 22:55:11 +03:00
b25e41e348
Merge pull request #956 from nicoddemus/record-xml-property
...
add preliminary support for extended junit xml properties
2015-08-24 09:13:04 +02:00
Bruno Oliveira
Michael Aquilina
holger krekel
Eric Hunsberger
Ronny Pfannschmidt
Michael Howitz
holger krekel
Galaczi Endre
Floris Bruynooghe
Brianna Laugher
elizabeth