Bruno Oliveira
e6ea9edffe
Merge pull request #6673 from sscherfke/features
...
Reverse / fix meaning of "+/-" in error diffs
2020-02-12 15:05:38 -03:00
Ran Benita
c9f9664336
Merge branch 'features' into master
...
The features branch is no more. Development of features is now also done
on master.
See https://github.com/pytest-dev/pytest/pull/6571 .
2020-02-12 13:50:02 +02:00
Ran Benita
c3e53a072d
Switch to new git workflow
...
Co-Authored-By: Daniel Hahler <git@thequod.de>
2020-02-12 09:49:21 +02:00
Bruno Oliveira
78baa7b575
Merge remote-tracking branch 'upstream/master' into mm
...
Conflicts:
src/_pytest/main.py
src/_pytest/mark/structures.py
src/_pytest/python.py
testing/test_main.py
testing/test_parseopt.py
2020-02-11 19:22:28 -03:00
Ran Benita
d33da078a8
Move ExitCode's definition from _pytest.main to _pytest.config
...
ExitCode is used in several internal modules and hooks and so with type
annotations added, needs to be imported a lot.
_pytest.main, being the entry point, generally sits at the top of the
import tree.
So, it's not great to have ExitCode defined in _pytest.main, because it
will cause a lot of import cycles once type annotations are added (in
fact there is already one, which this change removes).
Move it to _pytest.config instead.
_pytest.main still imports ExitCode, so importing from there still
works, although external users should really be importing from `pytest`.
2020-02-10 23:55:06 +02:00
Stefan Scherfke
d59adc61f9
Reverse / fix meaning of "+/-" in error diffs
...
The convention is "assert result is expected". Pytest's error diffs now
reflect this. "-" means that sth. expected is missing in the result and
"+" means that there are unexpected extras in the result.
Fixes : #3333
2020-02-10 21:12:37 +01:00
Vladyslav Rachek
9e262038c8
[parametrize] enforce explicit argnames declaration ( #6330 )
...
Every argname used in `parametrize` either must
be declared explicitly in the python test function, or via
`indirect` list
Fix #5712
2020-02-06 20:20:25 -03:00
rebecca-palmer
c55bf23cbe
doc: s/pytest_mark/pytestmark ( #6661 )
2020-02-03 08:56:37 +01:00
Hugo van Kemenade
c9eeafade5
Fix favicon for Chrome and Opera ( #6639 )
...
* Fix favicon for Chrome and Opera
* Delete pytest1favi.ico
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
2020-01-31 20:56:45 -03:00
Ran Benita
a435faad5c
Merge branch 'master' into master-to-features
2020-01-31 11:27:06 +02:00
Hugo van Kemenade
55bffb7c15
Fix typo
2020-01-30 18:30:51 +02:00
Daniel Arndt
d91459fc75
Reword fixture docs for clarity
2020-01-30 09:32:54 -04:00
Daniel Hahler
b5b6e051ed
Merge master into features
2020-01-30 02:29:02 +01:00
Daniel Hahler
d478e2bbca
doc: release-5.3.4
...
(cherry picked from commit fd1a51a23fa687cf344f3506dff6cde0166faf2c)
2020-01-29 18:28:11 +01:00
Bruno Oliveira
8c41236c66
doc: getting-started.rst: mention "Test" prefix for classes ( #6583 )
...
doc: getting-started.rst: mention "Test" prefix for classes
2020-01-29 12:49:49 -03:00
sdementen
d848a20563
Extend the incremental marker for parametrize
...
The incremental marker is adapted to handle properly test classes with parametrize defined at class level.
Fix #3125
2020-01-29 08:25:17 -03:00
Daniel Hahler
ddaa5d88ac
terminal: default to `fE` with `-r` (reportchars)
...
Adds handling of `N` to reset `reportchars`, which can be used to get
the old behavior (`-rN`), and also allows for an alternative to
`--disable-warnings` (https://github.com/pytest-dev/pytest/issues/5066 ),
since `w` was included by default (without `--disable-warnings`).
Fixes https://github.com/pytest-dev/pytest/issues/6454
2020-01-29 00:33:15 +01:00
ParetoLife
cbad319736
Update getting-started.rst
...
From the description it seemed to me as if just prefixing your methods with ``test_`` was enough, but you also need to prefix your class with ``Test``. Of course, in the reference material this is clearly stated, but I think it makes sense to mention it here as well, since you also mention the part about the methods' prefix.
2020-01-27 10:50:05 +01:00
Daniel Hahler
09bdbffbde
Merge master into features
...
Conflicts:
src/_pytest/_code/code.py
src/_pytest/main.py
2020-01-24 23:44:50 +01:00
Daniel Hahler
040a61e22c
Merge pull request #6550 from blueyed/doc-cleandir-cd-back
...
doc/en/fixture.rst: chdir back to previous directory
2020-01-24 23:41:08 +01:00
Daniel Hahler
cdd6f86e43
bug-fix fixes
2020-01-23 20:34:21 +01:00
Daniel Hahler
83451b548f
doc/en/fixture.rst: chdir back to previous directory
...
This is considered to be best practice, and should be used in docs
therefore.
2020-01-23 19:09:18 +01:00
Daniel Hahler
b63cb18776
doc: remove costlysetup example
...
It is not included with docs, and
`example/costlysetup/sub_a/test_quick.py::test_quick` sleeps for 5s,
slowing down `doctesting` unnecessarily.
2020-01-23 12:23:30 +01:00
Bruno Oliveira
93b74d28d2
Merge remote-tracking branch 'upstream/master' into mm
...
Conflicts:
* src/_pytest/_code/code.py
* src/_pytest/main.py
* testing/python/metafunc.py
* testing/test_parseopt.py
* testing/test_pytester.py
2020-01-22 11:03:45 -03:00
Bruno Oliveira
6a26ac4125
Preparing release version 5.3.4
2020-01-20 13:53:31 -03:00
Bruno Oliveira
544b4a14d5
Fix Hugo van Kemenade name in release announcement
...
Co-Authored-By: Hugo van Kemenade <hugovk@users.noreply.github.com>
2020-01-17 07:18:57 -03:00
Bruno Oliveira
56dc301c50
Preparing release version 5.3.3
2020-01-16 18:55:41 -05:00
Bruno Oliveira
aa05334984
Remove broken link for user @jgsonesen
2020-01-16 18:51:33 -05:00
Daniel Hahler
5b0e255e85
Merge pull request #6465 from blueyed/doc-rootdir
...
doc: revisit section about rootdir
2020-01-16 21:55:12 +01:00
Daniel Hahler
83813bf515
Merge master into features
...
Conflicts:
.github/workflows/main.yml
2020-01-16 19:45:52 +01:00
Daniel Hahler
4630e2725e
Use `TYPE_CHECKING` instead of `False`
...
This allows for e.g. Jedi to infer types (it checks the name).
It was only used to support Python 3.5.0/3.5.1, where this is is not
available in the `typing` module.
Ref: https://github.com/davidhalter/jedi/issues/1472
Uses `TYPE_CHECKING = False` in `_pytest.outcomes` to avoid having to
work around circular import.
2020-01-16 16:11:39 +01:00
Bruno Oliveira
9298f7e4a9
Improve CHANGELOG and docs for junit_logging
2020-01-16 07:47:00 -03:00
Jakub Mitoraj
ab6406b42e
Update junit_logging with no,log,system-out,system-err,out-err,all
2020-01-16 08:14:46 +01:00
Daniel Hahler
bebfd28da3
doc: revisit section about rootdir
...
Ref: https://github.com/pytest-dev/pytest/issues/6376
2020-01-15 09:43:35 +01:00
Daniel Hahler
1356d20e90
Merge master into features
2020-01-10 05:20:41 +01:00
Bruno Oliveira
23475b6ab9
Fix wrong 'changelog' and 'reference' links in docs
...
Both references were referencing links from Python because of our intersphinx
mapping in `conf.py`:
intersphinx_mapping = {"python": ("https://docs.python.org/3 ", None)}
Because Python's docs explicitly define both references, Sphinx fallbacks to
them instead of generating implicit references as was expected.
Fix #6397
2020-01-09 18:06:15 -03:00
Anthony Sottile
26a2e1aba7
Merge pull request #6401 from nicoddemus/4.6-maintenance-docs-onward
...
Update py27/py34 deprecation docs
2020-01-04 16:24:56 -05:00
Anthony Sottile
75f964c08d
Merge pull request #6391 from asottile/release-4.6.9
...
Preparing release version 4.6.9
2020-01-04 13:01:46 -08:00
Bruno Oliveira
4fa819e535
Update py27/py34 deprecation docs
...
I've updated the text and incorporated the topics from #5275 , so this
can now be part of the official docs, and #5275 can be closed/unpinned.
Closes #5275
2020-01-04 17:52:02 -03:00
Bruno Oliveira
deb4287d1c
Update copyright year to 2020
...
Merge pull request #6392 from hugovk/4.6-maintenance-2020
2020-01-04 08:46:58 -03:00
Adam Johnson
73702ca88b
Improve warnings docs
...
* Rearrange section about context manager to be in order
* Link to `pytest.warns` and `recwarn` since a reader going top to bottom won't have seen about those yet.
* Used only context manager form in the example; the call form is somewhat obsolete
and is mentioned in the reference docs already.
* Reuse the 'myfunction' from first example on the second one
Co-Authored-By: Hugo van Kemenade <hugovk@users.noreply.github.com>
Co-Authored-By: Hugo van Kemenade <hugovk@users.noreply.github.com>
2019-12-26 19:16:19 -03:00
Bruno Oliveira
a9608d54e0
Switch the order of the commands back and update the text
...
As suggested during review
2019-12-26 08:19:11 -03:00
Anthony Sottile
6cd61390c2
Improve docs so regen doesn't leak temp directories
2019-12-20 13:18:49 -08:00
Anthony Sottile
ab44d3d733
Merge pull request #6360 from asottile/release-4.6.8
...
Preparing release version 4.6.8
2019-12-19 16:01:04 -08:00
captainCapitalism
ed57b8e08a
invocation in last section 'pythonpath.rst' title swapped
...
The order of invocations 'python -m pytest' and 'pytest' are different in the header and the explanation. Me being lazy reading about the behaviour of 'former' looked up quickly the title and rushed to implementation to discover it actually works the other way - as stated in the documentation. So I propose to switch the order in the title to achieve consistent ordering and not confusing somebody like me again! :)
2019-12-19 11:35:52 +01:00
marc
536177bb56
fix typos in docs
2019-12-19 10:35:15 +01:00
Bruno Oliveira
75493f78bf
Merge master into features ( #6346 )
...
Merge master into features
2019-12-16 21:57:26 -03:00
Bruno Oliveira
c487cf9dd5
Deprecate no print logs ( #6333 )
...
Deprecate no print logs
2019-12-16 19:01:16 -03:00
Vinay Calastry
afbaee7649
Deprecate --no-print-logs option
2019-12-14 16:46:30 -08:00
Bruno Oliveira
853889e5db
Merge remote-tracking branch 'upstream/master' into mm
2019-12-14 10:45:44 -03:00
Bruno Oliveira
7f24cc2feb
Remove duplicated user from announcement
2019-12-14 10:06:59 -03:00
Bruno Oliveira
10fcac7f90
Preparing release version 5.3.2
2019-12-13 08:51:15 -03:00
Bruno Oliveira
cbb2f9541b
Merge pull request #6316 from cb109/make-keyword-expression-matching-case-insensitive
...
Make keyword expression matching case-insensitive
2019-12-12 06:47:59 -03:00
cmachalo
e13ad22364
Include new --capture-mode=tee-sys option
...
Fix #4597
2019-12-09 13:05:23 -03:00
Michael Rose
2ddc330b62
Fixes #6326 : Typo in the Security section docs home page.
2019-12-08 22:26:53 -05:00
Ronny Pfannschmidt
3812985ed4
update backward compatibility policy to allow for breakage
...
Co-Authored-By: Anthony Sottile <asottile@umich.edu>
Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com>
Co-Authored-By: Hugo van Kemenade <hugovk@users.noreply.github.com>
2019-12-07 18:59:21 +01:00
Bruno Oliveira
64c71daa21
Add 4.6.7 changelog to master
2019-12-05 17:32:45 -03:00
Christoph Bülter
623b3982b0
Update doc/en/example/markers.rst
...
Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com>
2019-12-05 16:59:08 +01:00
Christoph Buelter
ac5929eef3
Update docs about case-insensitive expression matching
2019-12-05 14:13:22 +01:00
Bruno Oliveira
985ac09048
Merge master into features ( #6312 )
...
Merge master into features
2019-12-03 13:36:58 -03:00
Bruno Oliveira
59f95b7f59
Merge remote-tracking branch 'upstream/master' into mm
2019-12-03 11:07:34 -03:00
Bruno Oliveira
41b7b109e9
Merge branch 'features' into unittest-debug
2019-12-03 10:52:53 -03:00
Ran Benita
42fb1f7ede
Merge pull request #6309 from jaredvasquez/fix-cafd-docs
...
Fix typo in documentation of capfd fixture
2019-12-03 12:15:40 +02:00
Jared Vasquez
c00a43a17d
fix typo
2019-12-02 22:29:22 -08:00
Ran Benita
d2d7b97a70
Remove outdated py2py3 example
2019-12-02 21:16:15 +02:00
Daniel Hahler
d3ab56f531
docs: move changelog to docs/en and allow sphinx directives
...
Now `tox -e docs` will also include the draft changelog for the
next version (locally only).
`CHANGELOG.rst` now only points to the changelog on READTHEDOCS so
sphinx diretives can be used.
Followup to https://github.com/pytest-dev/pytest/pull/6272
2019-11-28 21:23:58 -03:00
Bruno Oliveira
05008f6b55
Preparing release version 5.3.1
2019-11-25 14:32:37 -03:00
Daniel Hahler
b9dd0e6210
docs: add missing `log_cli` confval
2019-11-24 22:34:15 +01:00
Ronny Pfannschmidt
15ffe63204
update doc examples **untested**
2019-11-23 21:54:11 +01:00
Daniel Hahler
8b7aeefd7d
Merge pull request #6248 from blueyed/default-role
...
docs: configure default_role=literal
2019-11-21 18:44:17 +01:00
Zac Hatfield-Dodds
7e10c8191d
Added link checking to tox and release.py ( #5614 )
...
Added link checking to tox and release.py
2019-11-21 16:46:13 +11:00
Daniel Hahler
be722652f0
docs: configure default_role=literal
...
This configures the default role for interpreted text (single
backticks), avoiding the need to check for / enforce double backticks.
Fixes also one instance in the existing changelog:
- Detect `pytest_` prefixed hooks using the internal plugin manager since
``pluggy`` is deprecating the ``implprefix`` argument to ``PluginManager``.
(`#3487 <https://github.com/pytest-dev/pytest/issues/3487 >`_)
2019-11-21 00:35:00 +01:00
Bruno Oliveira
4b16b93cf5
Preparing release version 5.3.0
2019-11-19 12:43:51 -03:00
Bruno Oliveira
89eeefbbaf
Merge pull request #6192 from nicoddemus/remove-reportlog-6180
...
Remove report_log in favor of pytest-reportlog
2019-11-18 17:58:37 -03:00
Anthony Sottile
cc78444c30
Merge remote-tracking branch 'origin/master' into mm
2019-11-15 15:26:57 -08:00
Anthony Sottile
c9a96cdee8
Preparing release version 5.2.4
2019-11-15 13:26:56 -08:00
Bruno Oliveira
d2ea9e2db5
Remove report_log in favor of pytest-reportlog
...
Fix #6180
2019-11-14 19:47:26 -03:00
Bruno Oliveira
e856638ba0
Preparing release version 5.2.3 ( #6190 )
...
Preparing release version 5.2.3
2019-11-14 18:17:28 -03:00
Michael Shields
bd68c2a3dc
Update advice about _called_from_test.
...
Instead of giving an example of using sys and then, at the end,
advising not to use sys, just give a correct example. This is
especially helpful since mypy 0.740 has started (correctly) complaining
about sys._called_from_pytest not being present.
2019-11-14 19:44:27 +00:00
Bruno Oliveira
5e8c47faad
Preparing release version 5.2.3
2019-11-14 11:12:06 -03:00
Bruno Oliveira
2a67637acc
Issue a warning to prepare change of 'junit_family' default value
...
Fix #6179
2019-11-13 19:55:13 -03:00
Daniel Hahler
b06f33f474
terminal: report ``session.shouldfail`` reason (``-x``)
...
Via https://github.com/blueyed/pytest/pull/108 .
2019-11-13 16:18:41 +01:00
Brett Cannon
0b40749c98
Delineate syntactically that the 'match' argument to 'raises' is keyword-only
2019-11-12 12:32:05 -08:00
Daniel Hahler
04f27d4eb4
unittest: do not use TestCase.debug() with `--pdb`
...
Fixes https://github.com/pytest-dev/pytest/issues/5991
Fixes https://github.com/pytest-dev/pytest/issues/3823
Ref: https://github.com/pytest-dev/pytest-django/issues/772
Ref: https://github.com/pytest-dev/pytest/pull/1890
Ref: https://github.com/pytest-dev/pytest-django/pull/782
- inject wrapped testMethod
- adjust test_trial_error
- add test for `--trace` with unittests
2019-11-10 00:21:51 +01:00
Steffen Schroeder
ceeb7bd085
Fixed broken links
2019-11-06 20:54:41 +01:00
Steffen Schroeder
1cecdf6619
Added checklinks to tox and release.py
2019-11-06 20:54:41 +01:00
Bruno Oliveira
74f4ec5986
Making it possible to access the pluginmanager in the pytest_ad… ( #6106 )
...
Making it possible to access the pluginmanager in the pytest_addoptio…
2019-11-06 15:18:59 -03:00
Daniel Hahler
e7320c6b54
Merge pull request #5926 from AtakamaLLC/optional-multiline
...
Add log-auto-indent option to control multiline formatting
2019-11-06 00:35:24 +01:00
Joshua Storck
f400804206
Removing pluginmanager as parameter in definition of pytest_addoption hook
2019-10-30 16:25:50 -04:00
Joshua Storck
7a96d94fd4
Making it possible to access the pluginmanager in the pytest_addoption hook
2019-10-30 14:18:13 -04:00
Bruno Oliveira
b99661b9d7
Introduce --report-log option
...
Fix #4488
2019-10-30 09:43:33 -03:00
Michael Krebs
1f5b454355
Add log-auto-indent option to control multiline formatting
2019-10-25 11:31:33 -04:00
Bruno Oliveira
b27ba97721
Preparing release version 5.2.2
2019-10-24 19:24:04 -04:00
Bruno Oliveira
2bee7d7c3e
Update Tidelift docs with latest campaign
...
Tidelift has launched a new marketing campaign as outlined here:
* https://forum.tidelift.com/t/task-enhancement-marketing-the-tidelift-subscription-to-your-users/321
This PR splits the previous "sponsor" information into two, Open Collective
and Tidelift (as they have very different target audiences).
Also took the opportunity to reorder some items at the end of
the contents page in a manner that I believe make more sense.
2019-10-24 14:58:58 -03:00
Albert Tugushev
18786992bb
Update doc to use contextlib2.nullcontext
...
nullcontext has been backported in contextlib2==0.6.0
2019-10-19 15:09:37 +07:00
Andrzej Klajnert
f2dd9cc63e
Remove redundant mention from 5.2.0 release notes.
2019-10-17 13:17:34 +02:00
Bruno Oliveira
0383d43645
Add missing version added/changed markers to docs
...
Notice some features since 5.0 were not being properly
marked in which version they have been added/changed.
2019-10-15 19:45:58 -03:00
Nattaphoom Chaipreecha
83ba5eb58a
Add pudb to project examples
2019-10-12 08:10:04 +07:00
Nattaphoom Chaipreecha
d07c5ba4ae
Update pdb++ link (moved to GitHub)
2019-10-12 08:09:49 +07:00
Bruno Oliveira
57141dc708
Add link to technical aspects issue to the py27-py34 docs
2019-10-11 08:50:38 -03:00
Oliver Bestwalter
71ad5b0fbb
remove cancelled training sidebar
2019-10-10 12:11:16 +02:00
Bruno Oliveira
12cc729f6b
Preparing release version 5.2.1
2019-10-06 08:00:49 -04:00
Anthony Sottile
33c3ec66b7
Merge pull request #5898 from kevinjfoley/doc-typo-fix
...
Fix doc typo
2019-10-01 12:58:54 -07:00
Kevin J. Foley
b490f5f979
Fix doc typo
2019-10-01 10:17:26 -04:00
tadashigaki
acfd0fd9d6
Update doc: pytest section in setup.cfg
2019-10-01 02:44:07 +09:00
Bruno Oliveira
068ef90b92
Preparing release version 5.2.0
2019-09-28 21:18:37 -04:00
Bruno Oliveira
d3d9f9f668
Merge remote-tracking branch 'upstream/master' into mm
2019-09-23 12:09:01 -03:00
Bruno Oliveira
1b4ad7774b
Fix logging doc: change x.level to x.levelno ( #5866 )
...
Fix logging doc: change x.level to x.levelno
2019-09-21 11:28:40 -03:00
Daniel Hahler
409cc2946a
Merge master into features
2019-09-21 16:22:48 +02:00
Bruno Oliveira
3114be9181
Revert "Show banner/full page for the Digital Climate Strike (#… ( #5867 )
...
Revert "Show banner/full page for the Digital Climate Strike (#5861 )"
2019-09-21 11:09:34 -03:00
Bruno Oliveira
e4103cb02c
Release version 5.1.3 ( #5859 )
...
Release version 5.1.3
2019-09-21 10:56:16 -03:00
Bruno Oliveira
217605c217
Revert "Show banner/full page for the Digital Climate Strike ( #5861 )"
...
This reverts commit c8cf748c49
, reversing
changes made to 702acdba46
.
2019-09-21 10:38:10 -03:00
James Cooke
2fcf21a6c7
Fix logging doc: change x.level to x.levelno
2019-09-20 18:38:47 +01:00
Bruno Oliveira
249b53e623
Show banner/full page for the Ditigal Climate Strike
...
As discussed in the mailing list, pytest will join the
digital strike for the climate on Sep 20th. This will show
a closable banner on the docs until the date, and when the date
comes the banner will become a (closable) full page.
I will also pin an issue saying that the developers won't be
available on Sep 20th.
2019-09-19 08:26:25 -03:00
Bruno Oliveira
1a9f4a51cb
Preparing release version 5.1.3
2019-09-18 10:11:59 -03:00
Bruno Oliveira
892bdd59dc
Normalize all summary durations, including quiet ones
2019-09-18 10:10:25 -03:00
Bruno Oliveira
6918d07560
Merge remote-tracking branch 'upstream/features' into aklajnert/1682-dynamic-scope
2019-09-18 07:44:18 -03:00
Anthony Sottile
8f2f51be6d
Clarify docs by showing tox.ini considered before setup.cfg
2019-09-11 14:07:06 -07:00
Gene Wood
f0d538329c
Update doc regarding pytest.raises
...
Remove reference to the `message` argument in the docs as it was deprecated in #4539
2019-09-09 12:14:09 -07:00
Gene Wood
bc163605ab
Fix anchor link from Good Practices to Pythonpath doc
2019-09-04 09:18:10 -07:00
aklajnert
10bf6aac76
Implemented the dynamic scope feature.
2019-08-31 18:12:24 +02:00
Bruno Oliveira
e56544cb58
Preparing release version 5.1.2
2019-08-30 12:43:47 -03:00
Bruno Oliveira
f9cc704b1a
Replace session duration to a fix value in regendoc
2019-08-30 12:42:14 -03:00
linchiwei123
01b9774e3b
update doc
2019-08-25 23:50:41 +08:00
Anthony Sottile
b135f5af8d
Preparing release version 5.1.1
2019-08-20 11:30:36 -07:00
Florian Bruhin
c049fd85ab
Remove cancelled training
2019-08-19 22:07:53 +02:00
Hugo van Kemenade
a287aea00e
Docs: update tense
...
pytest 4.6.0 was released in June 2019
https://pypi.org/project/pytest/#history
2019-08-18 13:34:59 +03:00
Bruno Oliveira
eaf7ce9a99
Preparing release version 5.1.0
2019-08-15 20:00:09 -04:00
Bruno Oliveira
409d61b972
Merge remote-tracking branch 'upstream/master' into release-5.1.0
2019-08-15 19:46:46 -04:00
mei-li
f4a84a8dfd
reword a parametrize example sentence
2019-08-15 18:12:18 +02:00
Bruno Oliveira
1049a38cee
Fix wording as suggested in review of #5741
2019-08-15 10:05:42 -03:00
Bruno Oliveira
d7f082519a
Merge remote-tracking branch 'upstream/master' into mm
...
Conflicts:
src/_pytest/outcomes.py
2019-08-15 10:03:52 -03:00
boris
3eb4973065
remove %s formatting from docs
2019-08-12 00:09:53 -06:00
Tim Hoffmann
b095e0de47
Improve docs of pytest.importorskip
2019-08-09 21:35:03 +02:00
Bruno Oliveira
2f065a555f
Merge remote-tracking branch 'upstream/master' into release-5.1.0
2019-08-09 12:36:19 -03:00
boris
7560a7b808
trivial doc change
2019-08-07 21:49:30 -06:00
boris
78de9d4677
replace implicit code tag with colon .replace("::\n\n.. code-block", ":\n\n.. code-block")
2019-08-06 16:20:06 -07:00
boris
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
boris
9fce0bdd88
remove implicit code tags .replace("::\n\n.. code-block", "\n\n.. code-block")
2019-08-06 15:46:57 -07:00
boris
5f95dce956
ran blacken-docs
2019-08-06 13:34:58 -07:00
boris
75d0b899bb
ran pyupgrade-docs again
2019-08-06 13:33:21 -07:00
boris
7f90e74e02
label code blocks
2019-08-06 13:25:54 -07:00
boris
cf7761f91f
ran pyupgrade-docs
2019-08-06 12:40:27 -07:00
Bruno Oliveira
f43b54aaeb
Add CHANGELOG for 4.6.5 ( #5696 )
2019-08-05 15:09:31 -03:00
Daniel Hahler
aa06e6c8f3
Merge master into features
2019-08-05 19:12:32 +02:00
Anthony Sottile
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
Yash Todi
0d5ed57b40
Added info to access exitcodes directly
2019-08-04 22:35:51 +05:30
Bruno Oliveira
8db6642515
Mention pytest-custom_exit_code in the docs
...
Related to #5689
2019-08-03 10:15:56 -03:00
Daniel Hahler
b5b710b3ae
Merge master into features
...
Several conflicts, mostly due to 2c402f4bd
.
Conflicts:
.pre-commit-config.yaml
src/_pytest/outcomes.py
src/_pytest/python_api.py
tox.ini
2019-08-02 16:52:51 +02:00
Semen Zhydenko
2ca47cb3f5
programatically -> programmatically
2019-08-01 15:11:26 +02:00