5935fbaa7a
doc/en/Makefile: stabilize output between regendoc versions
2019-04-03 22:07:33 +02:00
cec2dd6a7c
doc/en/Makefile: allow passing in REGENDOC_FILES
...
This allows for:
> make -C doc/en regen REGENDOC_FILES=example/parametrize.rst
2019-04-03 19:53:00 +02:00
266bf2c007
doc: make regen: replace trailing spaces already
2019-04-03 17:34:26 +02:00
8881b201aa
Preparing release version 4.4.0
2019-03-29 20:49:18 +00:00
3d9e68ecfd
Update doc/en/parametrize.rst
2019-03-28 00:07:28 +09:00
cf6e2ceafd
add ini option to disable string escape for parametrization
2019-03-28 00:07:28 +09:00
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
057c97812b
Merge pull request #4975 from blueyed/verbose-fixes
...
Fix usages of "verbose" option
2019-03-26 18:38:39 -03:00
52730f6330
doc: fix note about output capturing with pdb
...
[skip travis]
2019-03-26 18:33:00 +01:00
e1ae469504
Merge master into features
2019-03-26 10:23:21 +01:00
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
8e125c9759
doc/en/reference.rst: whitespace/alignment
2019-03-22 13:23:44 +01:00
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
751c061d9a
Merge master into features
2019-03-19 01:07:10 +01:00
519157cfcf
Minor grammar fixes in pytest.mark.xfail docs
2019-03-17 10:14:40 +01:00
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
7afe17740f
Merge master into features
2019-03-15 00:52:12 +01:00
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
f4bcb44025
docs: pin Sphinx to <2.0
...
Ref: https://github.com/pytest-dev/pytest/issues/4912
2019-03-13 02:36:15 +01:00
492cc4219c
Prepare release 4.3.1
2019-03-11 12:59:54 -03:00
2d43f42769
Add missing plugin hooks to docs
...
pytest-dev/pytest#4896
2019-03-08 09:24:01 -05:00
76687030f0
Merge branch 'master' into merge-master-into-features
...
Conflicts:
appveyor.yml
setup.py
2019-03-05 19:07:36 +01:00
dac164cc99
Add missing ref docs to tmp_path and tmp_path_factory
2019-03-01 17:09:07 -03:00
fec656b3b1
Apply suggestions from code review
...
Co-Authored-By: nicoddemus <nicoddemus@gmail.com>
2019-02-27 07:46:03 -03:00
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
29112d7e0b
Merge master into features
2019-02-26 11:48:10 +01:00
d9bdf5cfca
Clarify docs on --strict marks
2019-02-25 22:30:49 +11:00
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
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
3e11bd0d6e
Update wording about [tool:pytest] in setup.cfg files
2019-02-23 15:32:42 -03:00
6a4c7063fd
Fix docs about pytest conventions for test functions
...
Fix #4818
2019-02-23 15:22:27 -03:00
15fe60aa25
add notice to use [tool:pytest] in setup.cfg
2019-02-24 00:24:56 +08:00
e1aeb6915e
Fix linting
2019-02-21 13:27:12 -03:00
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
ba2a43266a
Mention that virtualenv should be used for Python 3.4 as well
2019-02-21 12:52:09 -03:00
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
6b661795cf
update links.inc to include both venv and virtualenv
2019-02-21 10:41:59 -05:00
fa65b71c98
Merge pull request #1 from discdiver/discdiver-patch-1
...
update links for virtualenv -> venv
2019-02-20 15:41:39 -05:00
da5dec83f6
update links for virtualenv -> venv
2019-02-20 15:36:34 -05:00
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
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
ff015f6308
Fix docs (tox -e regen, plus pre-commit)
2019-02-18 18:46:03 +01:00
31c869b4c4
Preparing release version 4.3.0
2019-02-16 14:11:58 +00:00
0395996756
Merge remote-tracking branch 'upstream/master' into release-4.3.0
2019-02-16 14:06:51 +00:00
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
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
59f69dd9e7
Add good talk by Andrew Svetlov
2019-02-15 15:37:18 +02:00
6e1ee0802f
Fix sphinx code-block types for remaining rst docs
2019-02-15 15:10:37 +02:00
5cf58a9ae9
Revert '$' changes to not trigger regendoc
2019-02-15 14:09:37 +02:00
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
Bruno Oliveira
ApaDoctor
Brian Skinn
smheidrich
Miro Hrončok
Bruno Oliveira
Kyle Altendorf
Daniel Hahler
Zac-HD
songbowen
Jeff Hale
Zac Hatfield-Dodds
Andras Mitzki
Grygorii Iermolenko