diff options
| author | Bruno Oliveira <nicoddemus@gmail.com> | 2020-08-01 11:00:38 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-01 11:00:38 -0300 |
| commit | 07f7372affcb19d4df35e3e214de771864af50c0 (patch) | |
| tree | 5bdea74b44ebf3e350f41cdf455c3c81ae933f67 /changelog | |
| parent | a1ba8dfe2a8c347f5d438409fb58ec152547ad2c (diff) | |
| parent | e49f1d6f60fc44e8d2ed76552c10d3bba3bf7a0f (diff) | |
| download | pytest-07f7372affcb19d4df35e3e214de771864af50c0.tar.gz | |
Merge pull request #7586 from nicoddemus/cp-release
Merge pull request #7584 from pytest-dev/release-6.0.1
Diffstat (limited to 'changelog')
| -rw-r--r-- | changelog/7394.bugfix.rst | 2 | ||||
| -rw-r--r-- | changelog/7558.bugfix.rst | 2 | ||||
| -rw-r--r-- | changelog/7559.bugfix.rst | 1 | ||||
| -rw-r--r-- | changelog/7569.bugfix.rst | 1 |
4 files changed, 0 insertions, 6 deletions
diff --git a/changelog/7394.bugfix.rst b/changelog/7394.bugfix.rst deleted file mode 100644 index b39558cf1..000000000 --- a/changelog/7394.bugfix.rst +++ /dev/null @@ -1,2 +0,0 @@ -Passing an empty ``help`` value to ``Parser.add_option`` is now accepted instead of crashing when running ``pytest --help``. -Passing ``None`` raises a more informative ``TypeError``. diff --git a/changelog/7558.bugfix.rst b/changelog/7558.bugfix.rst deleted file mode 100644 index 6e3ec674c..000000000 --- a/changelog/7558.bugfix.rst +++ /dev/null @@ -1,2 +0,0 @@ -Fix pylint ``not-callable`` lint on ``pytest.mark.parametrize()`` and the other builtin marks: -``skip``, ``skipif``, ``xfail``, ``usefixtures``, ``filterwarnings``. diff --git a/changelog/7559.bugfix.rst b/changelog/7559.bugfix.rst deleted file mode 100644 index b3d98826b..000000000 --- a/changelog/7559.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix regression in plugins using ``TestReport.longreprtext`` (such as ``pytest-html``) when ``TestReport.longrepr`` is not a string. diff --git a/changelog/7569.bugfix.rst b/changelog/7569.bugfix.rst deleted file mode 100644 index 5dd38bc4d..000000000 --- a/changelog/7569.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix logging capture handler's level not reset on teardown after a call to ``caplog.set_level()``. |