Merge remote-tracking branch 'upstream/master' into merge-master-into-features

CHANGELOG.rst

@@ -8,6 +8,53 @@
 
 .. towncrier release notes start
 
+Pytest 3.2.4 (2017-11-13)
+=========================
+
+Bug Fixes
+---------
+
+- Fix the bug where running with ``--pyargs`` will result in items with
+  empty ``parent.nodeid`` if run from a different root directory. (`#2775
+  <https://github.com/pytest-dev/pytest/issues/2775>`_)
+
+- Fix issue with ``@pytest.parametrize`` if argnames was specified as keyword arguments.
+  (`#2819 <https://github.com/pytest-dev/pytest/issues/2819>`_)
+
+- Strip whitespace from marker names when reading them from INI config. (`#2856
+  <https://github.com/pytest-dev/pytest/issues/2856>`_)
+
+- Show full context of doctest source in the pytest output, if the line number of
+  failed example in the docstring is < 9. (`#2882
+  <https://github.com/pytest-dev/pytest/issues/2882>`_)
+
+
+Improved Documentation
+----------------------
+
+- Introduce a dedicated section about conftest.py. (`#1505
+  <https://github.com/pytest-dev/pytest/issues/1505>`_)
+
+- Explicitly mention ``xpass`` in the documentation of ``xfail``. (`#1997
+  <https://github.com/pytest-dev/pytest/issues/1997>`_)
+
+- Append example for pytest.param in the example/parametrize document. (`#2658
+  <https://github.com/pytest-dev/pytest/issues/2658>`_)
+
+- Clarify language of proposal for fixtures parameters (`#2893
+  <https://github.com/pytest-dev/pytest/issues/2893>`_)
+
+- List python 3.6 in the documented supported versions in the getting started
+  document. (`#2903 <https://github.com/pytest-dev/pytest/issues/2903>`_)
+
+- Clarify the documentation of available fixture scopes. (`#538
+  <https://github.com/pytest-dev/pytest/issues/538>`_)
+
+- Add documentation about the ``python -m pytest`` invocation adding the
+  current directory to sys.path. (`#911
+  <https://github.com/pytest-dev/pytest/issues/911>`_)
+
+
 Pytest 3.2.3 (2017-10-03)
 =========================
 

changelog/1505.doc

@@ -1 +0,0 @@
-Introduce a dedicated section about conftest.py.

changelog/1997.doc

@@ -1 +0,0 @@
-Explicitly mention ``xpass`` in the documentation of ``xfail``.

changelog/2658.doc

@@ -1 +0,0 @@
-Append example for pytest.param in the example/parametrize document.

changelog/2775.bugfix

@@ -1 +0,0 @@
-Fix the bug where running pytest with "--pyargs" will result in Items with empty "parent.nodeid" if run from a different root directory.

changelog/2819.bugfix

@@ -1 +0,0 @@
-Fix issue with @pytest.parametrize if argnames was specified as kwarg.

changelog/2856.bugfix

@@ -1 +0,0 @@
-Strip whitespace from marker names when reading them from INI config.

changelog/2882.bugfix

@@ -1 +0,0 @@
-Show full context of doctest source in the pytest output, if the lineno of failed example in the docstring is < 9.

changelog/2893.doc

@@ -1 +0,0 @@
-Clarify language of proposal for fixtures parameters

changelog/2903.doc

@@ -1 +0,0 @@
-List python 3.6 in the documented supported versions in the getting started document.

changelog/538.doc

@@ -1 +0,0 @@
-Clarify the documentation of available fixture scopes.

changelog/911.doc

@@ -1 +0,0 @@
-Add documentation about the ``python -m pytest`` invocation adding the current directory to sys.path.

doc/en/announce/index.rst

@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
    
+   release-3.2.4
    release-3.2.3
    release-3.2.2
    release-3.2.1

doc/en/announce/release-3.2.4.rst

@@ -0,0 +1,36 @@
+pytest-3.2.4
+=======================================
+
+pytest 3.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 http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Bruno Oliveira
+* Christian Boelsen
+* Christoph Buchner
+* Daw-Ran Liou
+* Florian Bruhin
+* Franck Michea
+* Leonard Lausen
+* Matty G
+* Owen Tuz
+* Pavel Karateev
+* Pierre GIRAUD
+* Ronny Pfannschmidt
+* Stephen Finucane
+* Sviatoslav Abakumov
+* Thomas Hisch
+* Tom Dalton
+* Xuan Luong
+* Yorgos Pagles
+* Семён Марьясин
+
+
+Happy testing,
+The pytest Development Team

doc/en/example/pythoncollection.rst

@@ -235,5 +235,5 @@ file will be left out::
     platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
     rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
     collected 0 items
-
+    
     ======= no tests ran in 0.12 seconds ========

doc/en/example/reportingdemo.rst

@@ -358,7 +358,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.5/site-packages/_pytest/python_api.py:579>:1: ValueError
+    <0-codegen $PYTHON_PREFIX/lib/python3.5/site-packages/_pytest/python_api.py:580>:1: ValueError
     _______ TestRaises.test_raises_doesnt ________
     
     self = <failure_demo.TestRaises object at 0xdeadbeef>

doc/en/skipping.rst

@@ -335,12 +335,12 @@ Running it with the report-on-xfail option gives this output::
     platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
     rootdir: $REGENDOC_TMPDIR/example, inifile:
     collected 7 items
-
+    
     xfail_demo.py xxxxxxx
     ======= short test summary info ========
     XFAIL xfail_demo.py::test_hello
     XFAIL xfail_demo.py::test_hello2
-      reason: [NOTRUN]
+      reason: [NOTRUN] 
     XFAIL xfail_demo.py::test_hello3
       condition: hasattr(os, 'sep')
     XFAIL xfail_demo.py::test_hello4
@@ -350,7 +350,7 @@ Running it with the report-on-xfail option gives this output::
     XFAIL xfail_demo.py::test_hello6
       reason: reason
     XFAIL xfail_demo.py::test_hello7
-
+    
     ======= 7 xfailed in 0.12 seconds ========
 
 .. _`skip/xfail with parametrize`:

setup.py

@@ -45,7 +45,7 @@ def has_environment_marker_support():
 def main():
     extras_require = {}
     install_requires = [
-        'py>=1.4.33',
+        'py>=1.4.33,<1.5',
         'six>=1.10.0',
         'setuptools',
         'attrs>=17.2.0',