Commit Graph

1966 Commits

Author SHA1 Message Date
Bruno Oliveira 69a55d334a
Merge pull request #5004 from blueyed/doc-pdb
doc: fix note about output capturing with pdb
2019-03-26 20:20:05 -03:00
Bruno Oliveira 057c97812b
Merge pull request #4975 from blueyed/verbose-fixes
Fix usages of "verbose" option
2019-03-26 18:38:39 -03:00
Daniel Hahler 52730f6330 doc: fix note about output capturing with pdb
[skip travis]
2019-03-26 18:33:00 +01:00
Daniel Hahler e1ae469504 Merge master into features 2019-03-26 10:23:21 +01:00
Daniel Hahler 23146e7527 Fix usages of "verbose" option
With `-qq` `bool(config.getoption("verbose"))` is True; it needs to be
checked for `> 0`.
2019-03-26 10:11:25 +01:00
Daniel Hahler 8e125c9759 doc/en/reference.rst: whitespace/alignment 2019-03-22 13:23:44 +01:00
Brian Skinn dcbdcc729b
Fix pytestmark syntax in reference.rst
pytest 4.3.1 throws an error if `pytestmark` is set to a tuple of marks; it appears to insist on a list.



With `pytestmark = [pytest.mark.api, pytest.mark.good]`:

```
============================== test session starts ==============================
platform win32 -- Python 3.6.3, pytest-4.3.1, py-1.8.0, pluggy-0.9.0
rootdir: C:\Temp\git\sphobjinv, inifile: tox.ini
plugins: timeout-1.3.3
collected 48 items / 41 deselected / 7 selected

tests\test_api_good.py .......                                             [100%]

==================== 7 passed, 41 deselected in 0.15 seconds ====================
```


With `pytestmark = (pytest.mark.api, pytest.mark.good)`:
```
==================================== ERRORS =====================================
____________________ ERROR collecting tests/test_api_good.py ____________________
env\lib\site-packages\_pytest\runner.py:226: in from_call
    result = func()
env\lib\site-packages\_pytest\runner.py:289: in <lambda>
    call = CallInfo.from_call(lambda: list(collector.collect()), "collect")
env\lib\site-packages\_pytest\python.py:435: in collect
    self._inject_setup_module_fixture()
env\lib\site-packages\_pytest\python.py:447: in _inject_setup_module_fixture
    setup_module = _get_non_fixture_func(self.obj, "setUpModule")
env\lib\site-packages\_pytest\python.py:255: in obj
    self.own_markers.extend(get_unpacked_marks(self.obj))
env\lib\site-packages\_pytest\mark\structures.py:244: in get_unpacked_marks
    return normalize_mark_list(mark_list)
env\lib\site-packages\_pytest\mark\structures.py:259: in normalize_mark_list
    raise TypeError("got {!r} instead of Mark".format(mark))
E   TypeError: got (MarkDecorator(mark=Mark(name='api', args=(), kwargs={})), MarkDecorator(mark=Mark(name='good', args=(), kwargs={}))) instead of Mark
!!!!!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!!!!
==================== 19 deselected, 1 error in 0.27 seconds =====================
```
2019-03-21 15:14:28 -04:00
Daniel Hahler 751c061d9a Merge master into features 2019-03-19 01:07:10 +01:00
smheidrich 519157cfcf Minor grammar fixes in pytest.mark.xfail docs 2019-03-17 10:14:40 +01:00
Miro Hrončok 2af0a023c9 Pin sphinx-removed-in to >= 0.2.0 to support Sphinx 2.0
Fixes https://github.com/pytest-dev/pytest/issues/4912
2019-03-15 10:56:13 +01:00
Daniel Hahler 7afe17740f Merge master into features 2019-03-15 00:52:12 +01:00
Miro Hrončok 134b957bf4 Remove deprecated Sphinx directive add_description_unit()
Partial solution for https://github.com/pytest-dev/pytest/issues/4912
2019-03-14 12:16:59 +01:00
Daniel Hahler f4bcb44025 docs: pin Sphinx to <2.0
Ref: https://github.com/pytest-dev/pytest/issues/4912
2019-03-13 02:36:15 +01:00
Bruno Oliveira 492cc4219c Prepare release 4.3.1 2019-03-11 12:59:54 -03:00
Kyle Altendorf 2d43f42769 Add missing plugin hooks to docs
pytest-dev/pytest#4896
2019-03-08 09:24:01 -05:00
Daniel Hahler 76687030f0 Merge branch 'master' into merge-master-into-features
Conflicts:
	appveyor.yml
	setup.py
2019-03-05 19:07:36 +01:00
Bruno Oliveira dac164cc99 Add missing ref docs to tmp_path and tmp_path_factory 2019-03-01 17:09:07 -03:00
Daniel Hahler fec656b3b1
Apply suggestions from code review
Co-Authored-By: nicoddemus <nicoddemus@gmail.com>
2019-02-27 07:46:03 -03:00
Bruno Oliveira 16cbb3196c Document how to disable caching rewritten .pyc files to disk
Also changed how the section is presented: instead of "Note" blocks, use proper
sections as those contain enough information to exist on their own.

Fix #1680
2019-02-26 20:42:59 -03:00
Daniel Hahler 29112d7e0b Merge master into features 2019-02-26 11:48:10 +01:00
Zac-HD d9bdf5cfca Clarify docs on --strict marks 2019-02-25 22:30:49 +11:00
Bruno Oliveira a0207274f4 -p option now can be used to early-load plugins by entry-point name
Fixes #4718
2019-02-24 13:20:17 -03:00
Bruno Oliveira 2e210acd00
Merge pull request #4819 from Handsome2734/doc-fix
add notice to use [tool:pytest] in setup.cfg
2019-02-24 12:16:30 -03:00
Bruno Oliveira 3e11bd0d6e
Update wording about [tool:pytest] in setup.cfg files 2019-02-23 15:32:42 -03:00
Bruno Oliveira 6a4c7063fd Fix docs about pytest conventions for test functions
Fix #4818
2019-02-23 15:22:27 -03:00
songbowen 15fe60aa25 add notice to use [tool:pytest] in setup.cfg 2019-02-24 00:24:56 +08:00
Bruno Oliveira e1aeb6915e Fix linting 2019-02-21 13:27:12 -03:00
Bruno Oliveira e75915bb73
Revert recommending virtualenv for Python 3.4
`venv` is already available in Python 3.4, my mistake
2019-02-21 13:03:19 -03:00
Bruno Oliveira ba2a43266a
Mention that virtualenv should be used for Python 3.4 as well 2019-02-21 12:52:09 -03:00
Jeff Hale cfaa8bbee8
recommend venv or virtualenv, depending on python version
venv has been installed with Python since 3.3.  https://docs.python.org/3/library/venv.html
2019-02-21 10:50:49 -05:00
Jeff Hale 6b661795cf
update links.inc to include both venv and virtualenv 2019-02-21 10:41:59 -05:00
Jeff Hale fa65b71c98
Merge pull request #1 from discdiver/discdiver-patch-1
update links for virtualenv -> venv
2019-02-20 15:41:39 -05:00
Jeff Hale da5dec83f6
update links for virtualenv -> venv 2019-02-20 15:36:34 -05:00
Jeff Hale 2ef3cb2510
Recommend use venv instead of virtualenv
From the Python docs:
"Changed in version 3.5: The use of venv is now recommended for creating virtual environments."
-https://docs.python.org/3/library/venv.html
2019-02-20 15:33:48 -05:00
Zac Hatfield-Dodds c8a87e48ab
Merge pull request #4783 from gyermolenko/fix_syntax_highlighting_for_two_rst_docs
Fix sphinx code-block types (syntax highlighting) in two docs
2019-02-20 06:31:10 +11:00
Daniel Hahler ff015f6308 Fix docs (tox -e regen, plus pre-commit) 2019-02-18 18:46:03 +01:00
Bruno Oliveira 31c869b4c4 Preparing release version 4.3.0 2019-02-16 14:11:58 +00:00
Bruno Oliveira 0395996756 Merge remote-tracking branch 'upstream/master' into release-4.3.0 2019-02-16 14:06:51 +00:00
Bruno Oliveira 986dd84375
LoggingPlugin: Support to customize log_file from hook (#4752)
LoggingPlugin: Support to customize log_file from hook
2019-02-16 12:01:21 -02:00
Andras Mitzki e3824d23bc LoggingPlugin: Expose setting log_file_handler
- This patch allows to set log_file (path) from hook

Signed-off-by: Thomas Hisch
Signed-off-by: Andras Mitzki <andras.mitzki@balabit.com>
2019-02-15 16:05:10 +01:00
Grygorii Iermolenko 59f69dd9e7 Add good talk by Andrew Svetlov 2019-02-15 15:37:18 +02:00
Grygorii Iermolenko 6e1ee0802f Fix sphinx code-block types for remaining rst docs 2019-02-15 15:10:37 +02:00
Grygorii Iermolenko 5cf58a9ae9 Revert '$' changes to not trigger regendoc 2019-02-15 14:09:37 +02:00
Bruno Oliveira 4bc2f96c93 Remove 'message' parameter docs from assert.rst
As per:

	https://github.com/pytest-dev/pytest/issues/3974#issuecomment-463462732

Also made the 'match' parameter more prominent
2019-02-14 08:32:49 -02:00
Daniel Hahler 7b91952645 Merge master into features
Conflicts:
	tox.ini
2019-02-13 17:58:16 +01:00
Grygorii Iermolenko 799bcccd1b Fix sphinx code-block types (syntax highlighting) in two docs 2019-02-13 17:08:49 +02:00
Bruno Oliveira 82cc3d8cc2 Preparing release version 4.2.1 2019-02-12 20:17:06 +00:00
Kevin J. Foley aee67bb1a7 Clarify pytest_assertrepr_compare docs per #4759 2019-02-10 08:34:35 -05:00
Bruno Oliveira 7f6108beb1 Add ref docs for junit_family option 2019-02-08 21:44:52 -02:00
Daniel Hahler fc8800c71f
Merge pull request #4722 from fetzerch/ignore_wildcards
Add ability to use globs when using --ignore
2019-02-09 00:11:04 +01:00
Ronny Pfannschmidt 526f4a95cc
Merge pull request #4735 from kohr-h/pytest_plugins_module_name
Mention that `pytest_plugins` should not be used as module name
2019-02-07 07:07:58 +01:00
Bruno Oliveira 2f083504ee
Merge pull request #4709 from namurphy/warns-docs
Document how to customize test failure message for missing warnings
2019-02-06 20:51:14 -02:00
Holger Kohr 7445b5345f Mention that `pytest_plugins` should not be used as module name 2019-02-06 21:57:42 +01:00
Christian Fetzer 1876a928d3 Document collect_ignore and collect_ignore_glob in reference 2019-02-06 17:15:30 +01:00
Christian Fetzer 2dc2a19db5 Add ability to exclude files matching glob patterns in conftest.py
This adds the `collect_ignore_glob` option for `conftest.py` to allow
Unix-style wildcards for excluding files.
2019-02-06 16:49:43 +01:00
Christian Fetzer fc5d4654e5 Add ability to exclude files matching glob patterns with --ignore-glob
This adds the `--ignore-glob` option to allow Unix-style wildcards so
that `--ignore-glob=integration*` excludes all tests that reside in
files starting with `integration`.

Fixes: #3711
2019-02-06 11:29:30 +01:00
Bruno Oliveira 584c052da4 Fix linting and change False to True as requested in review 2019-02-05 19:04:26 -02:00
Anthony Sottile 2264db7f4a
Merge pull request #4682 from arel/parameterize-conditional-raises-document-only
Document parametrizing conditional raises
2019-02-02 13:15:26 -08:00
Nick Murphy f0ecb25acd Document custom failure messages for missing warnings 2019-02-01 21:48:29 -05:00
Arel Cordero 7ec1a1407a Incorporating feedback from asottile 2019-02-02 01:57:17 +00:00
Bruno Oliveira fa979a4290 Preparing release version 4.2.0 2019-01-30 14:25:38 -02:00
Bruno Oliveira ade5f2c8c5 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-01-29 19:36:56 -02:00
Arel Cordero 8a1afe4213 Including note on using nullcontext in Python 3.7+ 2019-01-28 13:31:08 +00:00
Arel Cordero fd4289dae0 Adding `does_not_raise` to documentation only 2019-01-27 16:42:10 +00:00
Arel Cordero 977adf1354 Improving sphinx docs based on feedback 2019-01-27 16:41:23 +00:00
Arel Cordero c166b80a8c Documenting raises/does_not_raise + parametrize 2019-01-27 16:40:49 +00:00
Bruno Oliveira 067f2c6148 Improve pytest.raises 'message' deprecation docs
Based on recent discussions in #3974
2019-01-24 20:41:18 -02:00
Bruno Oliveira daf39112e7
Merge pull request #4091 from nicoddemus/setup-methods-as-fixtures-3094
Use fixtures to invoke xunit-style fixtures
2019-01-23 19:23:31 -02:00
Anthony Sottile 92a2c1a9c4 remove and ban py.io.BytesIO, py.process, py.path.local.sysfind 2019-01-21 19:51:16 -08:00
Bruno Oliveira e2a9aaf24b Add docs page about plans for dropping py27 and py34
Fix #4635
2019-01-14 22:10:15 -02:00
Bruno Oliveira e48f68953d
Merge pull request #4638 from nicoddemus/release-4.1.1
Preparing release version 4.1.1
2019-01-12 12:51:32 -02:00
Bruno Oliveira 25081d8e30
Merge pull request #4570 from nicoddemus/sphinx-removed-in
Use sphinx removed in extension in the documentation
2019-01-12 08:34:29 -02:00
Bruno Oliveira 34eeda1c09 Preparing release version 4.1.1 2019-01-12 00:55:12 +00:00
Bruno Oliveira 0f918b1a9d xunit-style functions and methods are invoked by autouse fixtures
Fix #3094, Fix #517
2019-01-10 12:10:04 -02:00
Bruno Oliveira 9f6d9efc1d Mention PYTHONPATH semantics in goodpractices.rst
Fix #4625
2019-01-09 22:45:09 -02:00
Yoav Caspi 2467831913 rephrase warning section to explain better the issue. 2019-01-09 23:52:08 +02:00
Yoav Caspi 6ee5d431a0 add warning for using non canonical configuration files. 2019-01-06 23:11:24 +02:00
Bruno Oliveira 38adb23bd2
Merge pull request #4600 from nicoddemus/release-4.1.0
Release 4.1.0
2019-01-06 13:09:11 -02:00
Bruno Oliveira e24031fb36 Regendocs again, without hypothesis 2019-01-05 20:42:44 +00:00
Bruno Oliveira 99ef8c6d16 Fix typo in Makefile: PYTEST_ADDOPT -> PYTEST_ADDOPTS 2019-01-05 20:31:01 +00:00
Bruno Oliveira d7465895d0 Regendoc again 2019-01-05 19:19:40 +00:00
Bruno Oliveira 01151ff566 Add example for -ra usage to the docs 2019-01-05 16:53:12 -02:00
Bruno Oliveira d0e9b4812f Regendocs 2019-01-05 16:38:59 -02:00
Bruno Oliveira 9d297c06e8 Preparing release version 4.1.0 2019-01-05 16:38:59 -02:00
Anthony Sottile e24fdb138d
Merge pull request #4598 from nicoddemus/license-year
Update copyright year
2019-01-05 09:09:55 -08:00
Bruno Oliveira 7f671586b0 Update copyright year 2019-01-04 10:37:07 -02:00
David Vo 9e62f9d64e
Fix PEP 565 typo in warnings.rst 2019-01-04 11:50:36 +11:00
Bruno Oliveira 81c2780d2b Move Node.get_marker and markname deprecations next to the other 4.0 ones 2019-01-02 19:37:17 -02:00
Bruno Oliveira b39b69a730 Use sphinx-removed-in extension in the documentation
Fix #4568
2019-01-02 19:34:46 -02:00
Bruno Oliveira 30c7a7bd69 Merge remote-tracking branch 'upstream/master' into features 2019-01-02 19:16:18 -02:00
Adam Johnson 388aff16c8 Improve detailed summary report docs
The existing examples had 0 tests collected so didn't show the actual summary report. Also I added a section explaining the difference between `p` and `P`.
2018-12-29 11:47:39 +00:00
Anthony Sottile 2dc8cc1e48
Remove out of date dependencies list in docs
Was scrolling through the docs and noticed this, I figure it's easier to remove this than try and keep it in sync with setup.py
2018-12-25 20:46:48 -05:00
Randy Barlow b2c4ed9a2b
Remove an extraneous comma from the docs.
Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
2018-12-21 17:53:28 -05:00
Ronny Pfannschmidt 8f8d3114dd apply suggested enhancements in deprecations.rst 2018-12-21 14:02:38 +01:00
Ronny Pfannschmidt 64a353f2b6 update deprecation docs 2018-12-21 14:02:38 +01:00
Ronny Pfannschmidt b258764ffe fix docs 2018-12-21 14:02:38 +01:00
Hyunchel Kim ece01b0f56 Update cache documentation example to correctly show cache hit and miss 2018-12-21 04:43:26 +00:00
Bruno Oliveira c378cb4793 Remove support for applying marks to values in parametrize
Fix #3082
2018-12-20 16:16:13 -02:00
Bruno Oliveira a93f41233a Raise an error if pytest_plugins is defined in a non-top-level conftest.py file
Fix #4548
2018-12-19 18:09:47 -02:00
Bruno Oliveira 9138419379 Remove support for '[pytest]' section in setup.cfg file
Fix #3086
2018-12-19 17:43:17 -02:00