Commit Graph

6708 Commits

Author SHA1 Message Date
John Still 89c73582ca ignore the active python installation unless told otherwise 2017-07-11 11:52:16 -05:00
Bruno Oliveira d9aaab7ab2 Merge remote-tracking branch 'upstream/master' into features 2017-07-10 17:51:59 -03:00
Bruno Oliveira 9e0b19cce2 Merge pull request #2561 from jmsdvl/iss2533
Rename _escape_strings to _ascii_escaped
2017-07-10 17:49:44 -03:00
Bruno Oliveira a87f6f84cc Merge pull request #2559 from RockBomber/features
cache_dir ini option for setting cache directory
2017-07-10 17:49:05 -03:00
Pauli Virtanen 8a7d98fed9 Make YIELD_TEST warning less spammy
Emit it only once per each generator, rather than for each generated
function. Also add information about which test caused it to be emitted.
2017-07-10 21:41:09 +02:00
John Still cdd788085d add news fragment to changelog folder 2017-07-10 12:37:12 -05:00
John Still 80595115b0 replace all _escape_strings to _ascii_escaped 2017-07-10 12:32:27 -05:00
V.Kuznetsov bd52eebab4 changelog for ini option cache_dir 2017-07-07 13:20:39 +03:00
V.Kuznetsov 91418eda3b docs for ini option cache_dir 2017-07-07 13:08:12 +03:00
V.Kuznetsov 7a9fc69435 tests for ini option cache_dir 2017-07-07 13:07:33 +03:00
V.Kuznetsov f471eef661 ini option cache_dir 2017-07-07 13:07:06 +03:00
Ronny Pfannschmidt 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
Ronny Pfannschmidt 7cd03d7611 Merge pull request #2554 from nicoddemus/pytest-configure-order
Clarify pytest_configure hook call order
2017-07-05 14:22:55 +02:00
Bruno Oliveira 3667086acc Clarify pytest_configure hook call order
Fix #2539
2017-07-05 07:50:59 -03:00
Ronny Pfannschmidt db24a3b0fb Merge pull request #2552 from nicoddemus/strict-help-message
Change --strict help message to clarify it deals with unregistered markers
2017-07-05 06:14:25 +02:00
Bruno Oliveira 221f42c5ce Change --strict help message to clarify it deals with unregistered markers
Fix #2444
2017-07-04 20:14:57 -03:00
Kale Kundert 7a1a439049
Use `cls` instead of `ApproxNumpyBase`.
Slightly more general, probably doesn't make a difference.
2017-07-04 09:20:52 -07:00
Bruno Oliveira b62aef3372 Merge branch 'master' into features 2017-07-04 12:44:58 -03:00
Kale Kundert c111e9dac3
Avoid making multiple ApproxNumpy types. 2017-07-03 22:45:24 -07:00
Kale Kundert 8524a57075
Add "approx" to all the repr-strings. 2017-07-03 22:44:37 -07:00
Bruno Oliveira b63f6770a1 Preparing release version 3.1.3 2017-07-03 23:29:13 +00:00
Bruno Oliveira 8a8687122d Add wheel to tasks/requirements.txt: required for package creation 2017-07-03 23:28:29 +00:00
Bruno Oliveira 7277fbdb20 Fix SMTP port in fixture docs
Also add timeout to avoid regen getting stuck due
to connection problems

Fix #2509
2017-07-03 20:21:41 -03:00
Bruno Oliveira 6908d93ba1 Merge pull request #2475 from ant31/master
[wip] Fix ignore_path condition
2017-07-03 18:57:17 -03:00
Bruno Oliveira c578418791 Add changelog for triple leading '/' problem. 2017-07-03 12:39:17 -03:00
Ronny Pfannschmidt 0303d95a53 Merge pull request #2531 from waisbrot/staticmethods
Allow staticmethods to be detected as test functions
2017-06-29 16:18:55 +02:00
Nathaniel Waisbrot 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
Ronny Pfannschmidt 9b51fc646c Merge pull request #2526 from nicoddemus/merge-master-into-features
Merge master into features
2017-06-24 11:25:35 +02:00
Ronny Pfannschmidt 6eeab45a8f Merge pull request #2525 from nicoddemus/deprecate-old-style
Add changelog entry explicitly deprecating old-style classes from pytest API
2017-06-24 11:24:53 +02:00
Antoine Legrand 16df4da1f7 Fix exclude_path check 2017-06-24 10:58:47 +02:00
Bruno Oliveira 3de93657bd Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-06-24 00:47:48 -03:00
Bruno Oliveira 1906f8c565 Merge pull request #2524 from RonnyPfannschmidt/fix-2427
introduce deprecation warnings for legacy parametersets, fixes #2427
2017-06-24 00:41:44 -03:00
Bruno Oliveira 655d44b413 Add changelog entry explicitly deprecating old-style classes from pytest API
Related to #2147
2017-06-24 00:37:40 -03:00
Ronny Pfannschmidt 0d0b01bded introduce deprecation warnings for legacy parametersets, fixes #2427 2017-06-23 22:06:49 +02:00
Bruno Oliveira 6e2b5a3f1b Merge pull request #2523 from RonnyPfannschmidt/vendoring-tasks
Vendoring tasks
2017-06-23 16:55:32 -03:00
Ronny Pfannschmidt b3bf7fc496 add tasks for updating vendored libs 2017-06-23 21:26:45 +02:00
Ronny Pfannschmidt bb659fcffe Merge pull request #2521 from nicoddemus/show-trivial-changelog
Show "trivial" category in CHANGELOG
2017-06-23 17:38:36 +02:00
Bruno Oliveira 6de19ab7ba Show "trivial" category in CHANGELOG
I think it might sense to display in the CHANGELOG internal or
trivial changes because they might trip users between releases.

For example, a note about an internal refactoring (like
moving a class between modules) is useful for a user
that has been using the internal API. Of course
we are not breaking anything because it was an internal API, but no
reason not to save time for users who did use it.
2017-06-23 12:33:50 -03:00
Bruno Oliveira bab18e10eb Merge pull request #2517 from RonnyPfannschmidt/mark-expose-nontransfered
Mark expose nontransfered marks via pytestmark property
2017-06-23 10:15:39 -03:00
Ronny Pfannschmidt 8d5f2872d3 minor code style fix 2017-06-23 11:59:03 +02:00
Ronny Pfannschmidt b0b6c355f7 fixup changelog, thanks Bruno 2017-06-23 11:09:16 +02:00
Ronny Pfannschmidt 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
Bruno Oliveira 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
Ronny Pfannschmidt 1d926011a4 add deprecation warnings for using markinfo attributes 2017-06-22 15:12:50 +02:00
Bruno Oliveira ff8dbd0ad8 Add tracebackhide to function call form of deprecated_call 2017-06-22 08:54:39 -03:00
Ronny Pfannschmidt 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
Ronny Pfannschmidt c791895c93 changelog addition 2017-06-22 10:50:46 +02:00
Ronny Pfannschmidt 19b12b22e7 store pristine marks on function.pytestmark
fixes #2516
2017-06-22 10:48:45 +02:00
Ronny Pfannschmidt 64ae6ae25d extract application of marks and legacy markinfos 2017-06-22 10:41:28 +02:00
Ronny Pfannschmidt bdec2c8f9e move marker transfer to _pytest.mark 2017-06-22 08:45:10 +02:00