From c9a96cdee8ee7c1a9ead49b355fab9aef73196fe Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Fri, 15 Nov 2019 13:24:35 -0800 Subject: [PATCH] Preparing release version 5.2.4 --- CHANGELOG.rst | 12 ++++++++++++ changelog/6194.bugfix.rst | 1 - changelog/6197.bugfix.rst | 1 - doc/en/announce/index.rst | 1 + doc/en/announce/release-5.2.4.rst | 22 ++++++++++++++++++++++ doc/en/example/parametrize.rst | 7 +++---- 6 files changed, 38 insertions(+), 6 deletions(-) delete mode 100644 changelog/6194.bugfix.rst delete mode 100644 changelog/6197.bugfix.rst create mode 100644 doc/en/announce/release-5.2.4.rst diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 87ffb9e07..b1a988de8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -18,6 +18,18 @@ with advance notice in the **Deprecations** section of releases. .. towncrier release notes start +pytest 5.2.4 (2019-11-15) +========================= + +Bug Fixes +--------- + +- `#6194 `_: Fix incorrect discovery of non-test ``__init__.py`` files. + + +- `#6197 `_: Revert "The first test in a package (``__init__.py``) marked with ``@pytest.mark.skip`` is now correctly skipped.". + + pytest 5.2.3 (2019-11-14) ========================= diff --git a/changelog/6194.bugfix.rst b/changelog/6194.bugfix.rst deleted file mode 100644 index 92e6aec78..000000000 --- a/changelog/6194.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix incorrect discovery of non-test ``__init__.py`` files. diff --git a/changelog/6197.bugfix.rst b/changelog/6197.bugfix.rst deleted file mode 100644 index 9bd0a5a65..000000000 --- a/changelog/6197.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Revert "The first test in a package (``__init__.py``) marked with ``@pytest.mark.skip`` is now correctly skipped.". diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst index 05530dd2e..e7c011411 100644 --- a/doc/en/announce/index.rst +++ b/doc/en/announce/index.rst @@ -6,6 +6,7 @@ Release announcements :maxdepth: 2 + release-5.2.4 release-5.2.3 release-5.2.2 release-5.2.1 diff --git a/doc/en/announce/release-5.2.4.rst b/doc/en/announce/release-5.2.4.rst new file mode 100644 index 000000000..05677e77f --- /dev/null +++ b/doc/en/announce/release-5.2.4.rst @@ -0,0 +1,22 @@ +pytest-5.2.4 +======================================= + +pytest 5.2.4 has just been released to PyPI. + +This is a bug-fix release, being a drop-in replacement. To upgrade:: + + pip install --upgrade pytest + +The full changelog is available at https://docs.pytest.org/en/latest/changelog.html. + +Thanks to all who contributed to this release, among them: + +* Anthony Sottile +* Bruno Oliveira +* Daniel Hahler +* Hugo +* Michael Shields + + +Happy testing, +The pytest Development Team diff --git a/doc/en/example/parametrize.rst b/doc/en/example/parametrize.rst index 48ab95fda..0e131dace 100644 --- a/doc/en/example/parametrize.rst +++ b/doc/en/example/parametrize.rst @@ -475,11 +475,10 @@ Running it results in some skips if we don't have all the python interpreters in .. code-block:: pytest . $ pytest -rs -q multipython.py - ssssssssssss...ssssssssssss [100%] + ssssssssssss......sss...... [100%] ========================= short test summary info ========================== - SKIPPED [12] $REGENDOC_TMPDIR/CWD/multipython.py:30: 'python3.5' not found - SKIPPED [12] $REGENDOC_TMPDIR/CWD/multipython.py:30: 'python3.7' not found - 3 passed, 24 skipped in 0.12s + SKIPPED [15] $REGENDOC_TMPDIR/CWD/multipython.py:30: 'python3.5' not found + 12 passed, 15 skipped in 0.12s Indirect parametrization of optional implementations/imports --------------------------------------------------------------------