Merge master into features (#5233)

Merge master into features
pytest-dev · May 9, 2019 · 3a4a815 · 3a4a815
2 parents ceca35b + ccf6c3c
commit 3a4a815
Show file tree

Hide file tree

Showing 26 changed files with 152 additions and 83 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 exclude: doc/en/example/py2py3/test_py2.py
 repos:
--   repo: https://github.com/ambv/black
+-   repo: https://github.com/python/black
     rev: 19.3b0
     hooks:
     -   id: black

diff --git a/.travis.yml b/.travis.yml
@@ -49,9 +49,9 @@ jobs:
 
     # Coverage tracking is slow with pypy, skip it.
     - env: TOXENV=pypy-xdist
-      python: 'pypy2.7-6.0'
+      python: 'pypy'
     - env: TOXENV=pypy3-xdist
-      python: 'pypy3.5-6.0'
+      python: 'pypy3'
 
     - env: TOXENV=py34-xdist
       python: '3.4'

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -18,6 +18,39 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
+pytest 4.4.2 (2019-05-08)
+=========================
+
+Bug Fixes
+---------
+
+- `#5089 <https://github.com/pytest-dev/pytest/issues/5089>`_: Fix crash caused by error in ``__repr__`` function with both ``showlocals`` and verbose output enabled.
+
+
+- `#5139 <https://github.com/pytest-dev/pytest/issues/5139>`_: Eliminate core dependency on 'terminal' plugin.
+
+
+- `#5229 <https://github.com/pytest-dev/pytest/issues/5229>`_: Require ``pluggy>=0.11.0`` which reverts a dependency to ``importlib-metadata`` added in ``0.10.0``.
+  The ``importlib-metadata`` package cannot be imported when installed as an egg and causes issues when relying on ``setup.py`` to install test dependencies.
+
+
+
+Improved Documentation
+----------------------
+
+- `#5171 <https://github.com/pytest-dev/pytest/issues/5171>`_: Doc: ``pytest_ignore_collect``, ``pytest_collect_directory``, ``pytest_collect_file`` and ``pytest_pycollect_makemodule`` hooks's 'path' parameter documented type is now ``py.path.local``
+
+
+- `#5188 <https://github.com/pytest-dev/pytest/issues/5188>`_: Improve help for ``--runxfail`` flag.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#5182 <https://github.com/pytest-dev/pytest/issues/5182>`_: Removed internal and unused ``_pytest.deprecated.MARK_INFO_ATTRIBUTE``.
+
+
 pytest 4.4.1 (2019-04-15)
 =========================
 

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -166,7 +166,7 @@ Short version
 #. Enable and install `pre-commit <https://pre-commit.com>`_ to ensure style-guides and code checks are followed.
 #. Target ``master`` for bugfixes and doc changes.
 #. Target ``features`` for new features or functionality changes.
-#. Follow **PEP-8** for naming and `black <https://github.com/ambv/black>`_ for formatting.
+#. Follow **PEP-8** for naming and `black <https://github.com/python/black>`_ for formatting.
 #. Tests are run using ``tox``::
 
     tox -e linting,py27,py37

diff --git a/README.rst b/README.rst
@@ -26,7 +26,7 @@
     :target: https://dev.azure.com/pytest-dev/pytest
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/ambv/black
+    :target: https://github.com/python/black
 
 .. image:: https://www.codetriage.com/pytest-dev/pytest/badges/users.svg
     :target: https://www.codetriage.com/pytest-dev/pytest

diff --git a/bench/empty.py b/bench/empty.py
@@ -1,4 +1,2 @@
-import six
-
 for i in range(1000):
-    six.exec_("def test_func_%d(): pass" % i)
+    exec("def test_func_%d(): pass" % i)
diff --git a/changelog/5089.bugfix.rst b/changelog/5089.bugfix.rst
diff --git a/changelog/5139.bugfix.rst b/changelog/5139.bugfix.rst
diff --git a/changelog/5171.doc.rst b/changelog/5171.doc.rst
diff --git a/changelog/5182.trivial.rst b/changelog/5182.trivial.rst
diff --git a/changelog/5188.doc.rst b/changelog/5188.doc.rst
diff --git a/changelog/5239.trivial.rst b/changelog/5239.trivial.rst
@@ -0,0 +1,3 @@
+Pin ``pluggy`` to ``< 1.0`` so we don't update to ``1.0`` automatically when
+it gets released: there are planned breaking changes, and we want to ensure
+pytest properly supports ``pluggy 1.0``.
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-4.4.2
    release-4.4.1
    release-4.4.0
    release-4.3.1

diff --git a/doc/en/announce/release-4.4.2.rst b/doc/en/announce/release-4.4.2.rst
@@ -0,0 +1,33 @@
+pytest-4.4.2
+=======================================
+
+pytest 4.4.2 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:
+
+* Allan Lewis
+* Anthony Sottile
+* Bruno Oliveira
+* DamianSkrzypczak
+* Daniel Hahler
+* Don Kirkby
+* Douglas Thor
+* Hugo
+* Ilya Konstantinov
+* Jon Dufresne
+* Matt Cooper
+* Nikolay Kondratyev
+* Ondřej Súkup
+* Peter Schutt
+* Romain Chossart
+* Sitaktif
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/deprecations.rst b/doc/en/deprecations.rst
@@ -19,6 +19,8 @@ Below is a complete list of all pytest features which are considered deprecated.
 :class:`_pytest.warning_types.PytestWarning` or subclasses, which can be filtered using
 :ref:`standard warning filters <warnings>`.
 
+.. _`raises message deprecated`:
+
 ``"message"`` parameter of ``pytest.raises``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/doc/en/example/assertion/failure_demo.py b/doc/en/example/assertion/failure_demo.py
@@ -1,5 +1,3 @@
-import six
-
 import _pytest._code
 import pytest
 from pytest import raises
@@ -199,7 +197,7 @@ def test_dynamic_compile_shows_nicely():
     name = "abc-123"
     module = imp.new_module(name)
     code = _pytest._code.compile(src, name, "exec")
-    six.exec_(code, module.__dict__)
+    exec(code, module.__dict__)
     sys.modules[name] = module
     module.foo()