Skip to content

Preparing release version 5.2.4 #6198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2019
Merged

Preparing release version 5.2.4 #6198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/pytest-dev/pytest/issues/6194>`_: Fix incorrect discovery of non-test ``__init__.py`` files.


- `#6197 <https://github.com/pytest-dev/pytest/issues/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)
=========================

Expand Down
1 change: 0 additions & 1 deletion changelog/6194.bugfix.rst
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion changelog/6197.bugfix.rst
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions doc/en/announce/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Release announcements
:maxdepth: 2


release-5.2.4
release-5.2.3
release-5.2.2
release-5.2.1
Expand Down
22 changes: 22 additions & 0 deletions doc/en/announce/release-5.2.4.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

@blueyed blueyed Nov 15, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this list is off? (nitpick, not relevant here)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah no idea how towncrier computes this -- perhaps it includes reporters of associated issues?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is actually computed by release.py:

pytest/scripts/release.py

Lines 16 to 26 in 19a15a9

# Get our list of authors
stdout = check_output(["git", "describe", "--abbrev=0", "--tags"])
stdout = stdout.decode("utf-8")
last_version = stdout.strip()
stdout = check_output(
["git", "log", "{}..HEAD".format(last_version), "--format=%aN"]
)
stdout = stdout.decode("utf-8")
contributors = set(stdout.splitlines())

@asottile please make sure you have the tags locally.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do have them -- here's what it reports:

$ git describe --abbrev=0 --tags
5.2.3
$ git log 5.2.3..HEAD --format=%aN
Anthony Sottile
Anthony Sottile
Anthony Sottile
Anthony Sottile
Bruno Oliveira
Daniel Hahler
Bruno Oliveira
Michael Shields
Hugo
Hugo

which is weird given:

$ git log --graph --oneline --decorate
* c9a96cdee (HEAD -> release-5.2.4, asottile/release-5.2.4) Preparing release version 5.2.4
*   19a15a94e (origin/master, origin/HEAD, master) Merge pull request #6197 from asottile/fix_init_py_discovery
|\  
| * 4e0f99260 (asottile/fix_init_py_discovery, fix_init_py_discovery) Add regression tests for __init__.py breakage
| * 176c7771f Revert "fix bug with nonskipped first test in package (#5831)"
|/  
*   e856638ba Preparing release version 5.2.3 (#6190)
|\  
| * dd9a27cf5 (tag: 5.2.3) Adjust CHANGELOG

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new tag is 5.2.4.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, this command is "what has changed since the last tag"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah.. that's because the tag is not on the master branch I think.



Happy testing,
The pytest Development Team
7 changes: 3 additions & 4 deletions doc/en/example/parametrize.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------------------------------------------------------------------
Expand Down