1485a3a902
Merge pull request #2566 from jmsdvl/iss2518
...
Detect and warn/ignore local python installations
2017-07-13 10:44:04 +02:00
67fca04050
update docs and note; add virtualenv collection tests
2017-07-11 23:14:38 -05:00
b32cfc88da
use presence of activate script rather than sys.prefix to determine if a dir is a virtualenv
2017-07-11 14:32:09 -05:00
676c4f970d
trim trailing ws
2017-07-11 13:31:11 -05:00
89c73582ca
ignore the active python installation unless told otherwise
2017-07-11 11:52:16 -05:00
d9aaab7ab2
Merge remote-tracking branch 'upstream/master' into features
2017-07-10 17:51:59 -03:00
80595115b0
replace all _escape_strings to _ascii_escaped
2017-07-10 12:32:27 -05:00
f471eef661
ini option cache_dir
2017-07-07 13:07:06 +03:00
ef62b86335
Merge pull request #2492 from kalekundert/features
...
Add support for numpy arrays (and dicts) to approx.
2017-07-06 11:46:51 +02:00
7cd03d7611
Merge pull request #2554 from nicoddemus/pytest-configure-order
...
Clarify pytest_configure hook call order
2017-07-05 14:22:55 +02:00
3667086acc
Clarify pytest_configure hook call order
...
Fix #2539
2017-07-05 07:50:59 -03:00
221f42c5ce
Change --strict help message to clarify it deals with unregistered markers
...
Fix #2444
2017-07-04 20:14:57 -03:00
7a1a439049
Use `cls` instead of `ApproxNumpyBase`.
...
Slightly more general, probably doesn't make a difference.
2017-07-04 09:20:52 -07:00
b62aef3372
Merge branch 'master' into features
2017-07-04 12:44:58 -03:00
c111e9dac3
Avoid making multiple ApproxNumpy types.
2017-07-03 22:45:24 -07:00
8524a57075
Add "approx" to all the repr-strings.
2017-07-03 22:44:37 -07:00
6908d93ba1
Merge pull request #2475 from ant31/master
...
[wip] Fix ignore_path condition
2017-07-03 18:57:17 -03:00
9b9fede5be
allow staticmethods to be detected as test functions
...
Allow a class method decorated `@staticmethod` to be collected as a test
function (if it meets the usual criteria).
This feature will not work in Python 2.6 -- static methods will still be
ignored there.
2017-06-29 07:44:36 -04:00
9b51fc646c
Merge pull request #2526 from nicoddemus/merge-master-into-features
...
Merge master into features
2017-06-24 11:25:35 +02:00
16df4da1f7
Fix exclude_path check
2017-06-24 10:58:47 +02:00
3de93657bd
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2017-06-24 00:47:48 -03:00
0d0b01bded
introduce deprecation warnings for legacy parametersets, fixes #2427
2017-06-23 22:06:49 +02:00
8d5f2872d3
minor code style fix
2017-06-23 11:59:03 +02:00
23d016f114
address review comments
...
* enhance api for fetching marks off an object
* rename functions for storing marks
* enhance deprecation message for MarkInfo
2017-06-23 11:05:38 +02:00
22b7701431
Merge pull request #2480 from nicoddemus/issue-2469-deprecated-call-ctx
...
deprecated_call context manager captures warnings already raised
2017-06-22 10:53:28 -03:00
1d926011a4
add deprecation warnings for using markinfo attributes
2017-06-22 15:12:50 +02:00
ff8dbd0ad8
Add tracebackhide to function call form of deprecated_call
2017-06-22 08:54:39 -03:00
5e832017d5
Merge pull request #2487 from nicoddemus/recursion-error-2486
...
Fix internal error when trying to detect the start of a recursive traceback
2017-06-22 13:40:32 +02:00
19b12b22e7
store pristine marks on function.pytestmark
...
fixes #2516
2017-06-22 10:48:45 +02:00
64ae6ae25d
extract application of marks and legacy markinfos
2017-06-22 10:41:28 +02:00
bdec2c8f9e
move marker transfer to _pytest.mark
2017-06-22 08:45:10 +02:00
9597e674d9
Use sets to compare dictionary keys.
2017-06-16 08:25:13 -07:00
4d02863b16
Remove a dict-comprehension.
...
Not compatible with python26.
2017-06-15 18:56:09 -07:00
50769557e8
Skip the numpy doctests.
...
They seem like more trouble that they're worth.
2017-06-15 14:53:27 -07:00
8badb47db6
Implement suggestions from code review.
...
- Avoid importing numpy unless necessary.
- Mention numpy arrays and dictionaries in the docs.
- Add numpy to the list of tox dependencies.
- Don't unnecessarily copy arrays or allocate empty space for them.
- Use code from compat.py rather than writing py2/3 versions of things
myself.
- Avoid reimplementing __repr__ for built-in types.
- Add an option to consider NaN == NaN, because sometimes people use NaN
to mean "missing data".
2017-06-15 09:19:10 -07:00
4e57a39067
Merge pull request #2468 from nicoddemus/collection-report-2464
...
Fix incorrect "collected items" report when specifying tests on the command-line
2017-06-14 10:57:57 +02:00
af0344e940
Merge pull request #2500 from nicoddemus/issue-2434-doctest-modules
...
Fix decode error in Python 2 for doctests in docstrings
2017-06-14 05:52:44 +02:00
97367cf773
Remove obsolete comment from rewrite.py
...
This was made obsolete by 021e843427
2017-06-13 23:12:33 -03:00
336cf3e1f5
Merge pull request #2496 from rmfitzpatrick/pytest2440_handle_subrequest_finalizer_exceptions
...
Handle exceptions in subrequest finalizers
2017-06-13 23:03:03 -03:00
4e4ebbef5a
Improve test to ensure the expected function is re-raised
2017-06-13 20:16:48 -03:00
b09d60c60a
Fix decode error in Python 2 for doctests in docstrings
...
Fix #2434
2017-06-13 19:41:34 -03:00
21137cf8c5
Add firstresult=True to the hook docs
2017-06-12 19:45:35 -07:00
5a856b6e29
handle and reraise subrequest finalizer exceptions
2017-06-12 21:26:42 -04:00
8c22aee256
Resolve merge conflict due to approx being moved.
2017-06-11 19:46:59 -07:00
9f3122fec6
Add support for numpy arrays (and dicts) to approx.
...
This fixes #1994 . It turned out to require a lot of refactoring because
subclassing numpy.ndarray was necessary to coerce python into calling
the right `__eq__` operator.
2017-06-11 19:27:41 -07:00
6be57a3711
move python api helpers out of the python module
...
this separates exposed normal api from collection elements
2017-06-11 12:27:16 +02:00
36251e0db4
move approx to own file
2017-06-11 12:15:30 +02:00
8bb589fc5d
Fix internal error when trying to detect the start of a recursive traceback.
...
Fix #2486
2017-06-09 19:26:26 -03:00
917b9a8352
Merge pull request #2476 from nicoddemus/fix-2459-numpy-comparison
...
Fix internal error when a recursion error occurs and frames contain objects that can't be compared
2017-06-07 20:34:36 +02:00
2127a2378a
Fix internal error with recursive tracebacks with that frames contain objects that can't be compared
...
Fix #2459
2017-06-07 14:40:13 -03:00
Ronny Pfannschmidt
John Still
Bruno Oliveira
V.Kuznetsov
Kale Kundert
Nathaniel Waisbrot
Antoine Legrand
Ronny Pfannschmidt
Max Moroz
Ryan Fitzpatrick