6c170201d6
Merge branch 'master' into features
2016-01-02 23:56:01 +01:00
bf4de4bd68
Merge pull request #1294 from nicoddemus/doctest-bytes-literals
...
Doctest bytes literals
2016-01-01 18:18:08 +01:00
1bdf71730a
Complement #1255 by adding tests and docs
...
Fix #1242
2015-12-30 18:24:59 -02:00
638b3f5e39
Make monkeypatch calls O(1)
...
Fix #1292
2015-12-29 22:04:35 -02:00
309ecf7ab3
Rename "BugFixes/Adjustments" to just "Bug Fixes" as commented elsewhere
2015-12-29 21:09:15 -02:00
719d63085d
Add CHANGELOG entry for ALLOW_BYTES doctest option
2015-12-29 21:08:25 -02:00
2e02579437
Add CHANGELOG entry for #900 fix
2015-12-28 10:53:38 +01:00
6b25fb4d64
Separate 2.9.0 CHANGELOG into sections
...
Fix #1275
2015-12-25 20:44:03 -02:00
fbfab6778c
Give proper thanks for the PR in the CHANGELOG
2015-12-25 17:48:03 -02:00
6e170a4a1c
* Moved workaround to its own function, mostly for the sake of adding
...
a more descriptive docstring (the workaround itself is just to import
readline earlier). I removed the conditional on targetfd from the
workaround since it doesn't really matter.
* Added # noqa marker.
* Added changelog entry, and self to authors.
2015-12-24 16:43:34 -05:00
713069ebd4
implement review comments for #1266
2015-12-17 22:27:01 +01:00
25c392196f
Mention #1226 in the CHANGELOG
2015-12-16 16:48:49 -02:00
8bf7e7cc4b
fixes #1259 - take finalized nodes out of the mapping
...
this allows double node id usage for file based items
2015-12-16 19:09:44 +01:00
6ac31088c5
Merge branch 'master' into merge-master-into-features
2015-12-11 23:13:50 -02:00
7eea6b3b02
Add 2.8.6.dev1 to CHANGELOG
2015-12-11 23:11:36 -02:00
a124163425
Prepare for 2.8.5: bump version, CHANGELOG, announce
2015-12-11 19:20:07 -02:00
946bb08da5
Tyding up the CHANGELOG
2015-12-11 00:36:26 -02:00
ad05cbe6da
fixed meesage.
2015-12-10 15:39:31 -08:00
2b2240e904
added myself to authors, added changelog entry.
2015-12-10 15:15:09 -08:00
86b6ce5042
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2015-12-10 19:41:14 -02:00
8f880e1625
Fix CHANGELOG merge
2015-12-10 19:40:45 -02:00
8b61a332ba
Merge remote-tracking branch 'bukzor/features-merge-master' into features
2015-12-10 19:03:55 -02:00
1c46462991
Fix deprecated_call regression introduced in 2.8.4
...
Fix #1238
2015-12-08 22:40:05 -02:00
eabf2f9091
Merge branch 'master' into features
...
Conflicts:
AUTHORS
_pytest/__init__.py
_pytest/hookspec.py
_pytest/recwarn.py
testing/test_recwarn.py
2015-12-07 14:28:59 -08:00
1db4cbcc9f
Update AUTHORS and CHANGELOG
2015-12-07 12:17:30 -10:00
fde2a6f5fd
add changelog entry
2015-12-07 21:58:34 +01:00
efb5332023
Merge pull request #1186 from RonnyPfannschmidt/fix-manifest
...
fix #1185 - ensure MANIFEST.in exactly matches what should go to a sdist
2015-12-07 13:48:39 -02:00
c727860241
bump to 2.8.5.dev
2015-12-06 20:31:14 +01:00
a3353c49fd
prepare release 2.8.4 - changelog updates + version bump
2015-12-06 16:13:55 +01:00
141a463fed
fix #1185 - ensure MANIFEST.in exactly matches what should go to a sdist
2015-12-06 10:24:24 +01:00
14bc3c4009
Fix pastebin when captured output contains non-ascii characters
...
Fix #1219
2015-12-03 20:07:18 -02:00
a54e4e64cd
Merge remote-tracking branch 'upstream/master' into pastebin-py3
2015-12-01 23:51:14 -02:00
edfb567091
Add #1198 fix to CHANGELOG
2015-12-01 23:37:16 -02:00
aba55a0fb2
Fix terminal output if no tests were run.
...
Before:
==== in 0.00 seconds ====
After:
==== no tests run in 0.00 seconds ====
2015-11-30 17:24:40 +01:00
c790f7475e
Fix getting line number with nasty __getattr__.
...
When an object has a custom __getattr__ which always returns a non-int, we
tried to get compat_co_firstlineno from it and checked it was a integer, which
caused an exception if such a class is mistakenly collected.
If we still mistakenly collect such a class (which is likely to be something
other than a test), we now skip it with a warning (because it probably has an
__init__) instead of producing an error.
See #1204 .
2015-11-30 16:13:15 +01:00
603d81ef2f
deprecated_call now uses monkey patching strategy to capture warnings
...
similar to what we had in 2.7, with a few enhancements
Fix #1190
2015-11-26 16:48:58 -02:00
84eacf3e3c
Small changelog formatting fix
2015-11-26 14:37:55 -02:00
df767cca8f
Merge pull request #1188 from nicoddemus/pytest_enter_pdb
...
Pass pytest config object to pytest_enter_pdb
2015-11-23 20:55:33 +01:00
b3166a538c
Pass pytest's config object to pytest_enter_pdb
2015-11-23 14:42:21 -02:00
e4a000bb00
refer more explicit to osx el cap in the changelogs
2015-11-18 17:57:41 +01:00
6096cae3dd
release announcements for 2.8.3
2015-11-18 17:38:31 +01:00
3dc57d99f2
Changelog groming and release preps for 2.8.3
2015-11-18 17:34:30 +01:00
a7a470b56f
Give credit where it is due
2015-11-04 19:55:05 -02:00
313050b15b
Suggested edits by Bruno.
...
Moved fix to TestCaseFunction.setup. Added myself to AUTHORS and added entry to CHANGELOG
2015-11-04 15:30:16 -05:00
a83d5c0f08
Updated entries on CHANGELOG and AUTHORS. Ref: #1157
2015-10-28 19:35:04 +00:00
311b0a9683
Fix situation where a traceback entry "path" returns a str object
...
Fix #1133
2015-10-16 20:18:14 -03:00
a3bda59a30
collection: Prevent non-function callables from being collected
...
Fixes issue 331
previously to this change the collection code would issue a warning for
when ever it encountered a variable that looked like a test but wasn't a
function saying that it wouldn't collect it because it wasn't a function.
This fixes the logic so that if that warning is issued it really isn't
collected.
However previously special cases existed to support tests that were
created using functools.wraps and functools.partial. So the condition for
issuing that warning has been updated to take that in to account
Also try the old way of detecting functions just for proper integration
with mock.path in python 2.7 the get_real_func returned the unbound method
2015-10-12 22:23:18 +01:00
db077555f6
Merge pull request #1102 from nicoddemus/doctest-fixtures-fix
...
Fix autouse fixtures and doctest modules
2015-10-10 14:21:53 +02:00
88c8dd96f9
issue1035 Override inspect.isclass for python 2.6
2015-10-09 19:44:47 +01:00
470e4f9e91
changelog entry
2015-10-09 09:58:12 -07:00
Ronny Pfannschmidt
Bruno Oliveira
Ulrich Petri
Erik M. Bray
aselus-hub
Buck Golemon
David Vierra
Florian Bruhin
Lee Kamentsky
gabriel.reis
Michael Birtwell
TomV