d7f082519a
Merge remote-tracking branch 'upstream/master' into mm
...
Conflicts:
src/_pytest/outcomes.py
2019-08-15 10:03:52 -03:00
3eb4973065
remove %s formatting from docs
2019-08-12 00:09:53 -06:00
b095e0de47
Improve docs of pytest.importorskip
2019-08-09 21:35:03 +02:00
2f065a555f
Merge remote-tracking branch 'upstream/master' into release-5.1.0
2019-08-09 12:36:19 -03:00
7560a7b808
trivial doc change
2019-08-07 21:49:30 -06:00
78de9d4677
replace implicit code tag with colon .replace("::\n\n.. code-block", ":\n\n.. code-block")
2019-08-06 16:20:06 -07:00
23a0b532db
Revert "remove implicit code tags .replace("::\n\n.. code-block", "\n\n.. code-block")"
...
This reverts commit 9fce0bdd88
2019-08-06 16:18:06 -07:00
9fce0bdd88
remove implicit code tags .replace("::\n\n.. code-block", "\n\n.. code-block")
2019-08-06 15:46:57 -07:00
5f95dce956
ran blacken-docs
2019-08-06 13:34:58 -07:00
75d0b899bb
ran pyupgrade-docs again
2019-08-06 13:33:21 -07:00
7f90e74e02
label code blocks
2019-08-06 13:25:54 -07:00
cf7761f91f
ran pyupgrade-docs
2019-08-06 12:40:27 -07:00
f43b54aaeb
Add CHANGELOG for 4.6.5 ( #5696 )
2019-08-05 15:09:31 -03:00
aa06e6c8f3
Merge master into features
2019-08-05 19:12:32 +02:00
1a66a503b6
Merge pull request #5690 from nicoddemus/custom-exit-code-docs
...
Mention pytest-custom_exit_code in the docs
2019-08-04 19:10:36 -07:00
0d5ed57b40
Added info to access exitcodes directly
2019-08-04 22:35:51 +05:30
8db6642515
Mention pytest-custom_exit_code in the docs
...
Related to #5689
2019-08-03 10:15:56 -03:00
b5b710b3ae
Merge master into features
...
Several conflicts, mostly due to 2c402f4bd
2019-08-02 16:52:51 +02:00
2ca47cb3f5
programatically -> programmatically
2019-08-01 15:11:26 +02:00
cb15e7c700
Merge pull request #5674 from helloocc/master
...
Doc fix: remove redundant parentheses.
2019-07-30 10:46:29 +02:00
2959fb3198
Doc fix: remove redundant parentheses.
2019-07-30 16:18:22 +08:00
50c7b5d2b5
fix setenv prepend docs ( #5658 )
...
fix setenv prepend docs
2019-07-24 20:11:05 -03:00
3bdcd6b4f3
Update doc/en/monkeypatch.rst
2019-07-24 20:49:31 +01:00
d89c88478d
Merge pull request #5657 from helloocc/master
...
Doc fix: delete useless.
2019-07-24 15:22:58 -03:00
635916052c
fix setenv prepend docs
2019-07-24 17:23:48 +01:00
28343bdcbd
Merge remote-tracking branch 'upstream/master'
2019-07-24 23:35:22 +08:00
ebfe8eabf5
Update doc/en/monkeypatch.rst
2019-07-24 14:27:51 +01:00
829cc5a242
fix docs about syspath_prepend
...
eg it does not modify $PATH
2019-07-24 14:27:05 +01:00
f163b37f6a
Run regen
2019-07-23 10:00:35 -04:00
1873dc6a8a
Fix fixture example in docs
2019-07-23 09:48:22 -04:00
6e687c4354
Doc fix: m1 isn't a dependency of f1.
...
According to the file in `example/fixtures/test_fixtures_order.py`, m1 isn't a dependency of f1.
2019-07-23 15:09:32 +08:00
66cfc66d63
Update index.rst
2019-07-22 16:01:56 +08:00
c0231ae780
Add info about open training in Leipzig
2019-07-18 21:06:53 +02:00
157515f3c5
Fix/Remove broken links ( #5613 )
...
Fix/Remove broken links
2019-07-17 13:52:05 -03:00
183750fa86
CSS changes to the API reference ( #5609 )
...
CSS changes to the API reference
2019-07-17 06:24:31 -03:00
1e34734f8f
Fixed link to Python Classifiers
2019-07-16 21:56:04 +02:00
7c2e843358
Fixed link to correct anchor of Python's -w postion
2019-07-16 21:56:04 +02:00
79414164c2
Fixed broken links in adopt.rst
2019-07-16 21:56:03 +02:00
0cca7f831a
Fixed broken links and non-existing anchors in release announcements
2019-07-16 21:56:03 +02:00
1f4ae789b8
Change link to "Where do Google's flaky tests come from?"
...
Although it's available, linkchecker complained about it.
It was changed to the permanent redirect.
2019-07-16 21:56:03 +02:00
3f46315a9d
Remove link to non-existing anchor
2019-07-16 21:56:03 +02:00
e03b8b9e95
Update/Fix links to using projects
2019-07-16 21:56:03 +02:00
eb7f950e20
Fixed broken link to virtualenv
2019-07-16 21:56:03 +02:00
7440cece59
Merge pull request #5589 from graingert/fixture-yield-exit-stack
...
de-emphasize request.addfinalizer Fixes #5587
2019-07-16 18:33:59 +01:00
d9eab12ee0
Remove Europython training
2019-07-16 15:03:54 +02:00
bb7608c56f
Change section titles in docs
2019-07-15 16:25:33 +02:00
3ad315bcee
Improve CSS layout of API reference
2019-07-15 16:15:59 +02:00
a96710dd8a
demonstrate ExitStack assuming connect returns a context manager
2019-07-15 14:05:19 +01:00
01606315aa
More CSS fine-tuning
2019-07-15 13:40:30 +02:00
da5add1294
Improve CSS layout
2019-07-14 18:58:07 +02:00
d23fbab188
Add autouse fixture order information ( #3404 ).
...
A case with a fixture use both as an autouse and explititly
was raised. This case sounds too narrow to add to documentation
(and could be misleading for people learning pytest with explicitely
using an autouse fixture). At the same time there was no documentation
on the autouse vs regular fixture order, therefore this commit adds
such an information. Code sample grew and it was extracted to the file.
2019-07-13 11:43:47 +02:00
666acc9b7a
doctest: Add +NUMBER option to ignore irrelevant floating-point… ( #5576 )
...
doctest: Add +NUMBER option to ignore irrelevant floating-point differences
2019-07-11 07:25:37 -03:00
a740ef2036
docs: Document doctest +NUMBER limitation with strings
...
Also added an "xfail" testcase for the same.
2019-07-11 10:06:57 +01:00
c224c4f1d6
de-emphasize request.addfinalizer
2019-07-10 14:52:40 +01:00
31738155b5
Remove deprecated features ( #5529 )
...
Remove deprecated features
2019-07-09 19:04:06 -03:00
628ff4d619
Improve docs sidebar layout ( #5568 )
...
Improve docs sidebar layout
2019-07-08 19:24:48 -03:00
9b78a216a2
Remove unused import
2019-07-08 19:08:09 -03:00
2a23fdab9f
docs: Tidy up doctest options section
...
* Move the parts about "how to configure it" (pytest.ini vs. inline
comment) together.
* Move `--doctest-continue-on-failure` into its own sub-heading, as it
isn't related to the doctest optionflags.
2019-07-08 17:07:58 +01:00
aaa7e837cc
doctest: Add +NUMBER option to ignore irrelevant floating-point differences
...
When enabled, floating-point numbers only need to match as far as the
precision you have written in the expected doctest output. This avoids
false positives caused by limited floating-point precision, like this:
Expected:
0.233
Got:
0.23300000000000001
This is inspired by Sébastien Boisgérault's [numtest] but the
implementation is a bit different:
* This implementation edits the literals that are in the "got"
string (the actual output from the expression being tested), and then
proceeds to compare the strings literally. This is similar to pytest's
existing ALLOW_UNICODE and ALLOW_BYTES implementation.
* This implementation only compares floats against floats, not ints
against floats. That is, the following doctest will fail with pytest
whereas it would pass with numtest:
>>> math.py # doctest: +NUMBER
3
This behaviour should be less surprising (less false negatives) when
you enable NUMBER globally in pytest.ini.
Advantages of this implementation compared to numtest:
* Doesn't require `import numtest` at the top level of the file.
* Works with pytest (if you try to use pytest & numtest together, pytest
raises "TypeError: unbound method check_output() must be called with
NumTestOutputChecker instance as first argument (got
LiteralsOutputChecker instance instead)").
* Works with Python 3.
[numtest]: https://github.com/boisgera/numtest
2019-07-08 17:07:58 +01:00
71c8ca7d3d
Improve sidebar layout
2019-07-07 20:32:09 +02:00
56a0dd7658
Update doc footer/copyright
2019-07-07 20:23:56 +02:00
bb29f31d22
Preparing release version 5.0.1
2019-07-04 20:01:16 -04:00
b08ae4449b
Add docs about Tidelift and OpenCollective ( #5527 )
...
Add docs about Tidelift and OpenCollective
2019-07-04 07:38:17 -03:00
776a632170
Merge pull request #5540 from bazcrown/yml2yaml
...
Substituted 'yml' to '.yaml' in relevant files
2019-07-03 18:47:26 -04:00
2b9522e9da
remove documentation about setuptools integration Refs #5534
...
integrating with `python setup.py test` is not good practice!
2019-07-03 16:42:53 +01:00
9677099acf
Add upcoming trainings
2019-07-03 14:50:32 +02:00
1b0e8d73d5
Substituted 'yml' to '.yaml' in relevant files
2019-07-02 23:49:06 -07:00
fa9791127a
Added talk about pytest in PyBCN June 2019
...
Added talk about pytest in PyBCN June 2019
2019-07-02 23:18:52 +02:00
2d9b432613
Add docs about Tidelift and OpenCollective
...
Give an overview of how we as an organization will use the donated money,
as well as show this information more prominently in the docs.
2019-06-30 14:13:30 -03:00
c470ade0a5
Remove 'RemovedInPytest4Warning'
2019-06-30 13:31:39 -03:00
7e58defc15
Remove 'pytest.config'
2019-06-30 13:18:07 -03:00
13f7f27fd2
Remove 'message' parameter from pytest.raises
2019-06-30 13:18:06 -03:00
279733a30b
Remove support for 'code as string' from pytest.raises and pytest.warns
2019-06-30 11:40:24 -03:00
d4a76a0b99
doc(plugin_hooks): Improve documentation for writing plugin hoo… ( #5517 )
...
doc(plugin_hooks): Improve documentation for writing plugin hooks.
2019-06-29 09:39:49 -03:00
789a3662ce
Fix linting
2019-06-29 09:11:09 -03:00
93a68cdfb4
doc(plugin_hooks): Improve documentation for writing plugin hooks.
2019-06-29 14:02:53 +02:00
844d660d5c
Merge pull request #5520 from asottile/release-4.6.4
...
Preparing release version 4.6.4
2019-06-28 19:09:10 -07:00
58bfc7736f
Use shutil.which to avoid distutils+imp warning
2019-06-28 14:44:49 -07:00
55d2fe076f
Use importlib instead of imp in demo
2019-06-28 14:40:10 -07:00
5e39eb91bb
Correct Zac-HD's name in changelogs
2019-06-28 14:40:10 -07:00
fd2f320485
Preparing release version 5.0.0
2019-06-28 14:39:53 -07:00
37fb50a3ed
Features assertion pass hook ( #3479 )
...
Features assertion pass hook
2019-06-26 21:14:19 -03:00
3afee36ebb
Improve docs and reference
2019-06-26 19:15:00 -03:00
ed85c83154
Deprecate funcargnames alias
2019-06-26 08:53:17 +10:00
3f5b078462
Merge pull request #5441 from nicoddemus/faulthandler-5440
...
Integrate pytest-faulthandler into the core
2019-06-24 20:01:15 -03:00
3ce31b6370
Change pytest-faulthandler for simplification
...
* The --no-faulthandler option is not necessary given that we can use
`-p no:faulthandler`.
* The `--faulthandler-timeout` command-line option has become an ini
option, for the reasons described in
https://github.com/pytest-dev/pytest-faulthandler/issues/34 and
users can still set it from the command-line.
Fix pytest-dev/pytest-faulthandler#34
2019-06-22 19:22:43 -03:00
a37b902afe
Integrate pytest-faulthandler into the core
...
* Add pytest-faulthandler files unchanged
* Adapt imports and tests
* Add code to skip registration of the external `pytest_faulthandler`
to avoid conflicts
Fix #5440
2019-06-21 21:02:24 -03:00
12b76b6261
Update cache.rst
2019-06-21 15:48:59 -07:00
0627d92df2
fix typos in the resolution of #5125
2019-06-17 20:35:23 +02:00
1cfea5f1b3
add ExitCode reference in usage
2019-06-15 21:41:55 +02:00
103d6146b0
document exitcode members
2019-06-15 17:18:21 +02:00
701d0351a6
Add missing 'e' to test_mod(e).
2019-06-13 06:01:30 +02:00
ede8b87560
Merge pull request #5438 from nicoddemus/result-log-deprecation
...
Postpone removal of --result-log to pytest 6.0
2019-06-12 10:45:02 -07:00
52780f39ce
Postpone removal of --result-log to pytest 6.0
...
As we did not provide an alternative yet, it is better to postpone
the actual removal until we have provided a suitable and stable
alternative.
Related to #4488
2019-06-12 08:26:11 -03:00
18c2ff6625
Merge pull request #5435 from asottile/release-4.6.3
...
Preparing release version 4.6.3
2019-06-11 09:59:05 -07:00
918268774b
Add `slow` marker in run/skip option example.
...
The example implementation of a `--runslow` option results in
a `PytestUnknownMarkWarning`. Include registering the custom
mark in the example, based on the documentation in markers.rst.
2019-06-06 10:15:43 -07:00
be2be040f9
Clean up u' prefixes and py2 bytes conversions
2019-06-04 17:50:34 -07:00
2a3d643bdf
Documentation: expansion of Monkeypatch to include mocked classes and dictionaries ( #5315 )
...
Documentation: expansion of Monkeypatch to include mocked classes and dictionaries
2019-06-03 19:30:29 -03:00
9657166a22
Merge pull request #5379 from asottile/release-4.6.2
...
Preparing release version 4.6.2
2019-06-03 12:19:42 -07:00
1d6bbab2b0
Add a new Exceptions section in documentation and document UsageError
2019-06-03 14:23:56 -03:00
4df529e5b9
Clean up __future__ and coding: in tests
2019-06-03 12:08:02 -03:00
a91fe1fedd
pre-commit run pyupgrade --all-files
2019-06-03 12:08:02 -03:00
5034399d7a
pre-commit run fix-encoding-pragma --all-files
2019-06-03 12:08:01 -03:00
28ac469eaa
Merge pull request #5367 from apollovy/master
...
Fix typo about interpreters count in doc/en/example/parametrize.html
2019-06-02 20:43:53 -03:00
5999782768
Use python 3 interpreters in example
2019-06-02 19:20:00 -03:00
6e68532bb3
Merge pull request #5362 from asottile/release-4.6.1 ( #5365 )
...
Merge pull request #5362 from asottile/release-4.6.1
2019-06-02 19:17:29 -03:00
5c016d1021
Fix typo about interpreters count in doc/en/example/parametrize.html
2019-06-02 23:57:22 +03:00
642ef6dc1b
Merge pull request #5362 from asottile/release-4.6.1
...
Preparing release version 4.6.1
2019-06-02 11:47:26 -07:00
4d49ba6529
Drop Python 2.7 and 3.4 support
...
* Update setup.py requires and classifiers
* Drop Python 2.7 and 3.4 from CI
* Update docs dropping 2.7 and 3.4 support
* Fix mock imports and remove tests related to pypi's mock module
* Add py27 and 34 support docs to the sidebar
* Remove usage of six from tmpdir
* Remove six.PY* code blocks
* Remove sys.version_info related code
* Cleanup compat
* Remove obsolete safe_str
* Remove obsolete __unicode__ methods
* Remove compat.PY35 and compat.PY36: not really needed anymore
* Remove unused UNICODE_TYPES
* Remove Jython specific code
* Remove some Python 2 references from docs
Related to #5275
2019-06-02 14:39:11 -03:00
e2ac4b782a
Fix link anchor
2019-06-01 23:27:20 +03:00
e7cd00ac92
Preparing release version 4.6.0
2019-05-31 23:12:57 -07:00
f9cafd1c94
Add missing junitxml ini options to the reference docs
2019-05-29 21:13:16 -03:00
2dfbed11b4
fix path expansion example
2019-05-27 23:23:18 -04:00
24c95c78e7
add updated monkeypatch examples
2019-05-27 20:55:15 -04:00
e38561037d
Update docs about py27 and py34 support plans
...
As discussed in #5275
2019-05-27 19:28:27 -03:00
66f20b6f5e
Fix invalid Python file encoding "utf8" ( #5252 )
...
Fix invalid Python file encoding "utf8"
2019-05-23 20:24:23 -03:00
45c894b73f
Merge pull request #5297 from nicoddemus/tidelift-contents
...
Add link to tidelift to the main docs
2019-05-21 08:18:07 -07:00
d391274f39
Add link to tidelift to the main docs
...
As commented in:
https://github.com/pytest-dev/pytest/pull/5240#issuecomment-494175451
2019-05-21 11:12:07 -03:00
c5fa1d1c3e
Update fixture.rst
...
add a missing import
2019-05-21 09:40:31 +03:00
858010e214
Fixed double `be` word on monkeypatch docs page.
2019-05-16 18:22:41 +10:00
e44a2ef653
Apply suggestions from code review
...
Co-Authored-By: Daniel Hahler <github@thequod.de>
2019-05-15 20:45:22 -03:00
c6e3ff3ce5
Mention "-m" in the main mark docs
2019-05-15 20:45:22 -03:00
a31098a74e
Move section about mark revamp and iteration to historical notes
...
This has been in place for a long time now, since 3.6.
2019-05-15 20:45:22 -03:00
7e8044f9b8
Revamp the mark section in the docs
...
Add an introductory section about how to register marks,
including doing so programatically (#5255 ).
2019-05-15 20:45:22 -03:00
dc75b6af47
Use fix-encoding-pragma pre-commit hook
2019-05-14 15:56:31 -07:00
e668aaf885
Fix indentation and use code-block directives
...
The code-block directives are required by our blacken-docs hook
2019-05-14 18:59:27 -03:00
ecd072ea94
add env example to monkeypatch docs
2019-05-12 09:52:22 -04:00
63fe547d9f
Preparing release version 4.5.0
2019-05-11 16:35:32 +00:00
465b2d998a
Further "unknown marks warning" improvements ( #5178 )
...
Further "unknown marks warning" improvements
2019-05-11 13:28:10 -03:00
73bbff2b74
Introduce record_testsuite_property fixture
...
This exposes the functionality introduced in fa6acdcFix #5202
2019-05-10 19:44:27 -03:00
0594dba5ce
Remove unused markers and enable --strict-markers
2019-05-09 19:36:39 -03:00
685ca96c71
Change ``--strict`` to ``--strict-markers``, preserving the old one
...
Fix #5023
2019-05-09 19:36:38 -03:00
ccf6c3cb46
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2019-05-09 19:22:40 -03:00
5d7686951c
Run regendoc
2019-05-08 21:50:08 +00:00
80c5f6e609
Ignore PytestUnknownMark warnings when regen docs
...
A lot of our examples use custom markers to make a point and showcase
features, which generates a lot of warnings
2019-05-08 21:46:26 +00:00
3ac43314ee
Preparing release version 4.4.2
2019-05-08 12:46:14 -03:00
d1a48ad68f
Use exec directly
2019-05-06 23:07:39 -07:00
784e1e3b7e
Add links to pytest.raises `message` workaround
...
Related to #3974
2019-05-06 12:35:27 -03:00
9f66102869
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2019-05-04 10:47:57 -03:00
254b195f50
Fix a typo
2019-05-03 22:30:20 -07:00
af40473c9a
Add quick note about accessing config through session or item objects
...
Fix #5030
2019-05-01 11:46:35 -03:00
204004c8b8
Review doctest docs ( #5183 )
...
Review doctest docs
2019-04-29 08:02:59 -03:00
772a4a5cf3
Remove all version references to obsolete pytest versions ( #5184 )
...
Remove all version references to obsolete pytest versions
2019-04-29 08:02:32 -03:00
e943aff995
Update blurb about Sybil
2019-04-28 20:01:22 -03:00
9c5da9c0d1
Remove all version references to obsolete pytest versions
...
Remove version references to pytest 2 and 3.
Just like Python 3 no longer has references to Python 2, I think
we should follow the same approach in pytest.
2019-04-28 12:37:58 -03:00
f6ab6d71ad
Run regendoc
2019-04-28 12:17:15 -03:00
67755d67fb
Review doctest docs
...
* Add pytest.skip() example
* Add blurb about Sybil
* Create a subsection for doctest-options
* Create a subsection for pytest-specific features
2019-04-28 12:17:15 -03:00
53cd7fd2ea
Introduce new warning subclasses
...
Fix #5177
2019-04-28 10:38:25 -03:00
8532e991a5
Publish UnknownMarkWarning as part of the public API and docs
2019-04-28 10:16:07 -03:00
50937fe622
Add note about pytest_load_initial_conftests working only from plugins
...
Fix #5175
2019-04-27 10:12:27 -03:00
7f519f8ab7
Merge master into features
2019-04-27 00:43:00 +02:00
0e651d7297
[Docs] Fix typo in skipping.rst
...
One of the `pytest.mark.skipif` blocks does not use the `reason` kwarg.
2019-04-16 09:30:13 -07:00
8d3a5dcd1b
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2019-04-15 14:47:45 -03:00
006dc30476
Preparing release version 4.4.1
2019-04-15 14:24:17 +00:00
6f0a5789fb
Merge master into features
2019-04-14 23:22:21 +02:00
8449294e5d
blacken-docs more code samples in docs
2019-04-12 04:50:26 -07:00
42e60d935a
doc/changelog
2019-04-11 11:44:04 +02:00
1f66e3b0d0
docs: tbreportdemo: remove obsolete comment
2019-04-11 11:39:23 +02:00
eb5b2e0db5
Support glob argument with ``--cache-show``
2019-04-04 18:10:39 +02:00
8907fedc79
Merge master into features (with regen branch)
2019-04-03 22:11:00 +02:00
befc8a3f10
Update via https://github.com/pytest-dev/regendoc/pull/8
2019-04-03 22:08:44 +02:00
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
db34bf01b6
doc: minor whitespace, punctuation
2019-04-03 11:45:45 +02:00
9121138a1b
Emit warning for unknown marks
2019-04-01 10:40:18 +11:00
deade370b9
Update doc/en/mark.rst
...
Co-Authored-By: Zac-HD <Zac-HD@users.noreply.github.com>
2019-04-01 07:13:45 +11:00
bcc08ffe4d
More docs on registering marks
2019-03-31 14:22:30 +11: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
Bruno Oliveira
boris
Tim Hoffmann
Bruno Oliveira
Bruno Oliveira
Daniel Hahler
Anthony Sottile
Yash Todi
Semen Zhydenko
Florian Bruhin
Xixi Zhao
Thomas Grainger
helloocc
Oliver Bestwalter
Steffen Schroeder
Wojtek Erbetowski
David Röthlisberger
Michael Moore
Andreu Vallbona Plazas
Niklas Meinzer
Zac Hatfield-Dodds
curiousjazz77
Ronny Pfannschmidt
patriksevallius
Ralph Giles
Pulkit Goyal
Yuri Apollov
Hugo
Evan Kepner
oleg-yegorov
Nikita Krokosh
Don Kirkby
Douglas Thor
Daniel Hahler
Zac-HD
ApaDoctor
Brian Skinn
smheidrich
Miro Hrončok
Kyle Altendorf
songbowen