cdaa720bc4
Merge remote-tracking branch 'upstream/master' into doctest-lineno
2017-07-24 21:49:35 +07:00
d0ecfdf00f
Delete trailing whitespace
2017-07-24 16:55:50 +03:00
81ad185f0d
Merge pull request #2595 from nicoddemus/docs-rootdir-pythonpath
...
Clarify PYTHONPATH changes and ``rootdir`` roles
2017-07-24 15:06:38 +02:00
d90bef44cc
Update changelog file for #2510
2017-07-24 09:31:16 -03:00
df12500661
Create 2611.bugfix
2017-07-24 15:28:20 +03:00
43544a431c
Early import colorama so that it get's the correct terminal
2017-07-24 15:17:39 +03:00
0aa2480e6a
Fix travis build after change from "precise" to "trusty"
...
Travis recently has changed its dist from "precise" to "trusty", so
some Python versions are no longer installed by default
2017-07-24 07:44:04 -03:00
6473a81b8b
Merge pull request #2608 from nicoddemus/contributing-update
...
Update PR guide and add a "short" version
2017-07-24 12:14:56 +02:00
af2c153324
Report lineno from doctest
...
This is to fix pytest-sugar#122 issue.
2017-07-24 11:52:24 +07:00
309152d9fd
Merge pull request #2599 from nicoddemus/turn-warnings-into-errors
...
Turn warnings into errors WIP, waiting #2598
2017-07-23 11:27:14 +02:00
d5bb2004f9
Fix travis build after change from "precise" to "trusty"
...
Travis recently has changed its dist from "precise" to "trusty", so
some Python versions are no longer installed by default
2017-07-23 00:50:28 -03:00
bda07d8b27
Ignore socket warnings on windows for trial tests
2017-07-22 21:44:18 -03:00
0726d9a09f
Turn warnings into errors in pytest's own test suite
...
Fix #2588
2017-07-22 21:44:18 -03:00
61219da0e2
Update PR guide and add a "short" version
2017-07-22 16:08:18 -03:00
1b732fe361
Merge pull request #2606 from kalekundert/simplify-numpy
...
Make approx more compatible with numpy
2017-07-22 14:21:08 -03:00
b35554ca2b
Merge pull request #2607 from kalekundert/remove-code-dup
...
Remove stale copies of raises and approx
2017-07-22 14:20:53 -03:00
7e0553267d
Remove unused import.
2017-07-22 09:19:13 -07:00
ebc7346be4
Raise TypeError for types that can't be compared to arrays.
2017-07-22 09:05:12 -07:00
a3b35e1c4b
Remove `raises` and `approx` from `python.py`.
...
These two classes were recently moved to `python_api.py`, but it seems
that they found their way back into the original file somehow. This
commit removes them again to avoid out-of-date code duplication.
2017-07-22 08:36:15 -07:00
4c45bc9971
Add the numpy tests back into tox.ini
...
I'm not sure why they were removed...
2017-07-22 08:24:45 -07:00
495f731760
Simplify how comparisons with numpy arrays work.
...
Previously I was subverting the natural order of operations by
subclassing from `ndarray`, but it turns out that you can tell just
numpy to call your operator instead of its by setting the
`__array_priority__` attribute on your class. This is much simpler, and
it turns out the be a little more robust, too.
2017-07-22 07:52:03 -07:00
50764d9ebb
Avoid interactive pdb when pytest tests itself - fix #2023
...
The debugging.py calls post_mortem() on error and pdb will drops an
interactive debugger when the stdin is a readable fd.
2017-07-21 21:29:03 +02:00
6461dc9fc6
Merge pull request #2600 from RonnyPfannschmidt/mark_explicit_params
...
fix #2540 , introduce mark.with_args
2017-07-21 10:42:25 -03:00
1cf826624e
Merge pull request #2602 from blueyed/doc-fix-filterwarnings
...
Fix help for filterwarnings ini option
2017-07-21 15:23:22 +02:00
97e5a3c889
Fix help for filterwarnings ini option
2017-07-21 14:21:31 +02:00
65b2de13a3
fix #2540 , introduce mark.with_args
2017-07-21 13:37:09 +02:00
3d24485cae
Clarify PYTHONPATH changes and ``rootdir`` roles
...
- Also minor adjustments in the docs (wording, formatting, links, etc).
Fix #2589
2017-07-21 07:28:11 -03:00
ccc4b3a501
Merge pull request #2596 from nicoddemus/autopep-tox
...
Add "fix-lint" tox environment
2017-07-21 06:25:59 +02:00
cbceef2008
Merge pull request #2598 from nicoddemus/filterwarnings-mark
...
Introduce filter-warnings mark
2017-07-21 06:23:18 +02:00
7341da1bc1
Introduce pytest.mark.filterwarnings
2017-07-20 22:31:49 -03:00
3c28a8ec1a
Improve formatting/grammar of changelog entries
2017-07-20 22:12:15 -03:00
22f54784c2
Add "fix-lint" tox environment to fix linting errors
2017-07-20 22:12:15 -03:00
abb5d20841
Merge branch 'master' into features
2017-07-20 22:10:58 -03:00
da12c52347
Fix: do not load hypothesis during test_logging_initialized_in_test
...
A recent release seem to have added a "logging" import to the top-level,
which breaks test_logging_initialized_in_test
2017-07-20 21:43:24 -03:00
9e3e58af60
Merge pull request #2594 from nicoddemus/fix-flake8-errors
...
Merge master into features and fix flake8 errors
2017-07-20 23:20:55 +02:00
56e6b4b501
Merge pull request #2578 from Llandy3d/2375
...
Provides encoding attribute on CaptureIO
2017-07-20 23:14:14 +02:00
d44565f385
Merge remote-tracking branch 'upstream/master' into fix-flake8-errors
2017-07-19 17:57:30 -03:00
24da938321
Fix additional flake8 errors
2017-07-19 17:42:21 -03:00
26ee2355d9
Merge remote-tracking branch 'upstream/features' into fix-flake8-errors
2017-07-19 17:09:05 -03:00
c92760dca8
Merge branch 'fix-flake8-issues'
2017-07-19 17:03:36 -03:00
61d4345ea4
Merge pull request #2593 from hackebrot/extend-pytester-docs-for-testing-plugin-code
...
Extend pytester docs for testing plugin code
2017-07-19 16:40:00 -03:00
1ac02b8a3b
Add plugin code
2017-07-19 20:15:27 +02:00
d06d97a7ac
Remove unnecessary comma from docs
2017-07-19 19:42:33 +02:00
e73a2f7ad9
Add changelog entry changelog/971.doc
2017-07-19 19:38:21 +02:00
91b4b229aa
Update documentation for testing plugin code
2017-07-19 19:38:21 +02:00
2840634c2c
Fix typo and improve comment about cookiecutter-template
2017-07-19 19:38:21 +02:00
eb79fa7825
Merge pull request #2590 from nicoddemus/current-test-var
...
Introduce new PYTEST_CURRENT_TEST environment variable
2017-07-19 15:56:32 +02:00
d7f182ac4f
Remove SETUPTOOLS_SCM_PRETEND_VERSION during linting
...
It was needed because of check-manifest, but we no longer have a
MANIFEST file so it is not necessary
2017-07-19 10:02:13 -03:00
2d4f1f022e
Introduce PYTEST_CURRENT_TEST environment variable
...
Fix #2583
2017-07-19 10:01:50 -03:00
2c03000b96
Merge pull request #2585 from RonnyPfannschmidt/fix-2573
...
remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage
2017-07-19 07:46:38 -03:00
Nguyễn Hồng Quân
Segev Finer
Florian Bruhin
Bruno Oliveira
Kale Kundert
Andras Tim
Daniel Hahler
Ronny Pfannschmidt
Floris Bruynooghe
Raphael Pierzina