Merge remote-tracking branch 'upstream/features' into aklajnert/1682-dynamic-scope

Author: nicoddemus

.travis.yml

@@ -43,8 +43,7 @@ jobs:
       python: 'pypy3'
 
     - env: TOXENV=py35-xdist
-      dist: trusty
-      python: '3.5.0'
+      python: '3.5'
 
     # Coverage for:
     # - pytester's LsofFdLeakChecker

AUTHORS

@@ -56,6 +56,7 @@ Charnjit SiNGH (CCSJ)
 Chris Lamb
 Christian Boelsen
 Christian Fetzer
+Christian Neumüller
 Christian Theunert
 Christian Tismer
 Christopher Gilling
@@ -97,6 +98,7 @@ Feng Ma
 Florian Bruhin
 Floris Bruynooghe
 Gabriel Reis
+Gene Wood
 George Kussumoto
 Georgy Dyuldin
 Graham Horler
@@ -211,6 +213,7 @@ Raphael Castaneda
 Raphael Pierzina
 Raquel Alegre
 Ravi Chandra
+Robert Holt
 Roberto Polli
 Roland Puntaier
 Romain Dorgueil

CHANGELOG.rst

@@ -18,6 +18,32 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
+pytest 5.1.2 (2019-08-30)
+=========================
+
+Bug Fixes
+---------
+
+- `#2270 <https://github.com/pytest-dev/pytest/issues/2270>`_: Fixed ``self`` reference in function-scoped fixtures defined plugin classes: previously ``self``
+  would be a reference to a *test* class, not the *plugin* class.
+
+
+- `#570 <https://github.com/pytest-dev/pytest/issues/570>`_: Fixed long standing issue where fixture scope was not respected when indirect fixtures were used during
+  parametrization.
+
+
+- `#5782 <https://github.com/pytest-dev/pytest/issues/5782>`_: Fix decoding error when printing an error response from ``--pastebin``.
+
+
+- `#5786 <https://github.com/pytest-dev/pytest/issues/5786>`_: Chained exceptions in test and collection reports are now correctly serialized, allowing plugins like
+  ``pytest-xdist`` to display them properly.
+
+
+- `#5792 <https://github.com/pytest-dev/pytest/issues/5792>`_: Windows: Fix error that occurs in certain circumstances when loading
+  ``conftest.py`` from a working directory that has casing other than the one stored
+  in the filesystem (e.g., ``c:\test`` instead of ``C:\test``).
+
+
 pytest 5.1.1 (2019-08-20)
 =========================
 

changelog/5782.bugfix.rst

@@ -0,0 +1 @@
+Fix "lexer" being used when uploading to bpaste.net from ``--pastebin`` to "text".

changelog/5806.bugfix.rst

@@ -0,0 +1 @@
+Fix pypy3.6 (nightly) on windows.

changelog/5807.bugfix.rst

@@ -0,0 +1 @@
+Handle ``--fulltrace`` correctly with ``pytest.raises``.

changelog/5811.bugfix.rst

@@ -0,0 +1,2 @@
+Windows: Fix regression with conftest whose qualified name contains uppercase
+characters (introduced by #5792).

changelog/5819.bugfix.rst

@@ -16,7 +16,7 @@ REGENDOC_ARGS := \
 	--normalize "/[ \t]+\n/\n/" \
 	--normalize "~\$$REGENDOC_TMPDIR~/home/sweet/project~" \
 	--normalize "~/path/to/example~/home/sweet/project~" \
-	--normalize "/in \d+.\d+ seconds/in 0.12 seconds/" \
+	--normalize "/in \d+.\d+s ==/in 0.12s ==/" \
 	--normalize "@/tmp/pytest-of-.*/pytest-\d+@PYTEST_TMPDIR@" \
 	--normalize "@pytest-(\d+)\\.[^ ,]+@pytest-\1.x.y@" \
 	--normalize "@(This is pytest version )(\d+)\\.[^ ,]+@\1\2.x.y@" \

doc/en/Makefile

@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-5.1.2
    release-5.1.1
    release-5.1.0
    release-5.0.1