bd36e00174
Merge pull request #1153 from b-jazz/patch-2
...
Update usage.rst
2015-10-24 15:41:24 +02:00
da6b1557f0
Merge pull request #1152 from b-jazz/patch-1
...
Update CONTRIBUTING.rst
2015-10-24 12:00:33 +02:00
f174026f53
Update usage.rst
...
Remove double "the" in usage comments
2015-10-24 02:36:02 -07:00
390e1c93ed
Update CONTRIBUTING.rst
...
Clean up the grammar of one of the lines.
2015-10-24 02:21:22 -07:00
8f31a1a64b
Merge pull request #1147 from jayvdb/remove-extrainit
...
Remove commented out extrainit
2015-10-20 10:25:54 -02:00
9a04879129
Remove commented out extrainit
...
Unused since 2012, and the docstring syntax is incorrect with
four quotes.
2015-10-20 21:08:21 +11:00
7469b5591e
Update plugins_index.rst
2015-10-17 13:37:38 -03:00
75932a92d0
Make pytest-version mandatory
...
Fix #1118
2015-10-17 13:37:01 -03:00
cf56f59f58
Merge pull request #1145 from htgoebel/patch-1
...
Add link to unittest2pytest
2015-10-17 13:16:55 -03:00
4fba20e544
Add link to unittest2pytest
...
Closes #991 .
2015-10-17 18:14:52 +02:00
2956627b8b
Handle EPERM when writing rewritten bytecode.
...
Fixes #1143 .
2015-10-17 11:55:55 +02:00
3404d2a99b
Merge pull request #1142 from nicoddemus/issue-1133-str-relto
...
Fix situation where a traceback entry "path" returns a str object
2015-10-17 08:58:48 +02:00
311b0a9683
Fix situation where a traceback entry "path" returns a str object
...
Fix #1133
2015-10-16 20:18:14 -03:00
3b11995dbe
Merge pull request #1053 from mbirtwell/issue_331_failure_for_test_with_no_name
...
Prevent non-function callables from being collected
2015-10-13 23:35:32 +02: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
0c21533cc5
Merge pull request #1130 from The-Compiler/pytest_doc_fix
...
Use a string for pytest_plugins in docs.
2015-10-12 10:58:39 -03:00
dadf03baea
Use a string for pytest_plugins in docs.
2015-10-12 06:57:43 +02:00
1525cc78f6
Merge pull request #1127 from michael-k/indentation
...
[doc] Fixed indentation
2015-10-10 14:22:18 +02: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
37e96c9335
[doc] Fixed indentation
2015-10-10 13:29:22 +02:00
b052becba9
Merge pull request #1121 from tomviner/issue1035-getattr
...
Issue1035 getattr
2015-10-09 16:45:52 -03:00
88c8dd96f9
issue1035 Override inspect.isclass for python 2.6
2015-10-09 19:44:47 +01:00
707226298a
issue1035 add test for classes setting __getattr__
2015-10-08 09:08:32 +01:00
1f6988bdec
Add empty 2.8.3.dev section to CHANGELOG.
2015-10-07 22:47:22 +02:00
ec74a8deb8
Fix contents.rst.
...
This was broken in 787c866191
2015-10-07 18:10:13 +02:00
b5b53b6aec
start 2.8.3 development
2015-10-07 17:56:05 +02:00
7c529e0afe
Merge branch '2.8.2-release'
2015-10-07 17:51:34 +02:00
b955473533
Add 2.8.2 release annoucement.
2015-10-06 22:37:59 +02:00
2026ce0ed2
Update plugin_index.
2015-10-06 22:35:16 +02:00
42937d4bb6
Prepare 2.8.2 release.
2015-10-06 21:06:25 +02:00
cfd259ae6f
Merge pull request #1113 from demianbrecht/typo_fix
...
typo fix, changed position of context manager notes
2015-10-05 17:21:59 -03:00
493530ec6d
typo fix, changed position of context manager notes
2015-10-05 12:13:25 -07:00
4dea0892cb
Merge pull request #1108 from nicoddemus/plugins_index
...
plugins_index was still generating ".txt" files, so it was effectively being ignored
2015-10-05 09:37:31 -07:00
a14c77aeba
Fix problems when mixing autouse fixtures and doctest modules
...
The main problem was that previously DoctestModule was setting
up its fixtures during collection, instead of letting
each DoctestItem make its own fixture setup
Fix #1100
Fix #1057
2015-10-03 16:07:14 -03:00
9deab6c0fd
Add a reminder on HOWTORELEASE to update plugins_index
2015-10-02 19:44:00 -03:00
f9e9413f52
plugins_index was still generating ".txt" files, so it was effectively being ignored
...
Fix #1105
2015-10-02 19:21:55 -03:00
5171d167ce
Move "note" to the end of the main text
...
Fix #1097
2015-10-02 18:14:17 -03:00
2981bece55
pyflakes fix
2015-10-02 13:03:43 -07:00
fd211bf490
Add a note about usage of the context manager
...
Addesses #1097
2015-10-02 12:40:58 -07:00
9263b3a051
Merge pull request #1096 from hackebrot/update-docs-skip-with-cli-option
...
Update docs skip with cli option
2015-10-01 18:31:55 +02:00
88209c6ac6
Merge pull request #1092 from nicoddemus/param-ids-fix
...
Param ids fix
2015-10-01 15:09:11 +02:00
688f955f5e
Merge pull request #1058 from nicoddemus/doc-how-disable-cache
...
Add docs on how to disable cache provider
2015-10-01 13:06:02 +02:00
f3cee8f0b5
Merge remote-tracking branch 'upstream/master' into param-ids-fix
2015-10-01 07:58:55 -03:00
b7fd3f0031
Merge pull request #1093 from nicoddemus/relto-bug
...
Fix internal error when filtering tracebacks where one entry was generated by an exec() statement
Fixes #995
2015-10-01 06:00:40 +02:00
d1e00f6e19
Detect dynamic code explicitly in filter_traceback
2015-09-30 17:32:49 -03:00
c9480c5b8b
Move imports outside _escape_bytes as suggested in review
2015-09-30 17:02:19 -03:00
4829eac1e1
Use a variable for the skipif marker as suggested by @nicoddemus
2015-09-30 21:53:34 +02:00
a10da0e540
Implement skipif marker for slow test based on pytest.config
2015-09-30 19:41:47 +02:00
7ac8a88a05
Remove pytest_runtest_setup from conftest.py
2015-09-30 19:25:57 +02:00
639ae0cfe0
Merge pull request #1095 from ionelmc/fix-hook-docs
...
Correct hook examples in docs.
2015-09-30 11:28:43 -03:00
Florian Bruhin
Ronny Pfannschmidt
b-jazz
Bruno Oliveira
John Vandenberg
Hartmut Goebel
Florian Bruhin
Michael Birtwell
Michael K
TomV
Demian Brecht
holger krekel
Raphael Pierzina