Merge pull request #3769 from nicoddemus/release-3.7.1

Preparing release version 3.7.1
pytest-dev · Aug 2, 2018 · 4d2fa58 · 4d2fa58
2 parents 4705fd2 + f7a3f45
commit 4d2fa58
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 15 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,6 +8,33 @@
 
 .. towncrier release notes start
 
+pytest 3.7.1 (2018-08-02)
+=========================
+
+Bug Fixes
+---------
+
+- `#3473 <https://github.com/pytest-dev/pytest/issues/3473>`_: Raise immediately if ``approx()`` is given an expected value of a type it doesn't understand (e.g. strings, nested dicts, etc.).
+
+
+- `#3712 <https://github.com/pytest-dev/pytest/issues/3712>`_: Correctly represent the dimensions of an numpy array when calling ``repr()`` on ``approx()``.
+
+
+- `#3745 <https://github.com/pytest-dev/pytest/issues/3745>`_: Display the absolute path if ``cache_dir`` is not relative to the ``rootdir`` instead of failing.
+
+
+- `#3747 <https://github.com/pytest-dev/pytest/issues/3747>`_: Fix compatibility problem with plugins and the warning code issued by fixture functions when they are called directly.
+
+
+- `#3748 <https://github.com/pytest-dev/pytest/issues/3748>`_: Fix infinite recursion in ``pytest.approx`` with arrays in ``numpy<1.13``.
+
+
+- `#3757 <https://github.com/pytest-dev/pytest/issues/3757>`_: Pin pathlib2 to ``>=2.2.0`` as we require ``__fspath__`` support.
+
+
+- `#3763 <https://github.com/pytest-dev/pytest/issues/3763>`_: Fix ``TypeError`` when the assertion message is ``bytes`` in python 3.
+
+
 pytest 3.7.0 (2018-07-30)
 =========================
 

diff --git a/changelog/3473.bugfix.rst b/changelog/3473.bugfix.rst
diff --git a/changelog/3712.bugfix.rst b/changelog/3712.bugfix.rst
diff --git a/changelog/3745.bugfix.rst b/changelog/3745.bugfix.rst
diff --git a/changelog/3747.bugfix.rst b/changelog/3747.bugfix.rst
diff --git a/changelog/3748.bugfix.rst b/changelog/3748.bugfix.rst
diff --git a/changelog/3757.bugfix.rst b/changelog/3757.bugfix.rst
diff --git a/changelog/3763.bugfix.rst b/changelog/3763.bugfix.rst
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-3.7.1
    release-3.7.0
    release-3.6.4
    release-3.6.3

diff --git a/doc/en/announce/release-3.7.1.rst b/doc/en/announce/release-3.7.1.rst
@@ -0,0 +1,21 @@
+pytest-3.7.1
+=======================================
+
+pytest 3.7.1 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 http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Kale Kundert
+* Ronny Pfannschmidt
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/example/nonpython.rst b/doc/en/example/nonpython.rst
@@ -84,9 +84,8 @@ interesting to just look at the collection tree::
     platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
     rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
     collected 2 items
-    <Package '$REGENDOC_TMPDIR/nonpython'>
-      <YamlFile 'test_simple.yml'>
-        <YamlItem 'hello'>
-        <YamlItem 'ok'>
+    <YamlFile 'test_simple.yml'>
+      <YamlItem 'hello'>
+      <YamlItem 'ok'>
 
     ======================= no tests ran in 0.12 seconds =======================
diff --git a/doc/en/example/parametrize.rst b/doc/en/example/parametrize.rst
@@ -411,10 +411,11 @@ is to be run with different sets of arguments for its three arguments:
 Running it results in some skips if we don't have all the python interpreters installed and otherwise runs all combinations (5 interpreters times 5 interpreters times 3 objects to serialize/deserialize)::
 
    . $ pytest -rs -q multipython.py
-   ...sss...sssssssss...sss...                                          [100%]
+   ...ssssssssssssssssssssssss                                          [100%]
    ========================= short test summary info ==========================
-   SKIP [15] $REGENDOC_TMPDIR/CWD/multipython.py:28: 'python3.4' not found
-   12 passed, 15 skipped in 0.12 seconds
+   SKIP [12] $REGENDOC_TMPDIR/CWD/multipython.py:28: 'python3.4' not found
+   SKIP [12] $REGENDOC_TMPDIR/CWD/multipython.py:28: 'python3.5' not found
+   3 passed, 24 skipped in 0.12 seconds
 
 Indirect parametrization of optional implementations/imports
 --------------------------------------------------------------------

diff --git a/doc/en/example/reportingdemo.rst b/doc/en/example/reportingdemo.rst
@@ -363,7 +363,7 @@ get on the terminal - we are working on that)::
     >   int(s)
     E   ValueError: invalid literal for int() with base 10: 'qwe'
 
-    <0-codegen $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/python_api.py:635>:1: ValueError
+    <0-codegen $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/python_api.py:682>:1: ValueError
     ______________________ TestRaises.test_raises_doesnt _______________________
 
     self = <failure_demo.TestRaises object at 0xdeadbeef>