From nicoddemus at gmail.com  Fri Nov  3 14:52:29 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 03 Nov 2017 11:52:29 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 4a436f: move responsibility for
 parameterset extraction in...
Message-ID: <59fcbaed582be_1a613fd0f91b9c34910aa@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 4a436f225532e019787f5ef88be949e826928e21
      https://github.com/pytest-dev/pytest/commit/4a436f225532e019787f5ef88be949e826928e21
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-27 (Fri, 27 Oct 2017)

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/2877.trivial

  Log Message:
  -----------
  move responsibility for parameterset extraction into parameterset class


  Commit: 460cae02b0d48594730870ae0e6cf8cd9653b865
      https://github.com/pytest-dev/pytest/commit/460cae02b0d48594730870ae0e6cf8cd9653b865
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-03 (Fri, 03 Nov 2017)

  Changed paths:
    M changelog/2877.trivial

  Log Message:
  -----------
  Small formatting fix in CHANGELOG


  Commit: 7d43225c3644ec0e5e86080db686151c042c822d
      https://github.com/pytest-dev/pytest/commit/7d43225c3644ec0e5e86080db686151c042c822d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-03 (Fri, 03 Nov 2017)

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/2877.trivial

  Log Message:
  -----------
  Merge pull request #2877 from RonnyPfannschmidt/extract-extract-parameterset

move responsibility for parameterset extraction into parameterset class


Compare: https://github.com/pytest-dev/pytest/compare/cb30848e5a2e...7d43225c3644

From nicoddemus at gmail.com  Fri Nov  3 15:13:20 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 03 Nov 2017 12:13:20 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 821f9a: deprecate the public
 internal PyCollector.makeitem...
Message-ID: <59fcbfd0464_1ba93f87fae5bc3c34542@hookshot-fe-92cdb05.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 821f9a94d8e5f8328abb43277781d29c03fa1b05
      https://github.com/pytest-dev/pytest/commit/821f9a94d8e5f8328abb43277781d29c03fa1b05
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/python.py

  Log Message:
  -----------
  deprecate the public internal PyCollector.makeitem method


  Commit: 766de67392dda354fd37023f219dd71a4252efce
      https://github.com/pytest-dev/pytest/commit/766de67392dda354fd37023f219dd71a4252efce
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M _pytest/deprecated.py

  Log Message:
  -----------
  Fix linting error in deprecated.py


  Commit: d1aa553f739e91cd470eea23042b6c8bcebe9b6f
      https://github.com/pytest-dev/pytest/commit/d1aa553f739e91cd470eea23042b6c8bcebe9b6f
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    A testing/python/test_deprecations.py

  Log Message:
  -----------
  add mocked integrationtest for the deprecationwarning of makeitem


  Commit: d7e8eeef56c3c5a8bcebe19a21943f7e969b62af
      https://github.com/pytest-dev/pytest/commit/d7e8eeef56c3c5a8bcebe19a21943f7e969b62af
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-03 (Fri, 03 Nov 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/python.py
    A testing/python/test_deprecations.py

  Log Message:
  -----------
  Merge pull request #2878 from RonnyPfannschmidt/collector-makeitem-deprecate

deprecate the public internal PyCollector.makeitem method


Compare: https://github.com/pytest-dev/pytest/compare/7d43225c3644...d7e8eeef56c3

From nicoddemus at gmail.com  Mon Nov  6 09:56:59 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 06 Nov 2017 06:56:59 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 07b2b1: introduce attrs as
 dependency and use it
Message-ID: <5a00783b6892b_14af3fb59f4c3c3820415@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 07b2b18a01a3ba12757a4eb1c0e082922f5299e5
      https://github.com/pytest-dev/pytest/commit/07b2b18a01a3ba12757a4eb1c0e082922f5299e5
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/mark.py
    M setup.py

  Log Message:
  -----------
  introduce attrs as dependency and use it

for FixtureFunctionMarker and marks


  Commit: e58e8faf476edebc4cdba54951cdd84efcd10124
      https://github.com/pytest-dev/pytest/commit/e58e8faf476edebc4cdba54951cdd84efcd10124
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-03 (Fri, 03 Nov 2017)

  Changed paths:
    A changelog/2641.trivial

  Log Message:
  -----------
  Add CHANGELOG entry for attrs module dependency


  Commit: e351976ef4e3c6c4d57fd002d05011fc2a879803
      https://github.com/pytest-dev/pytest/commit/e351976ef4e3c6c4d57fd002d05011fc2a879803
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-04 (Sat, 04 Nov 2017)

  Changed paths:
    M AUTHORS
    M _pytest/assertion/rewrite.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/1505.doc
    A changelog/2658.doc
    A changelog/2856.bugfix
    A changelog/2877.trivial
    A changelog/2882.bugfix
    M doc/en/assert.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/fixture.rst
    M doc/en/plugins.rst
    M doc/en/skipping.rst
    M doc/en/writing_plugins.rst
    A testing/python/test_deprecations.py
    M testing/test_assertrewrite.py
    M testing/test_doctest.py
    M testing/test_mark.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features' into RonnyPfannschmidt/introduce-attrs


  Commit: c33074c8b9d11d0806ae7da73ad99d96a88539ab
      https://github.com/pytest-dev/pytest/commit/c33074c8b9d11d0806ae7da73ad99d96a88539ab
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-06 (Mon, 06 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/mark.py
    A changelog/2641.trivial
    M setup.py

  Log Message:
  -----------
  Merge pull request #2641 from RonnyPfannschmidt/introduce-attrs

[RFC] Introduce attrs


Compare: https://github.com/pytest-dev/pytest/compare/b18a9deb4c54...c33074c8b9d1

From nicoddemus at gmail.com  Fri Nov 10 15:15:54 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 10 Nov 2017 12:15:54 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 03829f: Fix linting E741:
 ambiguous variable name
Message-ID: <5a0608fae089a_6b33fb3ae8dfc381144d7@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 03829fde8afde32c7ee4ff0d01b728b405e24b5d
      https://github.com/pytest-dev/pytest/commit/03829fde8afde32c7ee4ff0d01b728b405e24b5d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-04 (Sat, 04 Nov 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/util.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_nose.py
    M testing/test_pluginmanager.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M tox.ini

  Log Message:
  -----------
  Fix linting E741: ambiguous variable name


  Commit: b11640c1eb27a170e6390b4b39be8b06e23f3a5a
      https://github.com/pytest-dev/pytest/commit/b11640c1eb27a170e6390b4b39be8b06e23f3a5a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-04 (Sat, 04 Nov 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/unittest.py
    M testing/code/test_excinfo.py
    M tox.ini

  Log Message:
  -----------
  Fix linting E722: do not use bare except


  Commit: 3900879a5c261dc06ac69415b7b3507ec6142a9c
      https://github.com/pytest-dev/pytest/commit/3900879a5c261dc06ac69415b7b3507ec6142a9c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-09 (Thu, 09 Nov 2017)

  Changed paths:
    M testing/test_warnings.py

  Log Message:
  -----------
  Mark test_py2_unicode as xfail in PyPy2 on Windows

#2905


  Commit: 66fbebfc264722137a223d1f918061c609ddd8a1
      https://github.com/pytest-dev/pytest/commit/66fbebfc264722137a223d1f918061c609ddd8a1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_nose.py
    M testing/test_pluginmanager.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2894 from nicoddemus/fix-linting-errors

Fix linting errors


Compare: https://github.com/pytest-dev/pytest/compare/b2b1eb262f3a...66fbebfc2647

From nicoddemus at gmail.com  Fri Nov 10 15:49:36 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 10 Nov 2017 12:49:36 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] c47dca: switch a special case
 in scope node lookup to a ge...
Message-ID: <5a0610e0ea4f0_6f203fac5800bc2c88034@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: c47dcaa7134527abf40bd469864c433dfba1814b
      https://github.com/pytest-dev/pytest/commit/c47dcaa7134527abf40bd469864c433dfba1814b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2910.trivial

  Log Message:
  -----------
  switch a special case in scope node lookup to a general one


  Commit: 0108f262b1ad37b609222605182f90a33c3fa067
      https://github.com/pytest-dev/pytest/commit/0108f262b1ad37b609222605182f90a33c3fa067
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M changelog/2910.trivial

  Log Message:
  -----------
  Fix typo in CHANGELOG


  Commit: 99496d9e5b7bdbc9ae34224772f7309ccb82e9b4
      https://github.com/pytest-dev/pytest/commit/99496d9e5b7bdbc9ae34224772f7309ccb82e9b4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2910.trivial

  Log Message:
  -----------
  Merge pull request #2910 from RonnyPfannschmidt/scopenode-sanitize-specials

switch a special case in scope node lookup to a general one


Compare: https://github.com/pytest-dev/pytest/compare/c33074c8b9d1...99496d9e5b7b

From nicoddemus at gmail.com  Fri Nov 10 15:57:15 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 10 Nov 2017 12:57:15 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 76f3be: remove unused
 _pytest.runner.NodeInfo class
Message-ID: <5a0612ab49363_286e3fc606023c243204b@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 76f3be452a01441d6ee1d9c53d7f1fefaa5c8f45
      https://github.com/pytest-dev/pytest/commit/76f3be452a01441d6ee1d9c53d7f1fefaa5c8f45
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M _pytest/runner.py

  Log Message:
  -----------
  remove unused _pytest.runner.NodeInfo class


  Commit: 742f9cb825ab676e948e434efa212d73ba1346c6
      https://github.com/pytest-dev/pytest/commit/742f9cb825ab676e948e434efa212d73ba1346c6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M _pytest/runner.py

  Log Message:
  -----------
  Merge pull request #2911 from RonnyPfannschmidt/remove-nodeinfo

remove unused _pytest.runner.NodeInfo class


Compare: https://github.com/pytest-dev/pytest/compare/66fbebfc2647...742f9cb825ab

From nicoddemus at gmail.com  Sun Nov 12 07:18:37 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 12 Nov 2017 04:18:37 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 14b638: Fix #2775 - running
 pytest with "--pyargs" will re...
Message-ID: <5a083c1dca0ac_6e4f3fb72b4cfc308332@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 14b6380e5f8c2e26aa518de8a499978eb9601848
      https://github.com/pytest-dev/pytest/commit/14b6380e5f8c2e26aa518de8a499978eb9601848
  Author: Christian Boelsen <christian.boelsen at hds.com>
  Date:   2017-09-13 (Wed, 13 Sep 2017)

  Changed paths:
    M _pytest/main.py
    A changelog/2775.bugfix
    M testing/acceptance_test.py

  Log Message:
  -----------
  Fix #2775 - running pytest with "--pyargs" will result in Items with empty "parent.nodeid" if run from a different root directory


  Commit: 794d4585d3b0e3c892ee97142e5c1d392928d372
      https://github.com/pytest-dev/pytest/commit/794d4585d3b0e3c892ee97142e5c1d392928d372
  Author: Christian Boelsen <christian.boelsen+github at gmail.com>
  Date:   2017-09-28 (Thu, 28 Sep 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  Remove unnecessary complexity in _check_initialpaths_for_relpath().


  Commit: f0f2d2b861bf8df93afce4e9844a8f97fe402cef
      https://github.com/pytest-dev/pytest/commit/f0f2d2b861bf8df93afce4e9844a8f97fe402cef
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-11 (Sat, 11 Nov 2017)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M HOWTORELEASE.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    A _pytest/nodes.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    A changelog/1505.doc
    R changelog/1548.doc
    A changelog/1997.doc
    A changelog/2658.doc
    R changelog/2722.trivial
    R changelog/2758.bugfix
    R changelog/2765.trivial
    A changelog/2819.bugfix
    A changelog/2836.bug
    A changelog/2856.bugfix
    A changelog/2882.bugfix
    A changelog/2893.doc
    A changelog/2903.doc
    A changelog/538.doc
    A changelog/911.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.3.rst
    M doc/en/assert.rst
    M doc/en/contents.rst
    A doc/en/development_guide.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    M doc/en/pythonpath.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/show_fixtures_per_test.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_mark.py
    A testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_pluginmanager.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'master' into fix-missing-nodeid-with-pyargs


  Commit: 259b86b6ab1aea38ae35043d8e12e82ef3576b32
      https://github.com/pytest-dev/pytest/commit/259b86b6ab1aea38ae35043d8e12e82ef3576b32
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/main.py
    A changelog/2775.bugfix
    M testing/acceptance_test.py

  Log Message:
  -----------
  Merge pull request #2776 from cryporchild/fix-missing-nodeid-with-pyargs

Fix #2775 - running pytest with "--pyargs" will result in Items with ?


Compare: https://github.com/pytest-dev/pytest/compare/b671c5a8bfde...259b86b6ab1a

From nicoddemus at gmail.com  Sun Nov 12 18:57:42 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 12 Nov 2017 15:57:42 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 522d59: Use session.config.hook
 instead of ihook. Fixes #2...
Message-ID: <5a08dff6e9314_40313fe912fc3c2c504e9@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 522d59e844abe815790acf733a0aa13b597acfac
      https://github.com/pytest-dev/pytest/commit/522d59e844abe815790acf733a0aa13b597acfac
  Author: Dmitry Malinovsky <damalinov at gmail.com>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M _pytest/fixtures.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Use session.config.hook instead of ihook. Fixes #2124


  Commit: a63b34c68596e4cddec6d899d8b27417ea4ce72c
      https://github.com/pytest-dev/pytest/commit/a63b34c68596e4cddec6d899d8b27417ea4ce72c
  Author: Dmitry Malinovsky <damalinov at gmail.com>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Switch to item fspath


  Commit: 14b6380e5f8c2e26aa518de8a499978eb9601848
      https://github.com/pytest-dev/pytest/commit/14b6380e5f8c2e26aa518de8a499978eb9601848
  Author: Christian Boelsen <christian.boelsen at hds.com>
  Date:   2017-09-13 (Wed, 13 Sep 2017)

  Changed paths:
    M _pytest/main.py
    A changelog/2775.bugfix
    M testing/acceptance_test.py

  Log Message:
  -----------
  Fix #2775 - running pytest with "--pyargs" will result in Items with empty "parent.nodeid" if run from a different root directory


  Commit: 794d4585d3b0e3c892ee97142e5c1d392928d372
      https://github.com/pytest-dev/pytest/commit/794d4585d3b0e3c892ee97142e5c1d392928d372
  Author: Christian Boelsen <christian.boelsen+github at gmail.com>
  Date:   2017-09-28 (Thu, 28 Sep 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  Remove unnecessary complexity in _check_initialpaths_for_relpath().


  Commit: 76f3be452a01441d6ee1d9c53d7f1fefaa5c8f45
      https://github.com/pytest-dev/pytest/commit/76f3be452a01441d6ee1d9c53d7f1fefaa5c8f45
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M _pytest/runner.py

  Log Message:
  -----------
  remove unused _pytest.runner.NodeInfo class


  Commit: 742f9cb825ab676e948e434efa212d73ba1346c6
      https://github.com/pytest-dev/pytest/commit/742f9cb825ab676e948e434efa212d73ba1346c6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M _pytest/runner.py

  Log Message:
  -----------
  Merge pull request #2911 from RonnyPfannschmidt/remove-nodeinfo

remove unused _pytest.runner.NodeInfo class


  Commit: f320686fe06bb6a9a9c2009613206114edc55d40
      https://github.com/pytest-dev/pytest/commit/f320686fe06bb6a9a9c2009613206114edc55d40
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-11 (Sat, 11 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Make SubRequest.addfinalizer an explicit method

This implicit definition really tripped me while debugging #2127,
unfortunately hidden as it was in the middle of all the variable
declarations.

I think the explicit definition is much easier for the eyes and IDEs
to find.


  Commit: b671c5a8bfde9a470e25b30e718eed140662c2b8
      https://github.com/pytest-dev/pytest/commit/b671c5a8bfde9a470e25b30e718eed140662c2b8
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-11 (Sat, 11 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Merge pull request #2914 from nicoddemus/addfinalizer-refactor

Make SubRequest.addfinalizer an explicit method


  Commit: f0f2d2b861bf8df93afce4e9844a8f97fe402cef
      https://github.com/pytest-dev/pytest/commit/f0f2d2b861bf8df93afce4e9844a8f97fe402cef
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-11 (Sat, 11 Nov 2017)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M HOWTORELEASE.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    A _pytest/nodes.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    A changelog/1505.doc
    R changelog/1548.doc
    A changelog/1997.doc
    A changelog/2658.doc
    R changelog/2722.trivial
    R changelog/2758.bugfix
    R changelog/2765.trivial
    A changelog/2819.bugfix
    A changelog/2836.bug
    A changelog/2856.bugfix
    A changelog/2882.bugfix
    A changelog/2893.doc
    A changelog/2903.doc
    A changelog/538.doc
    A changelog/911.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.3.rst
    M doc/en/assert.rst
    M doc/en/contents.rst
    A doc/en/development_guide.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    M doc/en/pythonpath.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/show_fixtures_per_test.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_mark.py
    A testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_pluginmanager.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'master' into fix-missing-nodeid-with-pyargs


  Commit: 259b86b6ab1aea38ae35043d8e12e82ef3576b32
      https://github.com/pytest-dev/pytest/commit/259b86b6ab1aea38ae35043d8e12e82ef3576b32
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/main.py
    A changelog/2775.bugfix
    M testing/acceptance_test.py

  Log Message:
  -----------
  Merge pull request #2776 from cryporchild/fix-missing-nodeid-with-pyargs

Fix #2775 - running pytest with "--pyargs" will result in Items with ?


  Commit: 258031afe586e789d121b2a02dba37ea6c4a26e1
      https://github.com/pytest-dev/pytest/commit/258031afe586e789d121b2a02dba37ea6c4a26e1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .gitignore
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M HOWTORELEASE.rst
    M LICENSE
    R MANIFEST.in
    M README.rst
    M _pytest/__init__.py
    M _pytest/_argcomplete.py
    M _pytest/_code/__init__.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    A _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    R _pytest/impl
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    A _pytest/nodes.py
    M _pytest/nose.py
    A _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    A _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/vendored_packages/pluggy.py
    A _pytest/warnings.py
    M appveyor.yml
    A changelog/1505.doc
    A changelog/1997.doc
    A changelog/2658.doc
    A changelog/2775.bugfix
    A changelog/2819.bugfix
    A changelog/2836.bug
    A changelog/2856.bugfix
    A changelog/2882.bugfix
    A changelog/2893.doc
    A changelog/2903.doc
    A changelog/538.doc
    A changelog/911.doc
    A changelog/_template.rst
    M doc/en/Makefile
    M doc/en/_templates/globaltoc.html
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.2.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.1.rst
    M doc/en/announce/release-2.9.2.rst
    A doc/en/announce/release-3.0.6.rst
    A doc/en/announce/release-3.0.7.rst
    A doc/en/announce/release-3.1.0.rst
    A doc/en/announce/release-3.1.1.rst
    A doc/en/announce/release-3.1.2.rst
    A doc/en/announce/release-3.1.3.rst
    A doc/en/announce/release-3.2.0.rst
    A doc/en/announce/release-3.2.1.rst
    A doc/en/announce/release-3.2.2.rst
    A doc/en/announce/release-3.2.3.rst
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/conf.py
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    A doc/en/development_guide.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/attic.rst
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/index.rst
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    A doc/en/existingtestsuite.rst
    M doc/en/faq.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    A doc/en/historical-notes.rst
    M doc/en/index.rst
    M doc/en/license.rst
    M doc/en/mark.rst
    M doc/en/monkeypatch.rst
    M doc/en/nose.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    M doc/en/projects.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    A doc/en/pythonpath.rst
    M doc/en/recwarn.rst
    A doc/en/requirements.txt
    R doc/en/setup.rst
    M doc/en/skipping.rst
    M doc/en/talks.rst
    M doc/en/test/attic.rst
    M doc/en/test/plugin/xdist.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    A doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    A pyproject.toml
    M pytest.py
    M scripts/call-tox.bat
    R scripts/check-manifest.py
    A scripts/check-rst.py
    M setup.cfg
    M setup.py
    A tasks/__init__.py
    A tasks/generate.py
    A tasks/release.minor.rst
    A tasks/release.patch.rst
    A tasks/requirements.txt
    A tasks/vendoring.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    A testing/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/python/setup_only.py
    M testing/python/show_fixtures_per_test.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    A testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    A testing/test_modimport.py
    M testing/test_monkeypatch.py
    A testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    A testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into malinoff/fix-2124


  Commit: 6550b9911bd38e3cb01fab0af388530b46619d4b
      https://github.com/pytest-dev/pytest/commit/6550b9911bd38e3cb01fab0af388530b46619d4b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M testing/python/fixture.py

  Log Message:
  -----------
  pytest_fixture_post_finalizer now receives a request argument


  Commit: f074fd9ac6d5e86a8ec240c395b1d031c45988e2
      https://github.com/pytest-dev/pytest/commit/f074fd9ac6d5e86a8ec240c395b1d031c45988e2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M .coveragerc
    M .travis.yml
    M AUTHORS
    M README.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    R _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    A _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    R _pytest/vendored_packages/README.md
    R _pytest/vendored_packages/__init__.py
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/INSTALLER
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/RECORD
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/WHEEL
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/metadata.json
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/top_level.txt
    R _pytest/vendored_packages/pluggy.py
    M _pytest/warnings.py
    M appveyor.yml
    A changelog/1993.bugfix
    A changelog/2236.removal
    A changelog/2267.feature
    A changelog/2491.bugfix
    A changelog/2549.feature
    A changelog/2641.trivial
    A changelog/2642.trivial
    A changelog/2672.removal
    A changelog/2675.removal
    A changelog/2708.feature
    A changelog/2709.bugfix
    A changelog/2719.trivial
    A changelog/2734.trivial
    A changelog/2738.bugfix
    A changelog/2751.bugfix
    A changelog/2767.removal
    A changelog/2767.trivial
    A changelog/2794.feature
    A changelog/2803.removal
    A changelog/2808.feature
    A changelog/2809.bugfix
    A changelog/2812.removal
    A changelog/2824.feature
    A changelog/2845.bugfix
    A changelog/2877.trivial
    A changelog/2879.feature
    A changelog/2910.trivial
    A changelog/502.feature
    M doc/en/contents.rst
    M doc/en/example/multipython.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    A doc/en/logging.rst
    M doc/en/plugins.rst
    M doc/en/skipping.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pytest.py
    M setup.py
    R tasks/vendoring.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    A testing/logging/test_fixture.py
    A testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    A testing/python/test_deprecations.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_parseopt.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features' into malinoff/fix-2124


  Commit: 063335a715bce042e0c9e591ab8ad406488cb5dc
      https://github.com/pytest-dev/pytest/commit/063335a715bce042e0c9e591ab8ad406488cb5dc
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    A changelog/2124.bugfix
    A changelog/2124.feature

  Log Message:
  -----------
  Add changelog entries for #2124


  Commit: bdad345f991cae76896476a1b574269b23085bc3
      https://github.com/pytest-dev/pytest/commit/bdad345f991cae76896476a1b574269b23085bc3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Fix passing request to finish() in FixtureDef


  Commit: 6d3fe0b826c2aacf1eec573ed0fd50eb8774ee77
      https://github.com/pytest-dev/pytest/commit/6d3fe0b826c2aacf1eec573ed0fd50eb8774ee77
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Explicitly clear finalizers list in finalize to ensure cleanup


  Commit: a6f2d2d2c958d743813414e46041adf3e47fb997
      https://github.com/pytest-dev/pytest/commit/a6f2d2d2c958d743813414e46041adf3e47fb997
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Rename FixtureDef.finalizer to FixtureDef.finalizers


  Commit: 685387a43ec504f3b6447dcf389a65fad342d548
      https://github.com/pytest-dev/pytest/commit/685387a43ec504f3b6447dcf389a65fad342d548
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/runner.py
    A changelog/2124.bugfix
    A changelog/2124.feature
    A changelog/2775.bugfix
    M testing/acceptance_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #2127 from malinoff/fix-2124

Use session.config.hook instead of ihook. Fixes #2124


Compare: https://github.com/pytest-dev/pytest/compare/d1af369800e8...685387a43ec5

From nicoddemus at gmail.com  Mon Nov 13 14:56:54 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 13 Nov 2017 11:56:54 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] d26c1e: Pin py<1.5 as 1.5 drops
 py26 and py33 support
Message-ID: <5a09f906bed05_78e23fae5015dc349556e@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d26c1e3ad9d3bb816dfdedf7b63e390f1b2abb28
      https://github.com/pytest-dev/pytest/commit/d26c1e3ad9d3bb816dfdedf7b63e390f1b2abb28
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Pin py<1.5 as 1.5 drops py26 and py33 support


  Commit: 22cff038f87d4ef1e4324c1def81cb1fbf1efec6
      https://github.com/pytest-dev/pytest/commit/22cff038f87d4ef1e4324c1def81cb1fbf1efec6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Merge pull request #2916 from nicoddemus/bin-py-1.5

Pin py<1.5 as 1.5 drops py26 and py33 support


Compare: https://github.com/pytest-dev/pytest/compare/259b86b6ab1a...22cff038f87d

From nicoddemus at gmail.com  Tue Nov 14 15:30:40 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 14 Nov 2017 12:30:40 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] a0ad9e: Preparing release
 version 3.2.4
Message-ID: <5a0b527081e87_d9a93fa4450a5c341009bc@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/tags/3.2.4
  Home:   https://github.com/pytest-dev/pytest
  Commit: a0ad9e31da70606916dd22ff4fd9bd64269f5eec
      https://github.com/pytest-dev/pytest/commit/a0ad9e31da70606916dd22ff4fd9bd64269f5eec
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1505.doc
    R changelog/1997.doc
    R changelog/2658.doc
    R changelog/2775.bugfix
    R changelog/2819.bugfix
    R changelog/2856.bugfix
    R changelog/2882.bugfix
    R changelog/2893.doc
    R changelog/2903.doc
    R changelog/538.doc
    R changelog/911.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.4.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Preparing release version 3.2.4



From nicoddemus at gmail.com  Tue Nov 14 15:31:04 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 14 Nov 2017 12:31:04 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] a0ad9e: Preparing release
 version 3.2.4
Message-ID: <5a0b5288665be_486a3ff94a98fc3c391b9@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: a0ad9e31da70606916dd22ff4fd9bd64269f5eec
      https://github.com/pytest-dev/pytest/commit/a0ad9e31da70606916dd22ff4fd9bd64269f5eec
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1505.doc
    R changelog/1997.doc
    R changelog/2658.doc
    R changelog/2775.bugfix
    R changelog/2819.bugfix
    R changelog/2856.bugfix
    R changelog/2882.bugfix
    R changelog/2893.doc
    R changelog/2903.doc
    R changelog/538.doc
    R changelog/911.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.4.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Preparing release version 3.2.4


  Commit: 9628c712106cecd8667f8f0a0b3e543e667f6c58
      https://github.com/pytest-dev/pytest/commit/9628c712106cecd8667f8f0a0b3e543e667f6c58
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1505.doc
    R changelog/1997.doc
    R changelog/2658.doc
    R changelog/2775.bugfix
    R changelog/2819.bugfix
    R changelog/2856.bugfix
    R changelog/2882.bugfix
    R changelog/2893.doc
    R changelog/2903.doc
    R changelog/538.doc
    R changelog/911.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.4.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Merge pull request #2921 from nicoddemus/release-3.2.4

Preparing release version 3.2.4


Compare: https://github.com/pytest-dev/pytest/compare/22cff038f87d...9628c712106c

From nicoddemus at gmail.com  Tue Nov 14 15:33:47 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 14 Nov 2017 12:33:47 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 54cea3: Small formatting
 changes in CHANGELOG
Message-ID: <5a0b532b3685c_d8703f97581d3c2c703f2@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 54cea3d1785dae41db558d11eaccc991d29cd859
      https://github.com/pytest-dev/pytest/commit/54cea3d1785dae41db558d11eaccc991d29cd859
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Small formatting changes in CHANGELOG



From nicoddemus at gmail.com  Wed Nov 15 06:22:28 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 15 Nov 2017 03:22:28 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 4a0aea: Add missing entry to
 CHANGELOG for 3.2.4
Message-ID: <5a0c2374c22ba_14fdf3fb76014fc38659c4@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/tags/3.2.5
  Home:   https://github.com/pytest-dev/pytest
  Commit: 4a0aea2debfdd0ed2584221128fed891d0bc727d
      https://github.com/pytest-dev/pytest/commit/4a0aea2debfdd0ed2584221128fed891d0bc727d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2836.bug

  Log Message:
  -----------
  Add missing entry to CHANGELOG for 3.2.4


  Commit: dd6c5344681809a7509e45acdf3e28d03b728144
      https://github.com/pytest-dev/pytest/commit/dd6c5344681809a7509e45acdf3e28d03b728144
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    A changelog/2926.bugfix
    M setup.py

  Log Message:
  -----------
  Remove py<1.5 restriction

Fix #2926


  Commit: a220a40350a8a81c0f0e1986aa184e4c33da29d6
      https://github.com/pytest-dev/pytest/commit/a220a40350a8a81c0f0e1986aa184e4c33da29d6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2926.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.5.rst

  Log Message:
  -----------
  Preparing release version 3.2.5


Compare: https://github.com/pytest-dev/pytest/compare/4a0aea2debfd^...a220a40350a8

From nicoddemus at gmail.com  Wed Nov 15 06:22:49 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 15 Nov 2017 03:22:49 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 4a0aea: Add missing entry to
 CHANGELOG for 3.2.4
Message-ID: <5a0c23899405b_7cd73fde2cf2fc349995f@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 4a0aea2debfdd0ed2584221128fed891d0bc727d
      https://github.com/pytest-dev/pytest/commit/4a0aea2debfdd0ed2584221128fed891d0bc727d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2836.bug

  Log Message:
  -----------
  Add missing entry to CHANGELOG for 3.2.4


  Commit: dd6c5344681809a7509e45acdf3e28d03b728144
      https://github.com/pytest-dev/pytest/commit/dd6c5344681809a7509e45acdf3e28d03b728144
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    A changelog/2926.bugfix
    M setup.py

  Log Message:
  -----------
  Remove py<1.5 restriction

Fix #2926


  Commit: a220a40350a8a81c0f0e1986aa184e4c33da29d6
      https://github.com/pytest-dev/pytest/commit/a220a40350a8a81c0f0e1986aa184e4c33da29d6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2926.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.5.rst

  Log Message:
  -----------
  Preparing release version 3.2.5


  Commit: 74aaf916539f7f38381d03ce289139da969ec4a7
      https://github.com/pytest-dev/pytest/commit/74aaf916539f7f38381d03ce289139da969ec4a7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2836.bug
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.5.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #2927 from nicoddemus/release-3.2.5

Release 3.2.5


Compare: https://github.com/pytest-dev/pytest/compare/54cea3d1785d...74aaf916539f

From nicoddemus at gmail.com  Wed Nov 15 18:59:55 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 15 Nov 2017 15:59:55 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] c7be83: Update pluggy pin to
 0.5.*
Message-ID: <5a0cd4fb28423_1883feca2dadc381318c8@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: c7be83ac47363be6db6dc28e79b7b1d82ad319d9
      https://github.com/pytest-dev/pytest/commit/c7be83ac47363be6db6dc28e79b7b1d82ad319d9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Update pluggy pin to 0.5.*


  Commit: e2c59d3282044e3c90e6ec9a96a61aa64f22a75d
      https://github.com/pytest-dev/pytest/commit/e2c59d3282044e3c90e6ec9a96a61aa64f22a75d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Change pluggy._CallOutcome to pluggy._Result after update to pluggy-0.5


  Commit: c19708b193b9addd705d91e24a9cd4a0554cfabd
      https://github.com/pytest-dev/pytest/commit/c19708b193b9addd705d91e24a9cd4a0554cfabd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M doc/en/writing_plugins.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #2930 from nicoddemus/pin-pluggy-0.5

Update pluggy pin to 0.5.*


Compare: https://github.com/pytest-dev/pytest/compare/1aeb58b5313d...c19708b193b9

From nicoddemus at gmail.com  Fri Nov 17 05:00:12 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 17 Nov 2017 02:00:12 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 8f9081: Add capfdbinary fixture
Message-ID: <5a0eb32cb34c4_1f863fd703a71c2c7108e@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 8f9081248105eaa704fa79abb5e544571ab8c9e8
      https://github.com/pytest-dev/pytest/commit/8f9081248105eaa704fa79abb5e544571ab8c9e8
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/2923.feature
    M doc/en/capture.rst
    M testing/test_capture.py

  Log Message:
  -----------
  Add capfdbinary fixture

`capfdbinary` works like `capfd` but produces bytes for `readouterr()`.


  Commit: 6161bcff6e3f07359c94a7be52ad32ecb8822142
      https://github.com/pytest-dev/pytest/commit/6161bcff6e3f07359c94a7be52ad32ecb8822142
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/2923.feature
    M doc/en/capture.rst
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2925 from asottile/capfdbinary

Add capfdbinary fixture


Compare: https://github.com/pytest-dev/pytest/compare/99a4a93dbcd5...6161bcff6e3f

From nicoddemus at gmail.com  Sat Nov 18 09:30:34 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 18 Nov 2017 06:30:34 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] f9029f: Add Deprecation Roadmap
 to backward compatibility ...
Message-ID: <5a10440a9996a_1eab3fc6c8af9c30210ae@hookshot-fe-92cdb05.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: f9029f11af078bb6cb4cc3b8039fa2f256e86cd1
      https://github.com/pytest-dev/pytest/commit/f9029f11af078bb6cb4cc3b8039fa2f256e86cd1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M doc/en/backwards-compatibility.rst

  Log Message:
  -----------
  Add Deprecation Roadmap to backward compatibility document

We should replace the wiki document to a link to this document now


  Commit: b0f558da44ed2a72fefcee172cba57ed688ff8db
      https://github.com/pytest-dev/pytest/commit/b0f558da44ed2a72fefcee172cba57ed688ff8db
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M doc/en/backwards-compatibility.rst

  Log Message:
  -----------
  Add Future/Past Releases section


  Commit: 77bd0aa02ffc7f8734682c2e353135af5d94ab76
      https://github.com/pytest-dev/pytest/commit/77bd0aa02ffc7f8734682c2e353135af5d94ab76
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M doc/en/backwards-compatibility.rst

  Log Message:
  -----------
  Merge pull request #2931 from nicoddemus/deprecation-roadmap-docs

Add Deprecation Roadmap to backward compatibility document


Compare: https://github.com/pytest-dev/pytest/compare/74aaf916539f...77bd0aa02ffc

From nicoddemus at gmail.com  Wed Nov 22 12:36:31 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 22 Nov 2017 09:36:31 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 5e71ff: Handle marks without
 description
Message-ID: <5a15b59f5e7bd_7da13fe14bb2bc3816238c@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 5e71ffab8721bf04105cd1b64d03880bd4a3683a
      https://github.com/pytest-dev/pytest/commit/5e71ffab8721bf04105cd1b64d03880bd4a3683a
  Author: Sviatoslav Abakumov <abakumov.sviatoslav at progforce.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M _pytest/mark.py
    A changelog/2942.bugfix
    M testing/test_mark.py

  Log Message:
  -----------
  Handle marks without description


  Commit: 378eb5d67b099128b498da5521737100bf18a6a0
      https://github.com/pytest-dev/pytest/commit/378eb5d67b099128b498da5521737100bf18a6a0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M changelog/2942.bugfix

  Log Message:
  -----------
  Minor formatting change in CHANGELOG


  Commit: 27935ebec92d76239b9876b8b185ffa24481b983
      https://github.com/pytest-dev/pytest/commit/27935ebec92d76239b9876b8b185ffa24481b983
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M _pytest/mark.py
    A changelog/2942.bugfix
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #2943 from Perlence/fix-marks-without-description

Handle marks without description


Compare: https://github.com/pytest-dev/pytest/compare/8df7ed12c19e...27935ebec92d

From nicoddemus at gmail.com  Thu Nov 23 13:31:11 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 23 Nov 2017 10:31:11 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] e0d236: Remove gendoc
 normalization for '=' and '_' header...
Message-ID: <5a1713ef48a7c_b023f9bde66bc3c111581@hookshot-fe-92cdb05.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: e0d236c0317f589811863a0db3c29787ded7375e
      https://github.com/pytest-dev/pytest/commit/e0d236c0317f589811863a0db3c29787ded7375e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Remove gendoc normalization for '=' and '_' headers

Using the default for non-atty terminals (80) so the new
progress indicator aligns correctly.


  Commit: 49c0c599b00de083b4ed537dd84882173e39f27b
      https://github.com/pytest-dev/pytest/commit/49c0c599b00de083b4ed537dd84882173e39f27b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Merge pull request #2944 from nicoddemus/regendoc-norm

Remove gendoc normalization for '=' and '_' headers


Compare: https://github.com/pytest-dev/pytest/compare/b533c2600a0f...49c0c599b00d

From nicoddemus at gmail.com  Sat Nov 25 13:18:31 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 25 Nov 2017 10:18:31 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] e273f5: Update github "bugs"
 link
Message-ID: <5a19b3f7ac9f9_5a1f3fcf755d3c3c42610@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: e273f5399d8a3833e49c69eb5f1630fb4da030a4
      https://github.com/pytest-dev/pytest/commit/e273f5399d8a3833e49c69eb5f1630fb4da030a4
  Author: Eugene Prikazchikov <eprikazc at gmail.com>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M CONTRIBUTING.rst
    A changelog/2949.trivial

  Log Message:
  -----------
  Update github "bugs" link

Apparently, some time ago label was renamed from bug to "type:bug"


  Commit: 6b90ad4d4b958560a07ddaf5ec11eccff28f197e
      https://github.com/pytest-dev/pytest/commit/6b90ad4d4b958560a07ddaf5ec11eccff28f197e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M CONTRIBUTING.rst
    A changelog/2949.trivial

  Log Message:
  -----------
  Merge pull request #2949 from eprikazc/master

Update github "bugs" link


Compare: https://github.com/pytest-dev/pytest/compare/27935ebec92d...6b90ad4d4b95

From nicoddemus at gmail.com  Sun Nov 26 15:12:31 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 26 Nov 2017 12:12:31 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] d5f038: Fix spelling:
 s/re-writ/rewrit/g
Message-ID: <5a1b202f2a87b_6a9a3fbda0eb7c2c89637@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d5f038e29ab3882eed8779efc98fbc3348a21ac6
      https://github.com/pytest-dev/pytest/commit/d5f038e29ab3882eed8779efc98fbc3348a21ac6
  Author: Daniel Hahler <git at thequod.de>
  Date:   2017-11-26 (Sun, 26 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py
    M _pytest/config.py
    M _pytest/pytester.py
    M doc/en/announce/release-2.7.0.rst
    M doc/en/writing_plugins.rst
    M testing/test_assertion.py

  Log Message:
  -----------
  Fix spelling: s/re-writ/rewrit/g

This also fixes "can not" to "cannot" in the "Module already imported so
cannot be rewritten" assertion error.


  Commit: c58715371ceb1453547a6e08dc2ae4075bc98942
      https://github.com/pytest-dev/pytest/commit/c58715371ceb1453547a6e08dc2ae4075bc98942
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-26 (Sun, 26 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py
    M _pytest/config.py
    M _pytest/pytester.py
    M doc/en/announce/release-2.7.0.rst
    M doc/en/writing_plugins.rst
    M testing/test_assertion.py

  Log Message:
  -----------
  Merge pull request #2954 from blueyed/rewritten

Fix spelling: s/re-writ/rewrit/g


Compare: https://github.com/pytest-dev/pytest/compare/6b90ad4d4b95...c58715371ceb

From nicoddemus at gmail.com  Mon Nov 27 16:34:31 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 27 Nov 2017 13:34:31 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] f50ace: Merge remote-tracking
 branch 'upstream/master' int...
Message-ID: <5a1c84e730804_6dc73febd4823c3c1040bc@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/tags/3.3.0
  Home:   https://github.com/pytest-dev/pytest
  Commit: f50ace7c0ae9f7156a25b6a93017257b35715398
      https://github.com/pytest-dev/pytest/commit/f50ace7c0ae9f7156a25b6a93017257b35715398
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py
    M _pytest/mark.py
    R changelog/2836.bug
    A changelog/2939.bugfix
    A changelog/2942.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.5.rst
    M doc/en/backwards-compatibility.rst
    M testing/test_assertion.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into release-3.3.0


  Commit: e97c774f8edd6f92deafaf65571a9149ecebce94
      https://github.com/pytest-dev/pytest/commit/e97c774f8edd6f92deafaf65571a9149ecebce94
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M tasks/__init__.py

  Log Message:
  -----------
  Remove vendoring import from tasks/__init__


  Commit: aa9a02ec4452f87b40c10a2c9235e4b552b68564
      https://github.com/pytest-dev/pytest/commit/aa9a02ec4452f87b40c10a2c9235e4b552b68564
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1993.bugfix
    R changelog/2124.bugfix
    R changelog/2124.feature
    R changelog/2236.removal
    R changelog/2267.feature
    R changelog/2491.bugfix
    R changelog/2549.feature
    R changelog/2641.trivial
    R changelog/2642.trivial
    R changelog/2657.feature
    R changelog/2672.removal
    R changelog/2675.removal
    R changelog/2708.feature
    R changelog/2709.bugfix
    R changelog/2719.trivial
    R changelog/2734.trivial
    R changelog/2738.bugfix
    R changelog/2751.bugfix
    R changelog/2767.removal
    R changelog/2767.trivial
    R changelog/2794.feature
    R changelog/2803.removal
    R changelog/2808.feature
    R changelog/2809.bugfix
    R changelog/2812.removal
    R changelog/2824.feature
    R changelog/2845.bugfix
    R changelog/2876.trivial
    R changelog/2877.trivial
    R changelog/2879.feature
    R changelog/2910.trivial
    R changelog/2922.trivial
    R changelog/2923.feature
    R changelog/2934.feature
    R changelog/2939.bugfix
    R changelog/2942.bugfix
    R changelog/502.feature
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.3.0.rst
    M doc/en/example/parametrize.rst

  Log Message:
  -----------
  Preparing release version 3.3.0


  Commit: 0ddd3e2839ec32690e379b9e2ee6962b027ab52c
      https://github.com/pytest-dev/pytest/commit/0ddd3e2839ec32690e379b9e2ee6962b027ab52c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix linting in CHANGELOG


  Commit: 05cfdcc8cba7232724bc70d30337e87092de2818
      https://github.com/pytest-dev/pytest/commit/05cfdcc8cba7232724bc70d30337e87092de2818
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/helpconfig.py
    M _pytest/pastebin.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M testing/test_mark.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Revert making TerminalWriter public in TerminalReporter plugin

We eventually want to replace py.io.TerminalWriter (exposed as
"_tw" in TerminalReporter) by something else, so deprecating access
to "_tw" and making it public as "writer" is contrary to that.


  Commit: 95de11a44e9dc1c59263455120814f25072cea2e
      https://github.com/pytest-dev/pytest/commit/95de11a44e9dc1c59263455120814f25072cea2e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M _pytest/config.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Block pytest-catchlog and issue a warning

Trying to install pytest-3.3 and pytest-catchlog will result in an
option conflicts because both declare the same options.


  Commit: 0de1a65644ba5c4d3a1ac7d522bc0ae5666f0a49
      https://github.com/pytest-dev/pytest/commit/0de1a65644ba5c4d3a1ac7d522bc0ae5666f0a49
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-24 (Fri, 24 Nov 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Update pluggy pin to pluggy>=0.5,<0.7 after pluggy-0.6 release


  Commit: 6eeacaba3e77c69efde876939376f4d47c8f7514
      https://github.com/pytest-dev/pytest/commit/6eeacaba3e77c69efde876939376f4d47c8f7514
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-26 (Sun, 26 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix typos in CHANGELOG


  Commit: 6cdd85122705393cfcfe08570bae581bf9f2d157
      https://github.com/pytest-dev/pytest/commit/6cdd85122705393cfcfe08570bae581bf9f2d157
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/backwards-compatibility.rst

  Log Message:
  -----------
  CHANGELOG and docs changes requested during review


Compare: https://github.com/pytest-dev/pytest/compare/f50ace7c0ae9^...6cdd85122705

From nicoddemus at gmail.com  Mon Nov 27 16:37:21 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 27 Nov 2017 13:37:21 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 4a0aea: Add missing entry to
 CHANGELOG for 3.2.4
Message-ID: <5a1c859115798_20d13fd52bcebc347307@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 4a0aea2debfdd0ed2584221128fed891d0bc727d
      https://github.com/pytest-dev/pytest/commit/4a0aea2debfdd0ed2584221128fed891d0bc727d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2836.bug

  Log Message:
  -----------
  Add missing entry to CHANGELOG for 3.2.4


  Commit: dd6c5344681809a7509e45acdf3e28d03b728144
      https://github.com/pytest-dev/pytest/commit/dd6c5344681809a7509e45acdf3e28d03b728144
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    A changelog/2926.bugfix
    M setup.py

  Log Message:
  -----------
  Remove py<1.5 restriction

Fix #2926


  Commit: a220a40350a8a81c0f0e1986aa184e4c33da29d6
      https://github.com/pytest-dev/pytest/commit/a220a40350a8a81c0f0e1986aa184e4c33da29d6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2926.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.5.rst

  Log Message:
  -----------
  Preparing release version 3.2.5


  Commit: 74aaf916539f7f38381d03ce289139da969ec4a7
      https://github.com/pytest-dev/pytest/commit/74aaf916539f7f38381d03ce289139da969ec4a7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2836.bug
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.5.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #2927 from nicoddemus/release-3.2.5

Release 3.2.5


  Commit: f9029f11af078bb6cb4cc3b8039fa2f256e86cd1
      https://github.com/pytest-dev/pytest/commit/f9029f11af078bb6cb4cc3b8039fa2f256e86cd1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M doc/en/backwards-compatibility.rst

  Log Message:
  -----------
  Add Deprecation Roadmap to backward compatibility document

We should replace the wiki document to a link to this document now


  Commit: b0f558da44ed2a72fefcee172cba57ed688ff8db
      https://github.com/pytest-dev/pytest/commit/b0f558da44ed2a72fefcee172cba57ed688ff8db
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M doc/en/backwards-compatibility.rst

  Log Message:
  -----------
  Add Future/Past Releases section


  Commit: 77bd0aa02ffc7f8734682c2e353135af5d94ab76
      https://github.com/pytest-dev/pytest/commit/77bd0aa02ffc7f8734682c2e353135af5d94ab76
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M doc/en/backwards-compatibility.rst

  Log Message:
  -----------
  Merge pull request #2931 from nicoddemus/deprecation-roadmap-docs

Add Deprecation Roadmap to backward compatibility document


  Commit: c8d52b633b6a7423633042c0eec3c67483ac13a3
      https://github.com/pytest-dev/pytest/commit/c8d52b633b6a7423633042c0eec3c67483ac13a3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py
    A changelog/2939.bugfix
    M testing/test_assertion.py

  Log Message:
  -----------
  Fix assertion rewrite to match module names correctly

Fix #2939


  Commit: 8df7ed12c19ea17aa9fd58d355c4ef85dbaf293c
      https://github.com/pytest-dev/pytest/commit/8df7ed12c19ea17aa9fd58d355c4ef85dbaf293c
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py
    A changelog/2939.bugfix
    M testing/test_assertion.py

  Log Message:
  -----------
  Merge pull request #2940 from nicoddemus/rewrite-bug-2939

Fix assertion rewrite to match module names correctly


  Commit: 5e71ffab8721bf04105cd1b64d03880bd4a3683a
      https://github.com/pytest-dev/pytest/commit/5e71ffab8721bf04105cd1b64d03880bd4a3683a
  Author: Sviatoslav Abakumov <abakumov.sviatoslav at progforce.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M _pytest/mark.py
    A changelog/2942.bugfix
    M testing/test_mark.py

  Log Message:
  -----------
  Handle marks without description


  Commit: 378eb5d67b099128b498da5521737100bf18a6a0
      https://github.com/pytest-dev/pytest/commit/378eb5d67b099128b498da5521737100bf18a6a0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M changelog/2942.bugfix

  Log Message:
  -----------
  Minor formatting change in CHANGELOG


  Commit: 27935ebec92d76239b9876b8b185ffa24481b983
      https://github.com/pytest-dev/pytest/commit/27935ebec92d76239b9876b8b185ffa24481b983
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M _pytest/mark.py
    A changelog/2942.bugfix
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #2943 from Perlence/fix-marks-without-description

Handle marks without description


  Commit: f50ace7c0ae9f7156a25b6a93017257b35715398
      https://github.com/pytest-dev/pytest/commit/f50ace7c0ae9f7156a25b6a93017257b35715398
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py
    M _pytest/mark.py
    R changelog/2836.bug
    A changelog/2939.bugfix
    A changelog/2942.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.5.rst
    M doc/en/backwards-compatibility.rst
    M testing/test_assertion.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into release-3.3.0


  Commit: e97c774f8edd6f92deafaf65571a9149ecebce94
      https://github.com/pytest-dev/pytest/commit/e97c774f8edd6f92deafaf65571a9149ecebce94
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M tasks/__init__.py

  Log Message:
  -----------
  Remove vendoring import from tasks/__init__


  Commit: aa9a02ec4452f87b40c10a2c9235e4b552b68564
      https://github.com/pytest-dev/pytest/commit/aa9a02ec4452f87b40c10a2c9235e4b552b68564
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1993.bugfix
    R changelog/2124.bugfix
    R changelog/2124.feature
    R changelog/2236.removal
    R changelog/2267.feature
    R changelog/2491.bugfix
    R changelog/2549.feature
    R changelog/2641.trivial
    R changelog/2642.trivial
    R changelog/2657.feature
    R changelog/2672.removal
    R changelog/2675.removal
    R changelog/2708.feature
    R changelog/2709.bugfix
    R changelog/2719.trivial
    R changelog/2734.trivial
    R changelog/2738.bugfix
    R changelog/2751.bugfix
    R changelog/2767.removal
    R changelog/2767.trivial
    R changelog/2794.feature
    R changelog/2803.removal
    R changelog/2808.feature
    R changelog/2809.bugfix
    R changelog/2812.removal
    R changelog/2824.feature
    R changelog/2845.bugfix
    R changelog/2876.trivial
    R changelog/2877.trivial
    R changelog/2879.feature
    R changelog/2910.trivial
    R changelog/2922.trivial
    R changelog/2923.feature
    R changelog/2934.feature
    R changelog/2939.bugfix
    R changelog/2942.bugfix
    R changelog/502.feature
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.3.0.rst
    M doc/en/example/parametrize.rst

  Log Message:
  -----------
  Preparing release version 3.3.0


  Commit: 0ddd3e2839ec32690e379b9e2ee6962b027ab52c
      https://github.com/pytest-dev/pytest/commit/0ddd3e2839ec32690e379b9e2ee6962b027ab52c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix linting in CHANGELOG


  Commit: 05cfdcc8cba7232724bc70d30337e87092de2818
      https://github.com/pytest-dev/pytest/commit/05cfdcc8cba7232724bc70d30337e87092de2818
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/helpconfig.py
    M _pytest/pastebin.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M testing/test_mark.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Revert making TerminalWriter public in TerminalReporter plugin

We eventually want to replace py.io.TerminalWriter (exposed as
"_tw" in TerminalReporter) by something else, so deprecating access
to "_tw" and making it public as "writer" is contrary to that.


  Commit: 95de11a44e9dc1c59263455120814f25072cea2e
      https://github.com/pytest-dev/pytest/commit/95de11a44e9dc1c59263455120814f25072cea2e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M _pytest/config.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Block pytest-catchlog and issue a warning

Trying to install pytest-3.3 and pytest-catchlog will result in an
option conflicts because both declare the same options.


  Commit: 0de1a65644ba5c4d3a1ac7d522bc0ae5666f0a49
      https://github.com/pytest-dev/pytest/commit/0de1a65644ba5c4d3a1ac7d522bc0ae5666f0a49
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-24 (Fri, 24 Nov 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Update pluggy pin to pluggy>=0.5,<0.7 after pluggy-0.6 release


  Commit: 6eeacaba3e77c69efde876939376f4d47c8f7514
      https://github.com/pytest-dev/pytest/commit/6eeacaba3e77c69efde876939376f4d47c8f7514
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-26 (Sun, 26 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix typos in CHANGELOG


  Commit: 6cdd85122705393cfcfe08570bae581bf9f2d157
      https://github.com/pytest-dev/pytest/commit/6cdd85122705393cfcfe08570bae581bf9f2d157
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/backwards-compatibility.rst

  Log Message:
  -----------
  CHANGELOG and docs changes requested during review


  Commit: 67ad0fa3640b9575b489532a6cc042fcb4e32673
      https://github.com/pytest-dev/pytest/commit/67ad0fa3640b9575b489532a6cc042fcb4e32673
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/helpconfig.py
    M _pytest/mark.py
    M _pytest/pastebin.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    R changelog/1993.bugfix
    R changelog/2124.bugfix
    R changelog/2124.feature
    R changelog/2236.removal
    R changelog/2267.feature
    R changelog/2491.bugfix
    R changelog/2549.feature
    R changelog/2641.trivial
    R changelog/2642.trivial
    R changelog/2657.feature
    R changelog/2672.removal
    R changelog/2675.removal
    R changelog/2708.feature
    R changelog/2709.bugfix
    R changelog/2719.trivial
    R changelog/2734.trivial
    R changelog/2738.bugfix
    R changelog/2751.bugfix
    R changelog/2767.removal
    R changelog/2767.trivial
    R changelog/2794.feature
    R changelog/2803.removal
    R changelog/2808.feature
    R changelog/2809.bugfix
    R changelog/2812.removal
    R changelog/2824.feature
    R changelog/2836.bug
    R changelog/2845.bugfix
    R changelog/2876.trivial
    R changelog/2877.trivial
    R changelog/2879.feature
    R changelog/2910.trivial
    R changelog/2922.trivial
    R changelog/2923.feature
    R changelog/2934.feature
    R changelog/502.feature
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.5.rst
    A doc/en/announce/release-3.3.0.rst
    M doc/en/backwards-compatibility.rst
    M doc/en/example/parametrize.rst
    M setup.py
    M tasks/__init__.py
    M testing/deprecated_test.py
    M testing/test_assertion.py
    M testing/test_mark.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #2945 from nicoddemus/release-3.3.0

Release 3.3.0


Compare: https://github.com/pytest-dev/pytest/compare/49c0c599b00d...67ad0fa3640b

From nicoddemus at gmail.com  Mon Nov 27 16:51:42 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 27 Nov 2017 13:51:42 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] d95c8a: Fix link to #2636 in
 CHANGELOG
Message-ID: <5a1c88ee868a2_162f3fd0c4a7dc38185796@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d95c8a22046369732f76306ce39ddd5a5c0cb305
      https://github.com/pytest-dev/pytest/commit/d95c8a22046369732f76306ce39ddd5a5c0cb305
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix link to #2636 in CHANGELOG



From nicoddemus at gmail.com  Mon Nov 27 16:53:12 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 27 Nov 2017 13:53:12 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] e273f5: Update github "bugs"
 link
Message-ID: <5a1c8948375e2_478a3fba30c9fc3c1032e@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: e273f5399d8a3833e49c69eb5f1630fb4da030a4
      https://github.com/pytest-dev/pytest/commit/e273f5399d8a3833e49c69eb5f1630fb4da030a4
  Author: Eugene Prikazchikov <eprikazc at gmail.com>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M CONTRIBUTING.rst
    A changelog/2949.trivial

  Log Message:
  -----------
  Update github "bugs" link

Apparently, some time ago label was renamed from bug to "type:bug"


  Commit: 6b90ad4d4b958560a07ddaf5ec11eccff28f197e
      https://github.com/pytest-dev/pytest/commit/6b90ad4d4b958560a07ddaf5ec11eccff28f197e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M CONTRIBUTING.rst
    A changelog/2949.trivial

  Log Message:
  -----------
  Merge pull request #2949 from eprikazc/master

Update github "bugs" link


  Commit: d5f038e29ab3882eed8779efc98fbc3348a21ac6
      https://github.com/pytest-dev/pytest/commit/d5f038e29ab3882eed8779efc98fbc3348a21ac6
  Author: Daniel Hahler <git at thequod.de>
  Date:   2017-11-26 (Sun, 26 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py
    M _pytest/config.py
    M _pytest/pytester.py
    M doc/en/announce/release-2.7.0.rst
    M doc/en/writing_plugins.rst
    M testing/test_assertion.py

  Log Message:
  -----------
  Fix spelling: s/re-writ/rewrit/g

This also fixes "can not" to "cannot" in the "Module already imported so
cannot be rewritten" assertion error.


  Commit: c58715371ceb1453547a6e08dc2ae4075bc98942
      https://github.com/pytest-dev/pytest/commit/c58715371ceb1453547a6e08dc2ae4075bc98942
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-26 (Sun, 26 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py
    M _pytest/config.py
    M _pytest/pytester.py
    M doc/en/announce/release-2.7.0.rst
    M doc/en/writing_plugins.rst
    M testing/test_assertion.py

  Log Message:
  -----------
  Merge pull request #2954 from blueyed/rewritten

Fix spelling: s/re-writ/rewrit/g


  Commit: 4678cbeb913385f00cc21b79662459a8c9fafa87
      https://github.com/pytest-dev/pytest/commit/4678cbeb913385f00cc21b79662459a8c9fafa87
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M .coveragerc
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M README.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    R _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    A _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    R _pytest/vendored_packages/README.md
    R _pytest/vendored_packages/__init__.py
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/INSTALLER
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/RECORD
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/WHEEL
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/metadata.json
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/top_level.txt
    R _pytest/vendored_packages/pluggy.py
    M _pytest/warnings.py
    M appveyor.yml
    R changelog/2939.bugfix
    R changelog/2942.bugfix
    M doc/en/Makefile
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.3.0.rst
    M doc/en/assert.rst
    M doc/en/backwards-compatibility.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    A doc/en/logging.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pytest.py
    M setup.py
    M tasks/__init__.py
    R tasks/vendoring.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    A testing/logging/test_fixture.py
    A testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/setup_only.py
    A testing/python/test_deprecations.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_mark.py
    M testing/test_parseopt.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features'


  Commit: d95c8a22046369732f76306ce39ddd5a5c0cb305
      https://github.com/pytest-dev/pytest/commit/d95c8a22046369732f76306ce39ddd5a5c0cb305
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix link to #2636 in CHANGELOG


Compare: https://github.com/pytest-dev/pytest/compare/67ad0fa3640b...d95c8a220463

From nicoddemus at gmail.com  Tue Nov 28 06:51:28 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 28 Nov 2017 03:51:28 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 4b5f0d: replace non-breaking
 space with space
Message-ID: <5a1d4dc022e4a_1a3343f8840291c44327e@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 4b5f0d5ffa20bc9f969fce3076b7ffb6798c502b
      https://github.com/pytest-dev/pytest/commit/4b5f0d5ffa20bc9f969fce3076b7ffb6798c502b
  Author: Tom Viner <tom.viner at sohonet.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  replace non-breaking space with space


  Commit: 4d2f05e4b967a8df6becb939fe236f5f0b3f11cb
      https://github.com/pytest-dev/pytest/commit/4d2f05e4b967a8df6becb939fe236f5f0b3f11cb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Merge pull request #2962 from pytest-dev/fix-nbsp-in-changelog

replace non-breaking space with space


Compare: https://github.com/pytest-dev/pytest/compare/454b60b6c519...4d2f05e4b967

From nicoddemus at gmail.com  Tue Nov 28 06:51:30 2017
From: nicoddemus at gmail.com (nicoddemus)
Date: Tue, 28 Nov 2017 03:51:30 -0800
Subject: [Pytest-commit] [pytest-dev/pytest]
Message-ID: <5a1d4dc2e5ad9_611d3fa82b311c407668d@hookshot-fe-92cdb05.cp1-iad.github.net.mail>

  Branch: refs/heads/fix-nbsp-in-changelog
  Home:   https://github.com/pytest-dev/pytest

From nicoddemus at gmail.com  Thu Nov 30 15:01:22 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 30 Nov 2017 12:01:22 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 912330: Extend
 _pytest.python._idval to return __name__ of...
Message-ID: <5a206392c04b5_4683fad5cc0fc3057216@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 912330a7e2dfd67db252de4197b00a982043caf3
      https://github.com/pytest-dev/pytest/commit/912330a7e2dfd67db252de4197b00a982043caf3
  Author: ST John <st at prowler.io>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  Extend _pytest.python._idval to return __name__ of functions as well, not just for classes


  Commit: 5085aa2bce6dc6494f889fa73aa50965a499ea5a
      https://github.com/pytest-dev/pytest/commit/5085aa2bce6dc6494f889fa73aa50965a499ea5a
  Author: ST John <st at prowler.io>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    A changelog/2976.trivial

  Log Message:
  -----------
  add changelog file


  Commit: fdd4abb88a649964259a51db53507cd67a7a60d2
      https://github.com/pytest-dev/pytest/commit/fdd4abb88a649964259a51db53507cd67a7a60d2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M changelog/2976.trivial

  Log Message:
  -----------
  Small rewording of the CHANGELOG


  Commit: e66473853c0ecd80c233eccb8833d6d19d8ac07b
      https://github.com/pytest-dev/pytest/commit/e66473853c0ecd80c233eccb8833d6d19d8ac07b
  Author: ST John <st at prowler.io>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M testing/python/metafunc.py

  Log Message:
  -----------
  add test


  Commit: 1fe2e2cb03070a8a3d6d4becf79800406f9aaca3
      https://github.com/pytest-dev/pytest/commit/1fe2e2cb03070a8a3d6d4becf79800406f9aaca3
  Author: ST John <st at prowler.io>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M changelog/2976.trivial

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/st--/pytest


  Commit: 652936f47fd9167fbfd858fc33c3ed431a49f230
      https://github.com/pytest-dev/pytest/commit/652936f47fd9167fbfd858fc33c3ed431a49f230
  Author: ST John <st at prowler.io>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M testing/python/metafunc.py

  Log Message:
  -----------
  make linter happier


  Commit: 294729962d1f9d0afc95650cbc1c315a249a7094
      https://github.com/pytest-dev/pytest/commit/294729962d1f9d0afc95650cbc1c315a249a7094
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M _pytest/python.py
    A changelog/2976.trivial
    M testing/python/metafunc.py

  Log Message:
  -----------
  Merge pull request #2976 from st--/master

Extend _pytest.python._idval to return __name__ of functions as well


Compare: https://github.com/pytest-dev/pytest/compare/88ed1ab64857...294729962d1f

From nicoddemus at gmail.com  Thu Nov 30 16:56:05 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 30 Nov 2017 13:56:05 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] fdfc19: Add CHANGELOG entry
 about pytest.fixture "params" ...
Message-ID: <5a207e75ed86a_36363ff680199c34140642@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: fdfc1946da9dff75747d734c26b3602edfec1226
      https://github.com/pytest-dev/pytest/commit/fdfc1946da9dff75747d734c26b3602edfec1226
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Add CHANGELOG entry about pytest.fixture "params" being now immutable

Fix #2959


  Commit: a9dd37f42954da679638e3fb28da086dab1d0fb5
      https://github.com/pytest-dev/pytest/commit/a9dd37f42954da679638e3fb28da086dab1d0fb5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Merge pull request #2980 from nicoddemus/immutable-fix-parameters

Add CHANGELOG entry about pytest.fixture "params" being now immutable


Compare: https://github.com/pytest-dev/pytest/compare/4de433e28005...a9dd37f42954

From nicoddemus at gmail.com  Thu Nov 30 18:12:47 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 30 Nov 2017 15:12:47 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 0f5fb7: Fix ZeroDivisionError
 with 0 collected tests
Message-ID: <5a20906fc942f_1d023f9909463c3c15852c@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0f5fb7ed05c7911bbfe1583491f735c205453c34
      https://github.com/pytest-dev/pytest/commit/0f5fb7ed05c7911bbfe1583491f735c205453c34
  Author: Daniel Hahler <git at thequod.de>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M _pytest/terminal.py

  Log Message:
  -----------
  Fix ZeroDivisionError with 0 collected tests

This can easily happen with pytest-testmon.


  Commit: 6bbd7410397fc3ea95b48cf38a3d8070ebf80fb7
      https://github.com/pytest-dev/pytest/commit/6bbd7410397fc3ea95b48cf38a3d8070ebf80fb7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    A changelog/2971.bugfix
    M testing/test_terminal.py

  Log Message:
  -----------
  Add test for #2971


  Commit: 369c711f140fc5fac051a8ea1749a18874de268f
      https://github.com/pytest-dev/pytest/commit/369c711f140fc5fac051a8ea1749a18874de268f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M _pytest/terminal.py
    A changelog/2971.bugfix
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #2971 from blueyed/fix-ZeroDivisionError

Fix ZeroDivisionError with 0 collected tests


Compare: https://github.com/pytest-dev/pytest/compare/a9dd37f42954...369c711f140f

From nicoddemus at gmail.com  Mon Nov 27 16:40:59 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 27 Nov 2017 21:40:59 -0000
Subject: [Pytest-commit] [pytest-dev/pytest] 522d59: Use session.config.hook
 instead of ihook. Fixes #2...
Message-ID: <5a1c8667334cd_b433fbfdcaadc3813789e@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 522d59e844abe815790acf733a0aa13b597acfac
      https://github.com/pytest-dev/pytest/commit/522d59e844abe815790acf733a0aa13b597acfac
  Author: Dmitry Malinovsky <damalinov at gmail.com>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M _pytest/fixtures.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Use session.config.hook instead of ihook. Fixes #2124


  Commit: a63b34c68596e4cddec6d899d8b27417ea4ce72c
      https://github.com/pytest-dev/pytest/commit/a63b34c68596e4cddec6d899d8b27417ea4ce72c
  Author: Dmitry Malinovsky <damalinov at gmail.com>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Switch to item fspath


  Commit: c68a89b4a78a4bd4ab5ab1b139f9fe5b002bdad8
      https://github.com/pytest-dev/pytest/commit/c68a89b4a78a4bd4ab5ab1b139f9fe5b002bdad8
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M _pytest/config.py
    A changelog/2236.removal
    M pytest.py

  Log Message:
  -----------
  remove preinit, its no longer needed


  Commit: e90f876b348cb070d4b1a50e1f7f8312c17ee1de
      https://github.com/pytest-dev/pytest/commit/e90f876b348cb070d4b1a50e1f7f8312c17ee1de
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  remove the last own implementation of pytest_namespace


  Commit: ceb016514b6b62cfe327db1cb5bdc3fef3244900
      https://github.com/pytest-dev/pytest/commit/ceb016514b6b62cfe327db1cb5bdc3fef3244900
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  remove dead code - Node._memoizedcall


  Commit: 74d536314f3c7401181806a2b267c7012517fcf1
      https://github.com/pytest-dev/pytest/commit/74d536314f3c7401181806a2b267c7012517fcf1
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M _pytest/pytester.py

  Log Message:
  -----------
  pytester: make pytest fullpath a constant


  Commit: 8a2e6a8d51a6c50f807fb908578a11b3855b5fa1
      https://github.com/pytest-dev/pytest/commit/8a2e6a8d51a6c50f807fb908578a11b3855b5fa1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M _pytest/pytester.py

  Log Message:
  -----------
  Fix linting


  Commit: dcaeef7c10d0df00100367a8c75813e761348c70
      https://github.com/pytest-dev/pytest/commit/dcaeef7c10d0df00100367a8c75813e761348c70
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M changelog/2236.removal

  Log Message:
  -----------
  take review comments into account


  Commit: 333ec8ba5ab047c2c1e57de365563b4932096c5d
      https://github.com/pytest-dev/pytest/commit/333ec8ba5ab047c2c1e57de365563b4932096c5d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M _pytest/main.py
    M _pytest/pytester.py

  Log Message:
  -----------
  Merge pull request #2638 from RonnyPfannschmidt/function-definition

small code cleanups


  Commit: 6e7547244bc2302292fe327756c4c8b76a28b7bc
      https://github.com/pytest-dev/pytest/commit/6e7547244bc2302292fe327756c4c8b76a28b7bc
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/main.py
    A changelog/2236.removal
    M pytest.py

  Log Message:
  -----------
  Merge pull request #2636 from RonnyPfannschmidt/remove-preinit

remove preinit, its no longer needed


  Commit: 40254b64e567d2fc82d9168723fdadced3674246
      https://github.com/pytest-dev/pytest/commit/40254b64e567d2fc82d9168723fdadced3674246
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/1994.feature
    R changelog/2003.removal
    R changelog/2023.bugfix
    R changelog/2147.removal
    R changelog/2375.bugfix
    R changelog/2427.removal
    R changelog/2444.trivial
    R changelog/2489.trivial
    R changelog/2510.bugfix
    R changelog/2516.feature
    R changelog/2518.feature
    R changelog/2528.feature
    R changelog/2533.trivial
    R changelog/2539.doc
    R changelog/2540.feature
    R changelog/2543.feature
    R changelog/2546.trivial
    R changelog/2548.bugfix
    R changelog/2555.bugfix
    R changelog/2562.trivial
    R changelog/2571.trivial
    R changelog/2574.bugfix
    R changelog/2581.trivial
    R changelog/2582.trivial
    R changelog/2583.feature
    R changelog/2588.trivial
    R changelog/2598.feature
    R changelog/2610.bugfix
    R changelog/2620.trivial
    R changelog/2621.feature
    R changelog/2622.feature
    R changelog/2631.feature
    R changelog/580.feature
    R changelog/920.bugfix
    R changelog/971.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/parametrize.rst

  Log Message:
  -----------
  Merge branch 'master' into features


  Commit: dc563e4954403c5b9738e903ca224cc099b3f526
      https://github.com/pytest-dev/pytest/commit/dc563e4954403c5b9738e903ca224cc099b3f526
  Author: Srinivas Reddy Thatiparthy <thatiparthysreenivas at gmail.com>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/main.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M setup.py

  Log Message:
  -----------
  convert py module references to six module


  Commit: 2e33d9b35ed1ac09bf06c63496ce1abb7b7cb651
      https://github.com/pytest-dev/pytest/commit/2e33d9b35ed1ac09bf06c63496ce1abb7b7cb651
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    A changelog/2642.trivial

  Log Message:
  -----------
  Add changelog entry for using six for portability


  Commit: 9e62a31b63c9436d7e5a0e45b39a3f9f562b9baf
      https://github.com/pytest-dev/pytest/commit/9e62a31b63c9436d7e5a0e45b39a3f9f562b9baf
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/main.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    A changelog/2642.trivial
    M setup.py

  Log Message:
  -----------
  Merge pull request #2650 from srinivasreddy/2642

Fixed#2642: Convert py module references to six module


  Commit: eb462582afa3ca83b2c278bc52fc4094e65f6553
      https://github.com/pytest-dev/pytest/commit/eb462582afa3ca83b2c278bc52fc4094e65f6553
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-10 (Thu, 10 Aug 2017)

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/2672.removal
    A changelog/2675.removal
    M testing/python/metafunc.py

  Log Message:
  -----------
  fix #2675 - store marks correctly in callspecs


  Commit: 98bf5fc9beab7891014659ec82cb0008fb012df3
      https://github.com/pytest-dev/pytest/commit/98bf5fc9beab7891014659ec82cb0008fb012df3
  Author: prokaktus <proktusfahitasiv at gmail.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M AUTHORS
    M _pytest/skipping.py
    A changelog/2549.feature
    M testing/test_skipping.py

  Log Message:
  -----------
  Fold skipped tests with global pytestmark variable


  Commit: 5f17caa156c157a9dfffd523219df0b4d95ca584
      https://github.com/pytest-dev/pytest/commit/5f17caa156c157a9dfffd523219df0b4d95ca584
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-14 (Mon, 14 Aug 2017)

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/2672.removal
    A changelog/2675.removal
    M testing/python/metafunc.py

  Log Message:
  -----------
  Merge pull request #2675 from RonnyPfannschmidt/mark-callspeck

ensure callspecs contain the list of marks


  Commit: 5c0feb287702ca4090ac949301c6217c77798f51
      https://github.com/pytest-dev/pytest/commit/5c0feb287702ca4090ac949301c6217c77798f51
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M AUTHORS
    M _pytest/skipping.py
    A changelog/2549.feature
    M testing/test_skipping.py

  Log Message:
  -----------
  Merge pull request #2680 from prokaktus/skipping-same-module

Fold skipped tests with global pytestmark variable


  Commit: 333a9ad7fa9062773784ab654f9f851127791785
      https://github.com/pytest-dev/pytest/commit/333a9ad7fa9062773784ab654f9f851127791785
  Author: Tyler Goodlet <tgoodlet at gmail.com>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    M _pytest/_pluggy.py
    R _pytest/vendored_packages/README.md
    R _pytest/vendored_packages/__init__.py
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/INSTALLER
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/RECORD
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/WHEEL
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/metadata.json
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/top_level.txt
    R _pytest/vendored_packages/pluggy.py
    M setup.py

  Log Message:
  -----------
  Stop vendoring pluggy

Resolves #2716


  Commit: cb700208e8aea49f94266f3bd08a38e5dcc88950
      https://github.com/pytest-dev/pytest/commit/cb700208e8aea49f94266f3bd08a38e5dcc88950
  Author: Tyler Goodlet <tgoodlet at gmail.com>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    R tasks/vendoring.py

  Log Message:
  -----------
  Drop vendoring task


  Commit: 756db2131f6009f0fee2b20e82484f3db1188f47
      https://github.com/pytest-dev/pytest/commit/756db2131f6009f0fee2b20e82484f3db1188f47
  Author: Tyler Goodlet <tgoodlet at gmail.com>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    M .coveragerc
    M setup.py
    M tox.ini

  Log Message:
  -----------
  Drop vendoring from packaging


  Commit: 9ab83083d162fcde13d60b1e1709fbbd14449a4b
      https://github.com/pytest-dev/pytest/commit/9ab83083d162fcde13d60b1e1709fbbd14449a4b
  Author: Tyler Goodlet <tgoodlet at gmail.com>
  Date:   2017-08-24 (Thu, 24 Aug 2017)

  Changed paths:
    M _pytest/config.py
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Update docs


  Commit: ff35c17ecf61053727a3f453d9d37d2d5969f41d
      https://github.com/pytest-dev/pytest/commit/ff35c17ecf61053727a3f453d9d37d2d5969f41d
  Author: Tyler Goodlet <tgoodlet at gmail.com>
  Date:   2017-08-25 (Fri, 25 Aug 2017)

  Changed paths:
    R _pytest/_pluggy.py
    M _pytest/config.py
    M _pytest/hookspec.py
    M _pytest/python.py
    M _pytest/terminal.py
    M doc/en/writing_plugins.rst
    M testing/test_terminal.py

  Log Message:
  -----------
  Drop wrapper module; import directly


  Commit: fe415e3ff89f1514e3ed21b2cd9cc7d7dc9caceb
      https://github.com/pytest-dev/pytest/commit/fe415e3ff89f1514e3ed21b2cd9cc7d7dc9caceb
  Author: Tyler Goodlet <tgoodlet at gmail.com>
  Date:   2017-08-25 (Fri, 25 Aug 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Use latest patch release


  Commit: 312891daa692e0daa456769b4a9307aba067600c
      https://github.com/pytest-dev/pytest/commit/312891daa692e0daa456769b4a9307aba067600c
  Author: Tyler Goodlet <tgoodlet at gmail.com>
  Date:   2017-08-25 (Fri, 25 Aug 2017)

  Changed paths:
    A changelog/2719.trivial

  Log Message:
  -----------
  Add a trivial changelog entry


  Commit: 488bbd2aeb9bee18b812294b140e2fd8128216bc
      https://github.com/pytest-dev/pytest/commit/488bbd2aeb9bee18b812294b140e2fd8128216bc
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M .coveragerc
    R _pytest/_pluggy.py
    M _pytest/config.py
    M _pytest/hookspec.py
    M _pytest/python.py
    M _pytest/terminal.py
    R _pytest/vendored_packages/README.md
    R _pytest/vendored_packages/__init__.py
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/INSTALLER
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/RECORD
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/WHEEL
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/metadata.json
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/top_level.txt
    R _pytest/vendored_packages/pluggy.py
    A changelog/2719.trivial
    M doc/en/writing_plugins.rst
    M setup.py
    R tasks/vendoring.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2719 from tgoodlet/stop_vendoring_pluggy

Stop vendoring pluggy


  Commit: 78a027e128d8846a2babdffee5c38c374e5c93d9
      https://github.com/pytest-dev/pytest/commit/78a027e128d8846a2babdffee5c38c374e5c93d9
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M _pytest/compat.py
    A changelog/2734.trivial

  Log Message:
  -----------
  simplyfy ascii escaping by using backslashreplace error handling


  Commit: 221797c609d9d032c48df0b7e4d0b4f062eb0c0e
      https://github.com/pytest-dev/pytest/commit/221797c609d9d032c48df0b7e4d0b4f062eb0c0e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-31 (Thu, 31 Aug 2017)

  Changed paths:
    M _pytest/pytester.py
    A changelog/2738.bugfix
    M testing/test_pytester.py

  Log Message:
  -----------
  Encode utf-8 byte strings in pytester's makefile

Fix #2738


  Commit: 9d373d83ac40c629b734b64c8f5685e50817fc54
      https://github.com/pytest-dev/pytest/commit/9d373d83ac40c629b734b64c8f5685e50817fc54
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M _pytest/pytester.py
    A changelog/2738.bugfix
    M testing/test_pytester.py

  Log Message:
  -----------
  Merge pull request #2741 from nicoddemus/pytester-makepyfile

Encode utf-8 byte strings in pytester's makefile


  Commit: 11ec6aeafb6f07047c043055f4beb33d83f1d4ba
      https://github.com/pytest-dev/pytest/commit/11ec6aeafb6f07047c043055f4beb33d83f1d4ba
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    M setup.py
    M tox.ini

  Log Message:
  -----------
  Add test environment using pluggy from master branch

Fix #2737


  Commit: 3dc0da9339e4952cb276b32f451fa8cdc23d38be
      https://github.com/pytest-dev/pytest/commit/3dc0da9339e4952cb276b32f451fa8cdc23d38be
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M _pytest/config.py
    M testing/python/collect.py
    M testing/test_collection.py
    M testing/test_pluginmanager.py
    M testing/test_runner.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Remove __multicall__ warning and usages in testing

pluggy>=0.5 already warns about those


  Commit: c42d966a4088d9ef26eac70040fe68029b71877c
      https://github.com/pytest-dev/pytest/commit/c42d966a4088d9ef26eac70040fe68029b71877c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Change all pytest report options to the more concise '-ra' in tox.ini


  Commit: 9bbf14d0f6d68a175a440daffad97c63c51fde37
      https://github.com/pytest-dev/pytest/commit/9bbf14d0f6d68a175a440daffad97c63c51fde37
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Create explicit 'pluggymaster' env definitions

For some reason, the previous approach brakes 'coveralls' because
pip still tries to install the 'pluggy' master requirement
(git+https://...)


  Commit: d8ecca5ebd929f1be49033f8a06eed97494af3da
      https://github.com/pytest-dev/pytest/commit/d8ecca5ebd929f1be49033f8a06eed97494af3da
  Author: Joan Massich <sik at visor.udg.edu>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M testing/test_recwarn.py

  Log Message:
  -----------
  Add test to design warns signature in TDD mimicking raises signature


  Commit: 13eac944ae860a3cc4dcde49a5a7dca814941670
      https://github.com/pytest-dev/pytest/commit/13eac944ae860a3cc4dcde49a5a7dca814941670
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M _pytest/compat.py

  Log Message:
  -----------
  restore ascii escaping for python 3.3/3.4


  Commit: 8d1903fed386e5d2060c8a61339f0dd9d4df3b8f
      https://github.com/pytest-dev/pytest/commit/8d1903fed386e5d2060c8a61339f0dd9d4df3b8f
  Author: Tarcisio Fischer <tarcisio at esss.com.br>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M _pytest/pytester.py
    M testing/test_collection.py

  Log Message:
  -----------
  Avoid creating arbitrary filenames for tmpdir on Testdir's constructor

Fixes #2751


  Commit: de6b41e318a69d723c2e43aa6253991cd9921d5b
      https://github.com/pytest-dev/pytest/commit/de6b41e318a69d723c2e43aa6253991cd9921d5b
  Author: Tarcisio Fischer <tarcisio at esss.com.br>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M AUTHORS
    A changelog/2751.bugfix

  Log Message:
  -----------
  Update changelog and AUTHORS files, following the CONTRIBUTING guidelines


  Commit: d1f71b0575af32e2975eacdb87339cdeb0d12695
      https://github.com/pytest-dev/pytest/commit/d1f71b0575af32e2975eacdb87339cdeb0d12695
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M AUTHORS
    M _pytest/pytester.py
    A changelog/2751.bugfix
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #2752 from tarcisiofischer/issue-2751-fix-flaky-testdir

Issue 2751 fix flaky testdir


  Commit: d9992558fc0d1eac599ccf54b077ea37e1e06ac0
      https://github.com/pytest-dev/pytest/commit/d9992558fc0d1eac599ccf54b077ea37e1e06ac0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Refactor tox.ini so pluggymaster envs share definitions


  Commit: 7d59b2e350cbff1454355bc5225fc0f93bbba3a7
      https://github.com/pytest-dev/pytest/commit/7d59b2e350cbff1454355bc5225fc0f93bbba3a7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M testing/test_collection.py

  Log Message:
  -----------
  Fix call to outcome.force_result

Even though the test is not running at the moment (xfail), at least
we avoid future confusion


  Commit: 3d707270213091e231ebadfb526e6da4135685d6
      https://github.com/pytest-dev/pytest/commit/3d707270213091e231ebadfb526e6da4135685d6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M changelog/2734.trivial

  Log Message:
  -----------
  Improve wording in changelog entry


  Commit: f825b4979b52f9ae4b4a38cc8f77af7ab5905920
      https://github.com/pytest-dev/pytest/commit/f825b4979b52f9ae4b4a38cc8f77af7ab5905920
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M README.rst
    M _pytest/_code/code.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M appveyor.yml
    A changelog/2653.doc
    A changelog/2681.bugfix
    A changelog/2691.trivial
    A changelog/2707.bugfix
    A changelog/2721.trivial
    A changelog/2731.bugfix
    A changelog/2739.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.1.rst
    M doc/en/assert.rst
    M doc/en/customize.rst
    M doc/en/example/simple.rst
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/mark.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M scripts/call-tox.bat
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/deprecated_test.py
    M testing/test_capture.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into features


  Commit: e1f2254fc2dfd343898ed49e964c7453d364c3cf
      https://github.com/pytest-dev/pytest/commit/e1f2254fc2dfd343898ed49e964c7453d364c3cf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M _pytest/compat.py
    A changelog/2734.trivial

  Log Message:
  -----------
  Merge pull request #2734 from RonnyPfannschmidt/simplify-string-safening

simplyfy ascii escaping by using backslashreplace error handling


  Commit: d01f08e96fafc93cf54fd05ddff434a6da73bb6a
      https://github.com/pytest-dev/pytest/commit/d01f08e96fafc93cf54fd05ddff434a6da73bb6a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M README.rst
    M _pytest/_code/code.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M appveyor.yml
    A changelog/2653.doc
    A changelog/2681.bugfix
    A changelog/2691.trivial
    A changelog/2707.bugfix
    A changelog/2721.trivial
    A changelog/2731.bugfix
    A changelog/2734.trivial
    A changelog/2739.trivial
    A changelog/2751.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.1.rst
    M doc/en/assert.rst
    M doc/en/customize.rst
    M doc/en/example/simple.rst
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/mark.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M scripts/call-tox.bat
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/deprecated_test.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'features' into pluggy-master


  Commit: b55a4f805f523202e6f4100ee6507fe8e0076867
      https://github.com/pytest-dev/pytest/commit/b55a4f805f523202e6f4100ee6507fe8e0076867
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M .travis.yml
    M _pytest/config.py
    M appveyor.yml
    M setup.py
    M testing/python/collect.py
    M testing/test_collection.py
    M testing/test_pluginmanager.py
    M testing/test_runner.py
    M testing/test_unittest.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2744 from nicoddemus/pluggy-master

Add test environment using pluggy from master branch


  Commit: aa6a67044f1620797ac6dee3faa4e77368970c97
      https://github.com/pytest-dev/pytest/commit/aa6a67044f1620797ac6dee3faa4e77368970c97
  Author: Joan Massich <sik at visor.udg.edu>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    M _pytest/recwarn.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  Add match_regex functionality to warns


  Commit: 80d165475b4c1ef1f70ed01db3b7b08b627cb91b
      https://github.com/pytest-dev/pytest/commit/80d165475b4c1ef1f70ed01db3b7b08b627cb91b
  Author: Joan Massich <sik at visor.udg.edu>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    M _pytest/recwarn.py
    M doc/en/warnings.rst

  Log Message:
  -----------
  Add documentation


  Commit: a0c6758202c518d7e6c1726a850e6b7e6e0a3a74
      https://github.com/pytest-dev/pytest/commit/a0c6758202c518d7e6c1726a850e6b7e6e0a3a74
  Author: Joan Massich <sik at visor.udg.edu>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    A changelog/2708.feature

  Log Message:
  -----------
  Add changelog


  Commit: 6967f3070eec84597bc1be723d84169513d8a186
      https://github.com/pytest-dev/pytest/commit/6967f3070eec84597bc1be723d84169513d8a186
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    M _pytest/recwarn.py
    A changelog/2708.feature
    M doc/en/warnings.rst
    M testing/test_recwarn.py

  Log Message:
  -----------
  Merge pull request #2711 from massich/mimic_raises_signature_in_warns

[MRG][feature] Change warns signature to mimic the raises call


  Commit: 9273e11f219b801573e3f79b578c4dc435e2e060
      https://github.com/pytest-dev/pytest/commit/9273e11f219b801573e3f79b578c4dc435e2e060
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/compat.py
    M _pytest/fixtures.py
    R changelog/2653.doc
    R changelog/2681.bugfix
    R changelog/2691.trivial
    R changelog/2707.bugfix
    R changelog/2721.trivial
    R changelog/2731.bugfix
    R changelog/2739.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst
    M testing/python/collect.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge branch 'master' into features


  Commit: 3ebfb881c9a52550deccee9e989d2f026a57f30f
      https://github.com/pytest-dev/pytest/commit/3ebfb881c9a52550deccee9e989d2f026a57f30f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-18 (Mon, 18 Sep 2017)

  Changed paths:
    M HOWTORELEASE.rst
    M _pytest/_argcomplete.py
    M _pytest/mark.py
    A changelog/1548.doc
    A changelog/2722.trivial
    A changelog/2748.bugfix
    A changelog/2758.bugfix
    A changelog/2765.trivial
    M doc/en/contents.rst
    A doc/en/development_guide.rst
    M doc/en/example/markers.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M testing/code/test_source.py
    M testing/test_argcomplete.py
    M testing/test_mark.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into features


  Commit: afe7966683903316866bee75fcb3c94414449011
      https://github.com/pytest-dev/pytest/commit/afe7966683903316866bee75fcb3c94414449011
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-18 (Mon, 18 Sep 2017)

  Changed paths:
    M testing/python/collect.py

  Log Message:
  -----------
  Fix call to outcome.get_result now that outcome.result is deprecated


  Commit: a2da5a691a63e398223b5588d34e3eeebd0364ad
      https://github.com/pytest-dev/pytest/commit/a2da5a691a63e398223b5588d34e3eeebd0364ad
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-18 (Mon, 18 Sep 2017)

  Changed paths:
    M .travis.yml
    M appveyor.yml

  Log Message:
  -----------
  Update tox and appveyor environments to use py36 by default


  Commit: 062a0e3e68fef4f6c927442daf35a3e47e72cd8a
      https://github.com/pytest-dev/pytest/commit/062a0e3e68fef4f6c927442daf35a3e47e72cd8a
  Author: Ofir <eaoshri at gmail.com>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
   If an exception happens while loading a plugin, PyTest no longer hides the original traceback.
 In python2 it will show the original traceback with a new message that explains in which plugin.
 In python3 it will show 2 canonized exceptions, the original exception while loading the plugin in addition to an exception that PyTest throws about loading a plugin.


  Commit: c89827b9f2b42352a388fa1a013f6b51d0f33cb8
      https://github.com/pytest-dev/pytest/commit/c89827b9f2b42352a388fa1a013f6b51d0f33cb8
  Author: Ofir <eaoshri at gmail.com>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  updating import plugin error test in order to make sure it also checks that the original traceback has been shown to the users


  Commit: b57a84d065846076ab8df6316700ff2ecb0903aa
      https://github.com/pytest-dev/pytest/commit/b57a84d065846076ab8df6316700ff2ecb0903aa
  Author: Ofir <eaoshri at gmail.com>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    A changelog/2491.bugfix

  Log Message:
  -----------
  updating bugfix changelog


  Commit: d96869ff66def703c410c4ab258864997adddbd7
      https://github.com/pytest-dev/pytest/commit/d96869ff66def703c410c4ab258864997adddbd7
  Author: OfirOshir <eaoshri at gmail.com>
  Date:   2017-09-20 (Wed, 20 Sep 2017)

  Changed paths:
    M changelog/2491.bugfix

  Log Message:
  -----------
  fixing cr


  Commit: de0d19ca098f61d95b64ce20e4f217be36d06a94
      https://github.com/pytest-dev/pytest/commit/de0d19ca098f61d95b64ce20e4f217be36d06a94
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-09-20 (Wed, 20 Sep 2017)

  Changed paths:
    M .travis.yml
    M HOWTORELEASE.rst
    M _pytest/_argcomplete.py
    M _pytest/mark.py
    M appveyor.yml
    A changelog/1548.doc
    A changelog/2722.trivial
    A changelog/2748.bugfix
    A changelog/2758.bugfix
    A changelog/2765.trivial
    M doc/en/contents.rst
    A doc/en/development_guide.rst
    M doc/en/example/markers.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M testing/code/test_source.py
    M testing/python/collect.py
    M testing/test_argcomplete.py
    M testing/test_mark.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2790 from nicoddemus/merge-master-into-features

Merge master into features


  Commit: 8eafbd05ca2d980b36541fbc9d547e52b6016a9a
      https://github.com/pytest-dev/pytest/commit/8eafbd05ca2d980b36541fbc9d547e52b6016a9a
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/config.py
    A _pytest/logging.py

  Log Message:
  -----------
  Merge the pytest-catchlog plugin


  Commit: 6607478b23316653335de85e4a6eb2ec6d7e90c3
      https://github.com/pytest-dev/pytest/commit/6607478b23316653335de85e4a6eb2ec6d7e90c3
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py
    A testing/logging/conftest.py
    A testing/logging/test_compat.py
    A testing/logging/test_fixture.py
    A testing/logging/test_reporting.py

  Log Message:
  -----------
  Add unittests for LoggingPlugin (excluding perf tests)


  Commit: 5130f5707f2652262ca3fb2d2c9611824611c5eb
      https://github.com/pytest-dev/pytest/commit/5130f5707f2652262ca3fb2d2c9611824611c5eb
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    A testing/logging/test_capturelog_compat.py
    R testing/logging/test_compat.py

  Log Message:
  -----------
  Fix name clash


  Commit: ca46f4fe2a870d858ec5678116ea5d3b865489fe
      https://github.com/pytest-dev/pytest/commit/ca46f4fe2a870d858ec5678116ea5d3b865489fe
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    R testing/logging/conftest.py

  Log Message:
  -----------
  Remove conftest


  Commit: a8e3effb6c25129bc828df02fa9234b1f7aea1e4
      https://github.com/pytest-dev/pytest/commit/a8e3effb6c25129bc828df02fa9234b1f7aea1e4
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Upgrade py


  Commit: 1ba219e0da9a62a82dc6ad3c154c4df948a5bf32
      https://github.com/pytest-dev/pytest/commit/1ba219e0da9a62a82dc6ad3c154c4df948a5bf32
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Adapt (logging) unittest


  Commit: 1bea7e698553662ce52111f3b2f68f3c625b2df2
      https://github.com/pytest-dev/pytest/commit/1bea7e698553662ce52111f3b2f68f3c625b2df2
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Cleanup pytest_addoption


  Commit: 98209e92ee3ac1dec888eb123141488f265d9082
      https://github.com/pytest-dev/pytest/commit/98209e92ee3ac1dec888eb123141488f265d9082
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Remove superfluous whitespace in docstring


  Commit: 3e71a50403b6eeaee9d309f9a67bac98b67a5629
      https://github.com/pytest-dev/pytest/commit/3e71a50403b6eeaee9d309f9a67bac98b67a5629
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Remove unneeded sys import from unittest


  Commit: 36cceeb10eaed8310b4cc1b6761879d47ce07d72
      https://github.com/pytest-dev/pytest/commit/36cceeb10eaed8310b4cc1b6761879d47ce07d72
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Set type of log_print ini-variable to 'bool'


  Commit: a1bd54e4eae50d39a7650e93cd39fc09ce8c3cac
      https://github.com/pytest-dev/pytest/commit/a1bd54e4eae50d39a7650e93cd39fc09ce8c3cac
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Clean-up LogCaptureHandler


  Commit: fc965c1dc569556323fc196bd026f877e42a5d6a
      https://github.com/pytest-dev/pytest/commit/fc965c1dc569556323fc196bd026f877e42a5d6a
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Remove outdated docstring


  Commit: 87b8dc5afbb1a80670b510fbf40b9018f04a43d1
      https://github.com/pytest-dev/pytest/commit/87b8dc5afbb1a80670b510fbf40b9018f04a43d1
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Move 'config' handling from pytest_configure to __init__


  Commit: f1f6109255e5d2ef021f07d2b42d5f8c5f189f52
      https://github.com/pytest-dev/pytest/commit/f1f6109255e5d2ef021f07d2b42d5f8c5f189f52
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Remove _catchlog_ prefix


  Commit: d13e17cf51abf424f0bd26a3f8607c8f8339b390
      https://github.com/pytest-dev/pytest/commit/d13e17cf51abf424f0bd26a3f8607c8f8339b390
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Don't modify the 'config' object in __init__


  Commit: 08f6b5f4ea72add0fd07e4f6f559765a7bd8accf
      https://github.com/pytest-dev/pytest/commit/08f6b5f4ea72add0fd07e4f6f559765a7bd8accf
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Use pytest.hookimpl instead of pytest.mark.hookwrapper

pytest.mark.hookwrapper seems to be used nowhere in the _pytest package.


  Commit: e41fd52e8c6b6bc853511244c9a5459b218041c0
      https://github.com/pytest-dev/pytest/commit/e41fd52e8c6b6bc853511244c9a5459b218041c0
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Introduce live_logs context manager


  Commit: 57f66a455aa51fb0a38578664156923c5a8a5adf
      https://github.com/pytest-dev/pytest/commit/57f66a455aa51fb0a38578664156923c5a8a5adf
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  catching_logs: Remove unused 'filter' kwarg


  Commit: 3a4011585f67981595d6a2eb8ca3de78bbe2f251
      https://github.com/pytest-dev/pytest/commit/3a4011585f67981595d6a2eb8ca3de78bbe2f251
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  catching_logs: Remove usage of 'closing' ctx manager

The 'closing' context manager is only needed for the log_file_handler.


  Commit: 207f153ec13e41e13697da672fe59a64e320f00a
      https://github.com/pytest-dev/pytest/commit/207f153ec13e41e13697da672fe59a64e320f00a
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Remove logging_at_level ctx manager


  Commit: 2559ec8bdbaa71f5bc127e2f3fe50b79b98a2ad4
      https://github.com/pytest-dev/pytest/commit/2559ec8bdbaa71f5bc127e2f3fe50b79b98a2ad4
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  use 'formatter' kwarg of catching_logs


  Commit: ad21d5cac4a65d3b2d167453d1f92f053b86f5fb
      https://github.com/pytest-dev/pytest/commit/ad21d5cac4a65d3b2d167453d1f92f053b86f5fb
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M _pytest/logging.py
    R testing/logging/test_capturelog_compat.py
    M testing/logging/test_fixture.py

  Log Message:
  -----------
  Remove pytest-capturelog backward compat code


  Commit: 296ac5c476256cef50bc9a5cc448c34f7d2a389c
      https://github.com/pytest-dev/pytest/commit/296ac5c476256cef50bc9a5cc448c34f7d2a389c
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add thisch to AUTHORS


  Commit: 87596714bf924d2f3ebd23a79ab78a3ad0ea3787
      https://github.com/pytest-dev/pytest/commit/87596714bf924d2f3ebd23a79ab78a3ad0ea3787
  Author: Daniel Hahler <git at thequod.de>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  minor: cleanup tox.ini


  Commit: 9919269ed048b6e9147ee3301532e3591b9a112b
      https://github.com/pytest-dev/pytest/commit/9919269ed048b6e9147ee3301532e3591b9a112b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/2709.bugfix
    M testing/test_capture.py

  Log Message:
  -----------
  Allow to use capsys and capfd in other fixtures

Fix #2709


  Commit: 22f338d74d19e188a5a88a51cc722b771b07c24c
      https://github.com/pytest-dev/pytest/commit/22f338d74d19e188a5a88a51cc722b771b07c24c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M _pytest/capture.py
    M _pytest/debugging.py
    M _pytest/setuponly.py
    M testing/test_capture.py

  Log Message:
  -----------
  Refactor some names for better understanding and consistency


  Commit: c0c859ce995320264eddc96033766d8fbeac6624
      https://github.com/pytest-dev/pytest/commit/c0c859ce995320264eddc96033766d8fbeac6624
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2799 from blueyed/cleanup-tox.ini

minor: cleanup tox.ini


  Commit: 3b30c93f73dbda3f96ee5d9ec1c27626bd66a0be
      https://github.com/pytest-dev/pytest/commit/3b30c93f73dbda3f96ee5d9ec1c27626bd66a0be
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/helpconfig.py
    M _pytest/pastebin.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    A changelog/2803.removal

  Log Message:
  -----------
  Deprecate TerminalReporter._tw

Fix #2803


  Commit: d132c502e6ed7d5687a18d886652b37374600641
      https://github.com/pytest-dev/pytest/commit/d132c502e6ed7d5687a18d886652b37374600641
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-09-28 (Thu, 28 Sep 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/helpconfig.py
    M _pytest/pastebin.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    A changelog/2803.removal

  Log Message:
  -----------
  Merge pull request #2804 from nicoddemus/terminal-reporter-tw-2803

Deprecate TerminalReporter._tw


  Commit: f9589f7b6487062474ba7a6af583e3360c2e6bae
      https://github.com/pytest-dev/pytest/commit/f9589f7b6487062474ba7a6af583e3360c2e6bae
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-29 (Fri, 29 Sep 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/1993.bugfix
    M testing/test_capture.py

  Log Message:
  -----------
  Resume output capturing after capsys/capfd.disabled() context manager

Fix #1993


  Commit: 79d33530812748482726a82a45b0e2754928c756
      https://github.com/pytest-dev/pytest/commit/79d33530812748482726a82a45b0e2754928c756
  Author: George Y. Kussumoto <georgeyk.dev at gmail.com>
  Date:   2017-10-02 (Mon, 02 Oct 2017)

  Changed paths:
    M _pytest/outcomes.py

  Log Message:
  -----------
  Add allow_module_level kwarg to skip helper


  Commit: 06307be15d2db8d327c5f6f82d07aa590b760472
      https://github.com/pytest-dev/pytest/commit/06307be15d2db8d327c5f6f82d07aa590b760472
  Author: George Y. Kussumoto <georgeyk.dev at gmail.com>
  Date:   2017-10-02 (Mon, 02 Oct 2017)

  Changed paths:
    M testing/test_skipping.py

  Log Message:
  -----------
  Add initial tests using skip with allow_module_level kwarg


  Commit: e4a6e52b81c96bbeab2ff5506994722408622fd1
      https://github.com/pytest-dev/pytest/commit/e4a6e52b81c96bbeab2ff5506994722408622fd1
  Author: George Y. Kussumoto <georgeyk.dev at gmail.com>
  Date:   2017-10-02 (Mon, 02 Oct 2017)

  Changed paths:
    M doc/en/skipping.rst

  Log Message:
  -----------
  Update skipping documentation to include usage of allow_module_level kwarg


  Commit: c1aa63c0bbfe9b0b0613617b2c98941ff487cd03
      https://github.com/pytest-dev/pytest/commit/c1aa63c0bbfe9b0b0613617b2c98941ff487cd03
  Author: George Y. Kussumoto <georgeyk.dev at gmail.com>
  Date:   2017-10-02 (Mon, 02 Oct 2017)

  Changed paths:
    M _pytest/outcomes.py

  Log Message:
  -----------
  Fix docstring alignment and typos


  Commit: 59f66933cd9468eec3dc67714f1b686f8dfb1c39
      https://github.com/pytest-dev/pytest/commit/59f66933cd9468eec3dc67714f1b686f8dfb1c39
  Author: George Y. Kussumoto <georgeyk.dev at gmail.com>
  Date:   2017-10-02 (Mon, 02 Oct 2017)

  Changed paths:
    M doc/en/skipping.rst

  Log Message:
  -----------
  Update documentation example of pytest.skip(allow_module_level=True)


  Commit: 9824499396a16cea957f1cd87c2c245b1cd68d8a
      https://github.com/pytest-dev/pytest/commit/9824499396a16cea957f1cd87c2c245b1cd68d8a
  Author: George Y. Kussumoto <georgeyk.dev at gmail.com>
  Date:   2017-10-02 (Mon, 02 Oct 2017)

  Changed paths:
    A changelog/2808.feature

  Log Message:
  -----------
  Add 2808.feature changelog entry


  Commit: fbb9e9328bbc008be02ad050d5703a44c90e46d2
      https://github.com/pytest-dev/pytest/commit/fbb9e9328bbc008be02ad050d5703a44c90e46d2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-03 (Tue, 03 Oct 2017)

  Changed paths:
    M _pytest/warnings.py
    A changelog/2809.bugfix
    M testing/test_warnings.py

  Log Message:
  -----------
  Fix warning about non-ascii warnings even when they are ascii

Fix #2809


  Commit: df6d5cd4e7df94f276281a48826202b622c0a68d
      https://github.com/pytest-dev/pytest/commit/df6d5cd4e7df94f276281a48826202b622c0a68d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-03 (Tue, 03 Oct 2017)

  Changed paths:
    M _pytest/compat.py
    M _pytest/python.py
    M _pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Use ascii_escaped to escape unicode warnings


  Commit: 61eb20df71395a194aaebe71a2b9f373fd923293
      https://github.com/pytest-dev/pytest/commit/61eb20df71395a194aaebe71a2b9f373fd923293
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-03 (Tue, 03 Oct 2017)

  Changed paths:
    M _pytest/compat.py
    M _pytest/python.py
    M _pytest/warnings.py
    A changelog/2809.bugfix
    M testing/test_warnings.py

  Log Message:
  -----------
  Merge pull request #2810 from nicoddemus/issue-2809

Fix warning about non-ascii warnings even when they are ascii


  Commit: e7a4d3d8cf5cee96d2ce06f8e87268bac39a7287
      https://github.com/pytest-dev/pytest/commit/e7a4d3d8cf5cee96d2ce06f8e87268bac39a7287
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M _pytest/mark.py
    M _pytest/python.py
    R changelog/1548.doc
    R changelog/2722.trivial
    R changelog/2748.bugfix
    R changelog/2758.bugfix
    R changelog/2765.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.3.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M testing/python/show_fixtures_per_test.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into features


  Commit: 03ce0adb79b012a6a34adb2d2fe6a6d9ba9b6fb2
      https://github.com/pytest-dev/pytest/commit/03ce0adb79b012a6a34adb2d2fe6a6d9ba9b6fb2
  Author: George Y. Kussumoto <georgeyk.dev at gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M _pytest/skipping.py
    M testing/test_skipping.py

  Log Message:
  -----------
  Fix: handle CollectReport in folded_skips function


  Commit: 0668a6c6d3aee3d52239165fd6f7f8a2bb5d6f9d
      https://github.com/pytest-dev/pytest/commit/0668a6c6d3aee3d52239165fd6f7f8a2bb5d6f9d
  Author: George Y. Kussumoto <georgeyk.dev at gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add myself to authors file


  Commit: 667e70f5551da23b86dd6ee29b5f77d5c604d003
      https://github.com/pytest-dev/pytest/commit/667e70f5551da23b86dd6ee29b5f77d5c604d003
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/unittest.py
    A changelog/2767.trivial

  Log Message:
  -----------
  switch out the placeholder MarkEvaluator in unittest plugin


  Commit: a33650953a4838cd742f547ea14dcd8fc7731adb
      https://github.com/pytest-dev/pytest/commit/a33650953a4838cd742f547ea14dcd8fc7731adb
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/unittest.py

  Log Message:
  -----------
  remove unused import


  Commit: 9ad2b75038204ab44125219797df3b9dabb99889
      https://github.com/pytest-dev/pytest/commit/9ad2b75038204ab44125219797df3b9dabb99889
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/skipping.py
    M _pytest/unittest.py
    A changelog/2767.removal

  Log Message:
  -----------
  skipping: replace _evalskip with a more consistent _skipped_by_mark


  Commit: 8480075f01af2f35e97ad99bb6eeb39b90b0a24a
      https://github.com/pytest-dev/pytest/commit/8480075f01af2f35e97ad99bb6eeb39b90b0a24a
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/skipping.py

  Log Message:
  -----------
  resuffle markevaluator internal structure


  Commit: e3b73682b229fc52db2124981bd6f21ad1c2dc9d
      https://github.com/pytest-dev/pytest/commit/e3b73682b229fc52db2124981bd6f21ad1c2dc9d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/skipping.py

  Log Message:
  -----------
  flake8 fix


  Commit: 459cc401929db9f6c8b9970a015ab251b221ffec
      https://github.com/pytest-dev/pytest/commit/459cc401929db9f6c8b9970a015ab251b221ffec
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/skipping.py

  Log Message:
  -----------
  skipping: cleanup

remove dead comments
fix naming
remove dead code


  Commit: 8a6bdb282f2ddaa72f5010e5fbe88726b4b8d022
      https://github.com/pytest-dev/pytest/commit/8a6bdb282f2ddaa72f5010e5fbe88726b4b8d022
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M changelog/2767.removal

  Log Message:
  -----------
  fix changelog entry


  Commit: 9b0ce535c94202d034162fe532ae1d05b1b25b7b
      https://github.com/pytest-dev/pytest/commit/9b0ce535c94202d034162fe532ae1d05b1b25b7b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M _pytest/capture.py
    M _pytest/debugging.py
    M _pytest/setuponly.py
    A changelog/1993.bugfix
    A changelog/2709.bugfix
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2801 from nicoddemus/capture-fixture

Allow fixtures to use capsys and capfd


  Commit: 88366b393ce1501ac73351239838fd5fa708c115
      https://github.com/pytest-dev/pytest/commit/88366b393ce1501ac73351239838fd5fa708c115
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    A changelog/2812.removal
    M setup.py
    M tox.ini

  Log Message:
  -----------
  start the removal of python 2.6/3.3 support


  Commit: 73ff53c742de501d0f3b4c4d6e3cdaa6a8b5fde5
      https://github.com/pytest-dev/pytest/commit/73ff53c742de501d0f3b4c4d6e3cdaa6a8b5fde5
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    M tox.ini

  Log Message:
  -----------
  remove eol python from the ci config


  Commit: 059455b45d7f36c4a000d63c00be91b19523c1d9
      https://github.com/pytest-dev/pytest/commit/059455b45d7f36c4a000d63c00be91b19523c1d9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M _pytest/skipping.py
    M _pytest/unittest.py
    A changelog/2767.removal
    A changelog/2767.trivial

  Log Message:
  -----------
  Merge pull request #2773 from RonnyPfannschmidt/fix-markeval-2767

refactor mark evaluators


  Commit: c48659844060746789f059929ce03a60589cc22b
      https://github.com/pytest-dev/pytest/commit/c48659844060746789f059929ce03a60589cc22b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M _pytest/compat.py

  Log Message:
  -----------
  remove some support code for old python versions


  Commit: dd45f8ba6c68936f0c186b5b094d9843c76de772
      https://github.com/pytest-dev/pytest/commit/dd45f8ba6c68936f0c186b5b094d9843c76de772
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M .travis.yml
    M _pytest/compat.py
    M appveyor.yml
    A changelog/2812.removal
    M setup.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2822 from RonnyPfannschmidt/nomore-py26

Nomore py26


  Commit: ef732fc51d9d2ace3166cbbad21a608a3d4bfc4d
      https://github.com/pytest-dev/pytest/commit/ef732fc51d9d2ace3166cbbad21a608a3d4bfc4d
  Author: hugovk <hugovk at users.noreply.github.com>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M .coveragerc
    M README.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/python_api.py
    M doc/en/example/multipython.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/skipping.rst
    M setup.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/test_assertrewrite.py
    M testing/test_config.py
    M testing/test_parseopt.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Remove code for unsupported Python versions


  Commit: 7113c76f0d76378e16b54b5d8d4dc466e1f38935
      https://github.com/pytest-dev/pytest/commit/7113c76f0d76378e16b54b5d8d4dc466e1f38935
  Author: hugovk <hugovk at users.noreply.github.com>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Remove unused import


  Commit: be0e2132b73c3dced78e0a453a5f86f5c57630db
      https://github.com/pytest-dev/pytest/commit/be0e2132b73c3dced78e0a453a5f86f5c57630db
  Author: Hugo <hugovk at users.noreply.github.com>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Update authors [CI skip]


  Commit: 1480aed78122016f5b98d3bb2de3cfe272e0e148
      https://github.com/pytest-dev/pytest/commit/1480aed78122016f5b98d3bb2de3cfe272e0e148
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M .coveragerc
    M AUTHORS
    M README.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/python_api.py
    M doc/en/example/multipython.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/skipping.rst
    M setup.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/test_assertrewrite.py
    M testing/test_config.py
    M testing/test_parseopt.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Merge pull request #2823 from hugovk/features-rm-2.6

 Remove code for unsupported Python versions


  Commit: 66e9a794726fd4ba6dc7e28962cdb46b46297e9b
      https://github.com/pytest-dev/pytest/commit/66e9a794726fd4ba6dc7e28962cdb46b46297e9b
  Author: Dirk Thomas <dirk-thomas at users.noreply.github.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  get PYTEST_ADDOPTS before calling _initini


  Commit: ed7aa074aa6b17befed57264a2414e633f792109
      https://github.com/pytest-dev/pytest/commit/ed7aa074aa6b17befed57264a2414e633f792109
  Author: Dirk Thomas <dirk-thomas at users.noreply.github.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    A changelog/2824.feature

  Log Message:
  -----------
  add changelog file for #2824


  Commit: ce8c829945ef30352cc7bec750b91eda85eba8f9
      https://github.com/pytest-dev/pytest/commit/ce8c829945ef30352cc7bec750b91eda85eba8f9
  Author: Dirk Thomas <dirk-thomas at users.noreply.github.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M testing/test_config.py

  Log Message:
  -----------
  add test for #2824


  Commit: 10a3b9118b70ae287b32c218d89a5a5e0c145127
      https://github.com/pytest-dev/pytest/commit/10a3b9118b70ae287b32c218d89a5a5e0c145127
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M testing/test_config.py

  Log Message:
  -----------
  Use a relative cache_dir in test because of how arguments are parsed on Windows

We use shlex to parse command-line arguments and PYTEST_ADDOPTS, so passing
a full path with '\' arguments produces incorrect results on Windows

Anyway users are advised to use relative paths for portability


  Commit: 69f3bd83360d7fb13df7e3e46eb16f029b86517d
      https://github.com/pytest-dev/pytest/commit/69f3bd83360d7fb13df7e3e46eb16f029b86517d
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    A changelog/2794.feature

  Log Message:
  -----------
  Add changelog entry for catchlog plugin


  Commit: 0ec72d07450635cef2c0082fc3f82f1e842a92d5
      https://github.com/pytest-dev/pytest/commit/0ec72d07450635cef2c0082fc3f82f1e842a92d5
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Improve get_option_ini and get_actual_log_level


  Commit: 1f3ab118fae69ddd60677289173b9726f7b5c068
      https://github.com/pytest-dev/pytest/commit/1f3ab118fae69ddd60677289173b9726f7b5c068
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Remove usage of get_logger_obj


  Commit: 815dd19fb4b265e9a29ed98bf612953858fb3bbd
      https://github.com/pytest-dev/pytest/commit/815dd19fb4b265e9a29ed98bf612953858fb3bbd
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M testing/logging/test_fixture.py

  Log Message:
  -----------
  Remove unicode literal compat code


  Commit: 0e83511d6d6fa0f6619df8a17b7c04de8e21acba
      https://github.com/pytest-dev/pytest/commit/0e83511d6d6fa0f6619df8a17b7c04de8e21acba
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M _pytest/logging.py
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Rename name of registered logging plugin


  Commit: 502652ff02fb6566cd88df865fe6ec857742e172
      https://github.com/pytest-dev/pytest/commit/502652ff02fb6566cd88df865fe6ec857742e172
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Add preliminary documentation for logging-plugin


  Commit: 775f4a6f2fe031e0ab01e8579cefbd528d68770d
      https://github.com/pytest-dev/pytest/commit/775f4a6f2fe031e0ab01e8579cefbd528d68770d
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Fix flake8 issue


  Commit: f3261d94184280a2bc9ce9a1336c9f08cbd7a3c6
      https://github.com/pytest-dev/pytest/commit/f3261d94184280a2bc9ce9a1336c9f08cbd7a3c6
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M doc/en/contents.rst
    A doc/en/logging.rst
    M doc/en/plugins.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Move logging docu into own rst file

Remove reference of pytest-catchlog plugin in plugins.rst


  Commit: 8aed5fecd9f5b3b715b4cb00c6e2b72dd86f6e70
      https://github.com/pytest-dev/pytest/commit/8aed5fecd9f5b3b715b4cb00c6e2b72dd86f6e70
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Remove test_logging_initialized_in_test


  Commit: af75ca435b91d7f487c379831be8821630cf5458
      https://github.com/pytest-dev/pytest/commit/af75ca435b91d7f487c379831be8821630cf5458
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Fix some coding-style issues in the logging plugin


  Commit: df37cdf51f915d1387bc413bce82801867d44250
      https://github.com/pytest-dev/pytest/commit/df37cdf51f915d1387bc413bce82801867d44250
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M AUTHORS
    M _pytest/outcomes.py
    M _pytest/skipping.py
    A changelog/2808.feature
    M doc/en/skipping.rst
    M testing/test_skipping.py

  Log Message:
  -----------
  Merge pull request #2808 from georgeyk/allow-module-level-skip

Allow module level skip


  Commit: c750a5beec815ff2caccdd9bb76f54e11901e1a8
      https://github.com/pytest-dev/pytest/commit/c750a5beec815ff2caccdd9bb76f54e11901e1a8
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M AUTHORS
    M _pytest/config.py
    A _pytest/logging.py
    A changelog/2794.feature
    M doc/en/contents.rst
    A doc/en/logging.rst
    M doc/en/plugins.rst
    M doc/en/usage.rst
    M setup.py
    A testing/logging/test_fixture.py
    A testing/logging/test_reporting.py
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2794 from thisch/catchlog

Merge pytest-catchlog plugin


  Commit: b29a9711c4cb236f9515fca8f36d7733a8301738
      https://github.com/pytest-dev/pytest/commit/b29a9711c4cb236f9515fca8f36d7733a8301738
  Author: je <aysonje at gmail.com>
  Date:   2017-10-14 (Sat, 14 Oct 2017)

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  ignore valid setup.py during --doctest-modules


  Commit: eaf38c72391efcfde8efc852c0921eb6374787de
      https://github.com/pytest-dev/pytest/commit/eaf38c72391efcfde8efc852c0921eb6374787de
  Author: je <aysonje at gmail.com>
  Date:   2017-10-14 (Sat, 14 Oct 2017)

  Changed paths:
    M AUTHORS
    M _pytest/doctest.py
    A changelog/502.feature
    M testing/test_doctest.py

  Log Message:
  -----------
  call path.read(), add tests, add news fragment


  Commit: 843872b501721d53704097931472a33fef1d2813
      https://github.com/pytest-dev/pytest/commit/843872b501721d53704097931472a33fef1d2813
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M changelog/502.feature

  Log Message:
  -----------
  Improve formatting in 502.feature file


  Commit: 71c76d96d3f5d62d64397877dae7192cb17fb533
      https://github.com/pytest-dev/pytest/commit/71c76d96d3f5d62d64397877dae7192cb17fb533
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-17 (Tue, 17 Oct 2017)

  Changed paths:
    M AUTHORS
    M _pytest/doctest.py
    A changelog/502.feature
    M testing/test_doctest.py

  Log Message:
  -----------
  Merge pull request #2834 from aysonje/ignore-setup

ignore valid setup.py during --doctest-modules


  Commit: 00d3abe6dcb63a94c1b76b4187fdef07510048a7
      https://github.com/pytest-dev/pytest/commit/00d3abe6dcb63a94c1b76b4187fdef07510048a7
  Author: Jes?s Espino <jespinog at gmail.com>
  Date:   2017-10-17 (Tue, 17 Oct 2017)

  Changed paths:
    M _pytest/main.py
    A changelog/2845.bugfix
    M testing/test_collection.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Adding Failed exception to manage maxfail behavior


  Commit: 537fc3c3152542484754220716677385c1ab9cf3
      https://github.com/pytest-dev/pytest/commit/537fc3c3152542484754220716677385c1ab9cf3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-18 (Wed, 18 Oct 2017)

  Changed paths:
    M _pytest/config.py
    A changelog/2824.feature
    M testing/test_config.py

  Log Message:
  -----------
  Merge pull request #2824 from dirk-thomas/pytest_addopts_before_initini

get PYTEST_ADDOPTS before calling _initini


  Commit: e81b275eda947249761583f8611d4fdd14481dc5
      https://github.com/pytest-dev/pytest/commit/e81b275eda947249761583f8611d4fdd14481dc5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-18 (Wed, 18 Oct 2017)

  Changed paths:
    M changelog/2845.bugfix

  Log Message:
  -----------
  Update formatting in CHANGELOG


  Commit: 3f9f4be07043e8284272f6cac09825dd296279f4
      https://github.com/pytest-dev/pytest/commit/3f9f4be07043e8284272f6cac09825dd296279f4
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M _pytest/main.py
    A changelog/2845.bugfix
    M testing/test_collection.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #2845 from jespino/fix/2832

Adding Failed exception to manage maxfail behavior


  Commit: 5c71151967797b5b4886b7021edabdf17ee6e566
      https://github.com/pytest-dev/pytest/commit/5c71151967797b5b4886b7021edabdf17ee6e566
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M changelog/2812.removal

  Log Message:
  -----------
  Add more text to the 2.6 and 3.3 announcement

The text was a bit short for this important announcement.


  Commit: 3da28067f306582a10b798ba527356d62c1f4f86
      https://github.com/pytest-dev/pytest/commit/3da28067f306582a10b798ba527356d62c1f4f86
  Author: Ceridwen <ceridwen at users.noreply.github.com>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    M _pytest/fixtures.py
    A changelog/2267.feature
    M setup.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Replace introspection in compat.getfuncargnames() with inspect/funcsigs.signature


  Commit: f7387e45ea0b163ba4944801fdb70c521d7b8cc8
      https://github.com/pytest-dev/pytest/commit/f7387e45ea0b163ba4944801fdb70c521d7b8cc8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Fix linting


  Commit: 083084fcbc7802e1e551eda8cfb3982a95f0f6c2
      https://github.com/pytest-dev/pytest/commit/083084fcbc7802e1e551eda8cfb3982a95f0f6c2
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-20 (Fri, 20 Oct 2017)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    M _pytest/fixtures.py
    A changelog/2267.feature
    M setup.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #2842 from ceridwen/features

Use funcsigs and inspect.signature to do function argument analysis


  Commit: 6821d36ca528926ba93646d1e20b8b8b4b19de76
      https://github.com/pytest-dev/pytest/commit/6821d36ca528926ba93646d1e20b8b8b4b19de76
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-24 (Tue, 24 Oct 2017)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M AUTHORS
    M CONTRIBUTING.rst
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    A _pytest/nodes.py
    M _pytest/python_api.py
    M _pytest/terminal.py
    A changelog/1997.doc
    A changelog/2819.bugfix
    A changelog/2836.bug
    A changelog/538.doc
    A changelog/911.doc
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/pythonpath.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M testing/test_collection.py
    M testing/test_mark.py
    A testing/test_nodes.py
    M tox.ini

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


  Commit: 6b86b0dbfea3895a1d16d7db970d3ea91de92ecc
      https://github.com/pytest-dev/pytest/commit/6b86b0dbfea3895a1d16d7db970d3ea91de92ecc
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-24 (Tue, 24 Oct 2017)

  Changed paths:
    M _pytest/compat.py
    M _pytest/pytester.py
    M _pytest/recwarn.py
    M testing/logging/test_fixture.py

  Log Message:
  -----------
  Fix additional linting issues


  Commit: 4e581b637f3082836a0c711b9fb62dac485cca79
      https://github.com/pytest-dev/pytest/commit/4e581b637f3082836a0c711b9fb62dac485cca79
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-24 (Tue, 24 Oct 2017)

  Changed paths:
    M _pytest/compat.py
    M _pytest/mark.py
    M _pytest/python_api.py

  Log Message:
  -----------
  Use zip and map from six


  Commit: f743e95cfcfd186aa779a18f4157621c1c994a9f
      https://github.com/pytest-dev/pytest/commit/f743e95cfcfd186aa779a18f4157621c1c994a9f
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M _pytest/config.py
    A changelog/2491.bugfix
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Merge pull request #2791 from OfirOshir/features

bugfix for issue #2491


  Commit: def471b9759077652d74d8a98aab9e147dc287c2
      https://github.com/pytest-dev/pytest/commit/def471b9759077652d74d8a98aab9e147dc287c2
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M AUTHORS
    M CONTRIBUTING.rst
    M _pytest/compat.py
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    A _pytest/nodes.py
    M _pytest/pytester.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/terminal.py
    A changelog/1997.doc
    A changelog/2819.bugfix
    A changelog/2836.bug
    A changelog/538.doc
    A changelog/911.doc
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/pythonpath.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M testing/logging/test_fixture.py
    M testing/test_collection.py
    M testing/test_mark.py
    A testing/test_nodes.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2869 from nicoddemus/merge-master-into-features

Merge master into features


  Commit: 4a436f225532e019787f5ef88be949e826928e21
      https://github.com/pytest-dev/pytest/commit/4a436f225532e019787f5ef88be949e826928e21
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-27 (Fri, 27 Oct 2017)

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/2877.trivial

  Log Message:
  -----------
  move responsibility for parameterset extraction into parameterset class


  Commit: b27dde24d6fc4e737c685effe18ae121881c976c
      https://github.com/pytest-dev/pytest/commit/b27dde24d6fc4e737c685effe18ae121881c976c
  Author: Samuel Dion-Girardeau <samuel.diongirardeau at gmail.com>
  Date:   2017-10-28 (Sat, 28 Oct 2017)

  Changed paths:
    M _pytest/capture.py
    M testing/test_capture.py

  Log Message:
  -----------
  Use a nametuple for `readouterr()` results

This allows accessing `out` and `err`?directly by attribute,
while preserving tuple unpacking.

Also added tests, one for the `capsys` fixture, and one for the
`MultiCapture` class itself.


  Commit: 8e28815d4455dbfcd4bcec8ba3c0f096dbcb1abd
      https://github.com/pytest-dev/pytest/commit/8e28815d4455dbfcd4bcec8ba3c0f096dbcb1abd
  Author: Samuel Dion-Girardeau <samuel.diongirardeau at gmail.com>
  Date:   2017-10-28 (Sat, 28 Oct 2017)

  Changed paths:
    A changelog/2879.feature

  Log Message:
  -----------
  Add changelog entry for issue #2879


  Commit: 8e178e9f9b5d8ae217fcd7635651157c5c9a94bc
      https://github.com/pytest-dev/pytest/commit/8e178e9f9b5d8ae217fcd7635651157c5c9a94bc
  Author: Samuel Dion-Girardeau <samuel.diongirardeau at gmail.com>
  Date:   2017-10-28 (Sat, 28 Oct 2017)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add myself to AUTHORS list


  Commit: cb30848e5a2ec55d9d5c9548879559e3f370a76e
      https://github.com/pytest-dev/pytest/commit/cb30848e5a2ec55d9d5c9548879559e3f370a76e
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M AUTHORS
    M _pytest/capture.py
    A changelog/2879.feature
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2880 from samueldg/capture-result-namedtuple

Capture result namedtuple


  Commit: 821f9a94d8e5f8328abb43277781d29c03fa1b05
      https://github.com/pytest-dev/pytest/commit/821f9a94d8e5f8328abb43277781d29c03fa1b05
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/python.py

  Log Message:
  -----------
  deprecate the public internal PyCollector.makeitem method


  Commit: 766de67392dda354fd37023f219dd71a4252efce
      https://github.com/pytest-dev/pytest/commit/766de67392dda354fd37023f219dd71a4252efce
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M _pytest/deprecated.py

  Log Message:
  -----------
  Fix linting error in deprecated.py


  Commit: 07b2b18a01a3ba12757a4eb1c0e082922f5299e5
      https://github.com/pytest-dev/pytest/commit/07b2b18a01a3ba12757a4eb1c0e082922f5299e5
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/mark.py
    M setup.py

  Log Message:
  -----------
  introduce attrs as dependency and use it

for FixtureFunctionMarker and marks


  Commit: d1aa553f739e91cd470eea23042b6c8bcebe9b6f
      https://github.com/pytest-dev/pytest/commit/d1aa553f739e91cd470eea23042b6c8bcebe9b6f
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    A testing/python/test_deprecations.py

  Log Message:
  -----------
  add mocked integrationtest for the deprecationwarning of makeitem


  Commit: f3a119c06a8197ac986241e800beabfa63725f54
      https://github.com/pytest-dev/pytest/commit/f3a119c06a8197ac986241e800beabfa63725f54
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-03 (Fri, 03 Nov 2017)

  Changed paths:
    M AUTHORS
    M _pytest/assertion/rewrite.py
    M _pytest/doctest.py
    M _pytest/mark.py
    A changelog/1505.doc
    A changelog/2658.doc
    A changelog/2856.bugfix
    A changelog/2882.bugfix
    M doc/en/assert.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/fixture.rst
    M doc/en/plugins.rst
    M doc/en/skipping.rst
    M doc/en/writing_plugins.rst
    M testing/test_assertrewrite.py
    M testing/test_doctest.py
    M testing/test_mark.py
    M tox.ini

  Log Message:
  -----------
  Merge upstream/master into features


  Commit: 460cae02b0d48594730870ae0e6cf8cd9653b865
      https://github.com/pytest-dev/pytest/commit/460cae02b0d48594730870ae0e6cf8cd9653b865
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-03 (Fri, 03 Nov 2017)

  Changed paths:
    M changelog/2877.trivial

  Log Message:
  -----------
  Small formatting fix in CHANGELOG


  Commit: 7d43225c3644ec0e5e86080db686151c042c822d
      https://github.com/pytest-dev/pytest/commit/7d43225c3644ec0e5e86080db686151c042c822d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-03 (Fri, 03 Nov 2017)

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/2877.trivial

  Log Message:
  -----------
  Merge pull request #2877 from RonnyPfannschmidt/extract-extract-parameterset

move responsibility for parameterset extraction into parameterset class


  Commit: e58e8faf476edebc4cdba54951cdd84efcd10124
      https://github.com/pytest-dev/pytest/commit/e58e8faf476edebc4cdba54951cdd84efcd10124
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-03 (Fri, 03 Nov 2017)

  Changed paths:
    A changelog/2641.trivial

  Log Message:
  -----------
  Add CHANGELOG entry for attrs module dependency


  Commit: d7e8eeef56c3c5a8bcebe19a21943f7e969b62af
      https://github.com/pytest-dev/pytest/commit/d7e8eeef56c3c5a8bcebe19a21943f7e969b62af
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-03 (Fri, 03 Nov 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/python.py
    A testing/python/test_deprecations.py

  Log Message:
  -----------
  Merge pull request #2878 from RonnyPfannschmidt/collector-makeitem-deprecate

deprecate the public internal PyCollector.makeitem method


  Commit: b18a9deb4c54f8835f74ebef4749c4edbff9daf5
      https://github.com/pytest-dev/pytest/commit/b18a9deb4c54f8835f74ebef4749c4edbff9daf5
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-04 (Sat, 04 Nov 2017)

  Changed paths:
    M AUTHORS
    M _pytest/assertion/rewrite.py
    M _pytest/doctest.py
    M _pytest/mark.py
    A changelog/1505.doc
    A changelog/2658.doc
    A changelog/2856.bugfix
    A changelog/2882.bugfix
    M doc/en/assert.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/fixture.rst
    M doc/en/plugins.rst
    M doc/en/skipping.rst
    M doc/en/writing_plugins.rst
    M testing/test_assertrewrite.py
    M testing/test_doctest.py
    M testing/test_mark.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2892 from nicoddemus/merge-master-into-features

Merge upstream/master into features


  Commit: e351976ef4e3c6c4d57fd002d05011fc2a879803
      https://github.com/pytest-dev/pytest/commit/e351976ef4e3c6c4d57fd002d05011fc2a879803
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-04 (Sat, 04 Nov 2017)

  Changed paths:
    M AUTHORS
    M _pytest/assertion/rewrite.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/1505.doc
    A changelog/2658.doc
    A changelog/2856.bugfix
    A changelog/2877.trivial
    A changelog/2882.bugfix
    M doc/en/assert.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/fixture.rst
    M doc/en/plugins.rst
    M doc/en/skipping.rst
    M doc/en/writing_plugins.rst
    A testing/python/test_deprecations.py
    M testing/test_assertrewrite.py
    M testing/test_doctest.py
    M testing/test_mark.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features' into RonnyPfannschmidt/introduce-attrs


  Commit: c33074c8b9d11d0806ae7da73ad99d96a88539ab
      https://github.com/pytest-dev/pytest/commit/c33074c8b9d11d0806ae7da73ad99d96a88539ab
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-06 (Mon, 06 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/mark.py
    A changelog/2641.trivial
    M setup.py

  Log Message:
  -----------
  Merge pull request #2641 from RonnyPfannschmidt/introduce-attrs

[RFC] Introduce attrs


  Commit: c47dcaa7134527abf40bd469864c433dfba1814b
      https://github.com/pytest-dev/pytest/commit/c47dcaa7134527abf40bd469864c433dfba1814b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2910.trivial

  Log Message:
  -----------
  switch a special case in scope node lookup to a general one


  Commit: 0108f262b1ad37b609222605182f90a33c3fa067
      https://github.com/pytest-dev/pytest/commit/0108f262b1ad37b609222605182f90a33c3fa067
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M changelog/2910.trivial

  Log Message:
  -----------
  Fix typo in CHANGELOG


  Commit: 983a09a2d49fddf277e587edc3e87eb8b8f34308
      https://github.com/pytest-dev/pytest/commit/983a09a2d49fddf277e587edc3e87eb8b8f34308
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    A changelog/2893.doc
    A changelog/2903.doc
    M doc/en/parametrize.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_nose.py
    M testing/test_pluginmanager.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

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


  Commit: 99496d9e5b7bdbc9ae34224772f7309ccb82e9b4
      https://github.com/pytest-dev/pytest/commit/99496d9e5b7bdbc9ae34224772f7309ccb82e9b4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2910.trivial

  Log Message:
  -----------
  Merge pull request #2910 from RonnyPfannschmidt/scopenode-sanitize-specials

switch a special case in scope node lookup to a general one


  Commit: d1af369800e8b11d37946ff62a31bafaa008cae1
      https://github.com/pytest-dev/pytest/commit/d1af369800e8b11d37946ff62a31bafaa008cae1
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-11 (Sat, 11 Nov 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    A changelog/2893.doc
    A changelog/2903.doc
    M doc/en/parametrize.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_nose.py
    M testing/test_pluginmanager.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2913 from nicoddemus/merge-master-into-features

Merge master into features


  Commit: 258031afe586e789d121b2a02dba37ea6c4a26e1
      https://github.com/pytest-dev/pytest/commit/258031afe586e789d121b2a02dba37ea6c4a26e1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .gitignore
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M HOWTORELEASE.rst
    M LICENSE
    R MANIFEST.in
    M README.rst
    M _pytest/__init__.py
    M _pytest/_argcomplete.py
    M _pytest/_code/__init__.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    A _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    R _pytest/impl
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    A _pytest/nodes.py
    M _pytest/nose.py
    A _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    A _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/vendored_packages/pluggy.py
    A _pytest/warnings.py
    M appveyor.yml
    A changelog/1505.doc
    A changelog/1997.doc
    A changelog/2658.doc
    A changelog/2775.bugfix
    A changelog/2819.bugfix
    A changelog/2836.bug
    A changelog/2856.bugfix
    A changelog/2882.bugfix
    A changelog/2893.doc
    A changelog/2903.doc
    A changelog/538.doc
    A changelog/911.doc
    A changelog/_template.rst
    M doc/en/Makefile
    M doc/en/_templates/globaltoc.html
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.2.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.1.rst
    M doc/en/announce/release-2.9.2.rst
    A doc/en/announce/release-3.0.6.rst
    A doc/en/announce/release-3.0.7.rst
    A doc/en/announce/release-3.1.0.rst
    A doc/en/announce/release-3.1.1.rst
    A doc/en/announce/release-3.1.2.rst
    A doc/en/announce/release-3.1.3.rst
    A doc/en/announce/release-3.2.0.rst
    A doc/en/announce/release-3.2.1.rst
    A doc/en/announce/release-3.2.2.rst
    A doc/en/announce/release-3.2.3.rst
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/conf.py
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    A doc/en/development_guide.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/attic.rst
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/index.rst
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    A doc/en/existingtestsuite.rst
    M doc/en/faq.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    A doc/en/historical-notes.rst
    M doc/en/index.rst
    M doc/en/license.rst
    M doc/en/mark.rst
    M doc/en/monkeypatch.rst
    M doc/en/nose.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    M doc/en/projects.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    A doc/en/pythonpath.rst
    M doc/en/recwarn.rst
    A doc/en/requirements.txt
    R doc/en/setup.rst
    M doc/en/skipping.rst
    M doc/en/talks.rst
    M doc/en/test/attic.rst
    M doc/en/test/plugin/xdist.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    A doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    A pyproject.toml
    M pytest.py
    M scripts/call-tox.bat
    R scripts/check-manifest.py
    A scripts/check-rst.py
    M setup.cfg
    M setup.py
    A tasks/__init__.py
    A tasks/generate.py
    A tasks/release.minor.rst
    A tasks/release.patch.rst
    A tasks/requirements.txt
    A tasks/vendoring.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    A testing/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/python/setup_only.py
    M testing/python/show_fixtures_per_test.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    A testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    A testing/test_modimport.py
    M testing/test_monkeypatch.py
    A testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    A testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into malinoff/fix-2124


  Commit: 6550b9911bd38e3cb01fab0af388530b46619d4b
      https://github.com/pytest-dev/pytest/commit/6550b9911bd38e3cb01fab0af388530b46619d4b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M testing/python/fixture.py

  Log Message:
  -----------
  pytest_fixture_post_finalizer now receives a request argument


  Commit: f074fd9ac6d5e86a8ec240c395b1d031c45988e2
      https://github.com/pytest-dev/pytest/commit/f074fd9ac6d5e86a8ec240c395b1d031c45988e2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M .coveragerc
    M .travis.yml
    M AUTHORS
    M README.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    R _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    A _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    R _pytest/vendored_packages/README.md
    R _pytest/vendored_packages/__init__.py
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/INSTALLER
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/RECORD
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/WHEEL
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/metadata.json
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/top_level.txt
    R _pytest/vendored_packages/pluggy.py
    M _pytest/warnings.py
    M appveyor.yml
    A changelog/1993.bugfix
    A changelog/2236.removal
    A changelog/2267.feature
    A changelog/2491.bugfix
    A changelog/2549.feature
    A changelog/2641.trivial
    A changelog/2642.trivial
    A changelog/2672.removal
    A changelog/2675.removal
    A changelog/2708.feature
    A changelog/2709.bugfix
    A changelog/2719.trivial
    A changelog/2734.trivial
    A changelog/2738.bugfix
    A changelog/2751.bugfix
    A changelog/2767.removal
    A changelog/2767.trivial
    A changelog/2794.feature
    A changelog/2803.removal
    A changelog/2808.feature
    A changelog/2809.bugfix
    A changelog/2812.removal
    A changelog/2824.feature
    A changelog/2845.bugfix
    A changelog/2877.trivial
    A changelog/2879.feature
    A changelog/2910.trivial
    A changelog/502.feature
    M doc/en/contents.rst
    M doc/en/example/multipython.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    A doc/en/logging.rst
    M doc/en/plugins.rst
    M doc/en/skipping.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pytest.py
    M setup.py
    R tasks/vendoring.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    A testing/logging/test_fixture.py
    A testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    A testing/python/test_deprecations.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_parseopt.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features' into malinoff/fix-2124


  Commit: 063335a715bce042e0c9e591ab8ad406488cb5dc
      https://github.com/pytest-dev/pytest/commit/063335a715bce042e0c9e591ab8ad406488cb5dc
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    A changelog/2124.bugfix
    A changelog/2124.feature

  Log Message:
  -----------
  Add changelog entries for #2124


  Commit: bdad345f991cae76896476a1b574269b23085bc3
      https://github.com/pytest-dev/pytest/commit/bdad345f991cae76896476a1b574269b23085bc3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Fix passing request to finish() in FixtureDef


  Commit: 6d3fe0b826c2aacf1eec573ed0fd50eb8774ee77
      https://github.com/pytest-dev/pytest/commit/6d3fe0b826c2aacf1eec573ed0fd50eb8774ee77
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Explicitly clear finalizers list in finalize to ensure cleanup


  Commit: a6f2d2d2c958d743813414e46041adf3e47fb997
      https://github.com/pytest-dev/pytest/commit/a6f2d2d2c958d743813414e46041adf3e47fb997
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Rename FixtureDef.finalizer to FixtureDef.finalizers


  Commit: 685387a43ec504f3b6447dcf389a65fad342d548
      https://github.com/pytest-dev/pytest/commit/685387a43ec504f3b6447dcf389a65fad342d548
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-12 (Sun, 12 Nov 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/runner.py
    A changelog/2124.bugfix
    A changelog/2124.feature
    A changelog/2775.bugfix
    M testing/acceptance_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #2127 from malinoff/fix-2124

Use session.config.hook instead of ihook. Fixes #2124


  Commit: 3b3bf9f53d6c37d1e6e8491384f7dd823927267a
      https://github.com/pytest-dev/pytest/commit/3b3bf9f53d6c37d1e6e8491384f7dd823927267a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1505.doc
    R changelog/1997.doc
    R changelog/2658.doc
    R changelog/2775.bugfix
    R changelog/2819.bugfix
    R changelog/2856.bugfix
    R changelog/2882.bugfix
    R changelog/2893.doc
    R changelog/2903.doc
    R changelog/538.doc
    R changelog/911.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.4.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/skipping.rst
    M setup.py

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


  Commit: 8f9081248105eaa704fa79abb5e544571ab8c9e8
      https://github.com/pytest-dev/pytest/commit/8f9081248105eaa704fa79abb5e544571ab8c9e8
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/2923.feature
    M doc/en/capture.rst
    M testing/test_capture.py

  Log Message:
  -----------
  Add capfdbinary fixture

`capfdbinary` works like `capfd` but produces bytes for `readouterr()`.


  Commit: e87ff07370cab38fbd22fdadf89c82c0d92a1e5f
      https://github.com/pytest-dev/pytest/commit/e87ff07370cab38fbd22fdadf89c82c0d92a1e5f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    A changelog/2922.trivial
    M setup.py

  Log Message:
  -----------
  Prevent pip from installing pytest in unsupported Python versions

Fix #2922


  Commit: 7b3febd3149b3b88d9b6d64831ec70ab9acd9921
      https://github.com/pytest-dev/pytest/commit/7b3febd3149b3b88d9b6d64831ec70ab9acd9921
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1505.doc
    R changelog/1997.doc
    R changelog/2658.doc
    R changelog/2775.bugfix
    R changelog/2819.bugfix
    R changelog/2856.bugfix
    R changelog/2882.bugfix
    R changelog/2893.doc
    R changelog/2903.doc
    R changelog/538.doc
    R changelog/911.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.4.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/skipping.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #2924 from nicoddemus/merge-master-into-features

Merge master into features


  Commit: 1aeb58b5313d38da3e14e584bee952406fa53d3f
      https://github.com/pytest-dev/pytest/commit/1aeb58b5313d38da3e14e584bee952406fa53d3f
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    A changelog/2922.trivial
    M setup.py

  Log Message:
  -----------
  Merge pull request #2928 from nicoddemus/python-requires

Prevent pip from installing pytest in unsupported Python versions


  Commit: c7be83ac47363be6db6dc28e79b7b1d82ad319d9
      https://github.com/pytest-dev/pytest/commit/c7be83ac47363be6db6dc28e79b7b1d82ad319d9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Update pluggy pin to 0.5.*


  Commit: e2c59d3282044e3c90e6ec9a96a61aa64f22a75d
      https://github.com/pytest-dev/pytest/commit/e2c59d3282044e3c90e6ec9a96a61aa64f22a75d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Change pluggy._CallOutcome to pluggy._Result after update to pluggy-0.5


  Commit: 1f08d990d53ad3e22f8688086d0b3bd5554430a9
      https://github.com/pytest-dev/pytest/commit/1f08d990d53ad3e22f8688086d0b3bd5554430a9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/python.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Deprecate metafunc.addcall

Fix #2876


  Commit: c19708b193b9addd705d91e24a9cd4a0554cfabd
      https://github.com/pytest-dev/pytest/commit/c19708b193b9addd705d91e24a9cd4a0554cfabd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    M doc/en/writing_plugins.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #2930 from nicoddemus/pin-pluggy-0.5

Update pluggy pin to 0.5.*


  Commit: 99ba3c9700239787640a310ef975915219ddc85e
      https://github.com/pytest-dev/pytest/commit/99ba3c9700239787640a310ef975915219ddc85e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-15 (Wed, 15 Nov 2017)

  Changed paths:
    A changelog/2876.trivial

  Log Message:
  -----------
  Add CHANGELOG entry for #2876


  Commit: 99a4a93dbcd55af610151668ca5b1b066193d3c0
      https://github.com/pytest-dev/pytest/commit/99a4a93dbcd55af610151668ca5b1b066193d3c0
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-16 (Thu, 16 Nov 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/python.py
    A changelog/2876.trivial
    M testing/deprecated_test.py

  Log Message:
  -----------
  Merge pull request #2932 from nicoddemus/deprecate-add-call

Deprecate metafunc.addcall


  Commit: 6161bcff6e3f07359c94a7be52ad32ecb8822142
      https://github.com/pytest-dev/pytest/commit/6161bcff6e3f07359c94a7be52ad32ecb8822142
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/2923.feature
    M doc/en/capture.rst
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2925 from asottile/capfdbinary

Add capfdbinary fixture


  Commit: 219b758949a473507d46f0105b1853319c971b6c
      https://github.com/pytest-dev/pytest/commit/219b758949a473507d46f0105b1853319c971b6c
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/2934.feature
    M doc/en/capture.rst
    M testing/test_capture.py

  Log Message:
  -----------
  Add capsysbinary fixture

`capsysbinary` works like `capsys` but produces bytes for `readouterr()`.


  Commit: ca1f4bc5370e435226cacf1d287fc4d660c5eb6f
      https://github.com/pytest-dev/pytest/commit/ca1f4bc5370e435226cacf1d287fc4d660c5eb6f
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/2934.feature
    M doc/en/capture.rst
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2935 from asottile/capsysbinary

Add capsysbinary fixture


  Commit: 7a7cb8c8c501c869994a3bcac542aab4f39af0b4
      https://github.com/pytest-dev/pytest/commit/7a7cb8c8c501c869994a3bcac542aab4f39af0b4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Require py>=1.5.0


  Commit: dab889304e78a734b41baa8b88146a8fef83a146
      https://github.com/pytest-dev/pytest/commit/dab889304e78a734b41baa8b88146a8fef83a146
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

  Changed paths:
    M _pytest/terminal.py
    M testing/acceptance_test.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/setup_only.py
    M testing/test_assertion.py
    M testing/test_capture.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Implement progress percentage reporting while running tests

Fix #2657


  Commit: 8b92527d7dbd33ee316dfe1abfba7d7c3dfe0517
      https://github.com/pytest-dev/pytest/commit/8b92527d7dbd33ee316dfe1abfba7d7c3dfe0517
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

  Changed paths:
    M _pytest/pytester.py

  Log Message:
  -----------
  Add re_match_lines and re_match_lines_random to pytester fixture


  Commit: 3441084bd29f044d26637070c555e59f8fedf0b5
      https://github.com/pytest-dev/pytest/commit/3441084bd29f044d26637070c555e59f8fedf0b5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

  Changed paths:
    M _pytest/terminal.py

  Log Message:
  -----------
  Add progress output for verbose mode with xdist


  Commit: 3a5dbabf6047859e2a885cbb2235e948af99aeac
      https://github.com/pytest-dev/pytest/commit/3a5dbabf6047859e2a885cbb2235e948af99aeac
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

  Changed paths:
    M _pytest/terminal.py
    M doc/en/customize.rst
    M testing/test_terminal.py

  Log Message:
  -----------
  Add tests for progress output and docs for ``console_output_style``

Fix #2657


  Commit: 2455f8670ec22c7e36eb91a97a17af9da6218b77
      https://github.com/pytest-dev/pytest/commit/2455f8670ec22c7e36eb91a97a17af9da6218b77
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

  Changed paths:
    A changelog/2657.feature

  Log Message:
  -----------
  Add changelog


  Commit: f05333ab75dbd0b4a519616bbcdf762c9f3d07e6
      https://github.com/pytest-dev/pytest/commit/f05333ab75dbd0b4a519616bbcdf762c9f3d07e6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M _pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Fix rewrite to not write past the edge of the screen


  Commit: 1d26f3730f6223b1834d0e3e07bf10e6c5897046
      https://github.com/pytest-dev/pytest/commit/1d26f3730f6223b1834d0e3e07bf10e6c5897046
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M _pytest/pytester.py

  Log Message:
  -----------
  Fix docstrings in pytester


  Commit: dc574c60ef186969a72d56375eb204fae820312b
      https://github.com/pytest-dev/pytest/commit/dc574c60ef186969a72d56375eb204fae820312b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M testing/test_terminal.py

  Log Message:
  -----------
  Use regex match-count syntax to improve test readability


  Commit: b533c2600a0f0cbc3836a08561c5b06be43c630b
      https://github.com/pytest-dev/pytest/commit/b533c2600a0f0cbc3836a08561c5b06be43c630b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M _pytest/pytester.py
    M _pytest/terminal.py
    A changelog/2657.feature
    M doc/en/customize.rst
    M setup.py
    M testing/acceptance_test.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/setup_only.py
    M testing/test_assertion.py
    M testing/test_capture.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #2858 from nicoddemus/console-progress-2657

Console progress output


  Commit: e0d236c0317f589811863a0db3c29787ded7375e
      https://github.com/pytest-dev/pytest/commit/e0d236c0317f589811863a0db3c29787ded7375e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Remove gendoc normalization for '=' and '_' headers

Using the default for non-atty terminals (80) so the new
progress indicator aligns correctly.


  Commit: 49c0c599b00de083b4ed537dd84882173e39f27b
      https://github.com/pytest-dev/pytest/commit/49c0c599b00de083b4ed537dd84882173e39f27b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Merge pull request #2944 from nicoddemus/regendoc-norm

Remove gendoc normalization for '=' and '_' headers


  Commit: f50ace7c0ae9f7156a25b6a93017257b35715398
      https://github.com/pytest-dev/pytest/commit/f50ace7c0ae9f7156a25b6a93017257b35715398
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py
    M _pytest/mark.py
    R changelog/2836.bug
    A changelog/2939.bugfix
    A changelog/2942.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.5.rst
    M doc/en/backwards-compatibility.rst
    M testing/test_assertion.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into release-3.3.0


  Commit: e97c774f8edd6f92deafaf65571a9149ecebce94
      https://github.com/pytest-dev/pytest/commit/e97c774f8edd6f92deafaf65571a9149ecebce94
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M tasks/__init__.py

  Log Message:
  -----------
  Remove vendoring import from tasks/__init__


  Commit: aa9a02ec4452f87b40c10a2c9235e4b552b68564
      https://github.com/pytest-dev/pytest/commit/aa9a02ec4452f87b40c10a2c9235e4b552b68564
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1993.bugfix
    R changelog/2124.bugfix
    R changelog/2124.feature
    R changelog/2236.removal
    R changelog/2267.feature
    R changelog/2491.bugfix
    R changelog/2549.feature
    R changelog/2641.trivial
    R changelog/2642.trivial
    R changelog/2657.feature
    R changelog/2672.removal
    R changelog/2675.removal
    R changelog/2708.feature
    R changelog/2709.bugfix
    R changelog/2719.trivial
    R changelog/2734.trivial
    R changelog/2738.bugfix
    R changelog/2751.bugfix
    R changelog/2767.removal
    R changelog/2767.trivial
    R changelog/2794.feature
    R changelog/2803.removal
    R changelog/2808.feature
    R changelog/2809.bugfix
    R changelog/2812.removal
    R changelog/2824.feature
    R changelog/2845.bugfix
    R changelog/2876.trivial
    R changelog/2877.trivial
    R changelog/2879.feature
    R changelog/2910.trivial
    R changelog/2922.trivial
    R changelog/2923.feature
    R changelog/2934.feature
    R changelog/2939.bugfix
    R changelog/2942.bugfix
    R changelog/502.feature
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.3.0.rst
    M doc/en/example/parametrize.rst

  Log Message:
  -----------
  Preparing release version 3.3.0


  Commit: 0ddd3e2839ec32690e379b9e2ee6962b027ab52c
      https://github.com/pytest-dev/pytest/commit/0ddd3e2839ec32690e379b9e2ee6962b027ab52c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix linting in CHANGELOG


  Commit: 05cfdcc8cba7232724bc70d30337e87092de2818
      https://github.com/pytest-dev/pytest/commit/05cfdcc8cba7232724bc70d30337e87092de2818
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/helpconfig.py
    M _pytest/pastebin.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M testing/test_mark.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Revert making TerminalWriter public in TerminalReporter plugin

We eventually want to replace py.io.TerminalWriter (exposed as
"_tw" in TerminalReporter) by something else, so deprecating access
to "_tw" and making it public as "writer" is contrary to that.


  Commit: 95de11a44e9dc1c59263455120814f25072cea2e
      https://github.com/pytest-dev/pytest/commit/95de11a44e9dc1c59263455120814f25072cea2e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-23 (Thu, 23 Nov 2017)

  Changed paths:
    M _pytest/config.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Block pytest-catchlog and issue a warning

Trying to install pytest-3.3 and pytest-catchlog will result in an
option conflicts because both declare the same options.


  Commit: 0de1a65644ba5c4d3a1ac7d522bc0ae5666f0a49
      https://github.com/pytest-dev/pytest/commit/0de1a65644ba5c4d3a1ac7d522bc0ae5666f0a49
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-24 (Fri, 24 Nov 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Update pluggy pin to pluggy>=0.5,<0.7 after pluggy-0.6 release


  Commit: 6eeacaba3e77c69efde876939376f4d47c8f7514
      https://github.com/pytest-dev/pytest/commit/6eeacaba3e77c69efde876939376f4d47c8f7514
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-26 (Sun, 26 Nov 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix typos in CHANGELOG


  Commit: 6cdd85122705393cfcfe08570bae581bf9f2d157
      https://github.com/pytest-dev/pytest/commit/6cdd85122705393cfcfe08570bae581bf9f2d157
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/backwards-compatibility.rst

  Log Message:
  -----------
  CHANGELOG and docs changes requested during review


  Commit: 67ad0fa3640b9575b489532a6cc042fcb4e32673
      https://github.com/pytest-dev/pytest/commit/67ad0fa3640b9575b489532a6cc042fcb4e32673
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/helpconfig.py
    M _pytest/mark.py
    M _pytest/pastebin.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    R changelog/1993.bugfix
    R changelog/2124.bugfix
    R changelog/2124.feature
    R changelog/2236.removal
    R changelog/2267.feature
    R changelog/2491.bugfix
    R changelog/2549.feature
    R changelog/2641.trivial
    R changelog/2642.trivial
    R changelog/2657.feature
    R changelog/2672.removal
    R changelog/2675.removal
    R changelog/2708.feature
    R changelog/2709.bugfix
    R changelog/2719.trivial
    R changelog/2734.trivial
    R changelog/2738.bugfix
    R changelog/2751.bugfix
    R changelog/2767.removal
    R changelog/2767.trivial
    R changelog/2794.feature
    R changelog/2803.removal
    R changelog/2808.feature
    R changelog/2809.bugfix
    R changelog/2812.removal
    R changelog/2824.feature
    R changelog/2836.bug
    R changelog/2845.bugfix
    R changelog/2876.trivial
    R changelog/2877.trivial
    R changelog/2879.feature
    R changelog/2910.trivial
    R changelog/2922.trivial
    R changelog/2923.feature
    R changelog/2934.feature
    R changelog/502.feature
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.5.rst
    A doc/en/announce/release-3.3.0.rst
    M doc/en/backwards-compatibility.rst
    M doc/en/example/parametrize.rst
    M setup.py
    M tasks/__init__.py
    M testing/deprecated_test.py
    M testing/test_assertion.py
    M testing/test_mark.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #2945 from nicoddemus/release-3.3.0

Release 3.3.0


  Commit: 4678cbeb913385f00cc21b79662459a8c9fafa87
      https://github.com/pytest-dev/pytest/commit/4678cbeb913385f00cc21b79662459a8c9fafa87
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M .coveragerc
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M README.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    R _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    A _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    R _pytest/vendored_packages/README.md
    R _pytest/vendored_packages/__init__.py
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/INSTALLER
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/RECORD
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/WHEEL
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/metadata.json
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/top_level.txt
    R _pytest/vendored_packages/pluggy.py
    M _pytest/warnings.py
    M appveyor.yml
    R changelog/2939.bugfix
    R changelog/2942.bugfix
    M doc/en/Makefile
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.3.0.rst
    M doc/en/assert.rst
    M doc/en/backwards-compatibility.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    A doc/en/logging.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pytest.py
    M setup.py
    M tasks/__init__.py
    R tasks/vendoring.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    A testing/logging/test_fixture.py
    A testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/setup_only.py
    A testing/python/test_deprecations.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_mark.py
    M testing/test_parseopt.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features'


Compare: https://github.com/pytest-dev/pytest/compare/c58715371ceb...4678cbeb9133