From nicoddemus at gmail.com  Thu Jun  1 06:55:44 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 01 Jun 2017 03:55:44 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] ac9c8f: Failing test for issue
 #2121
Message-ID: <592ff2b0eab2e_27a83fc1f220fc307759b@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: ac9c8fcdab8fcaa932100fed9dd67424609e310b
      https://github.com/pytest-dev/pytest/commit/ac9c8fcdab8fcaa932100fed9dd67424609e310b
  Author: Andreas Pelme <andreas at pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Failing test for issue #2121


  Commit: 021e843427c6f5e79ee4a5b47ef3015599292822
      https://github.com/pytest-dev/pytest/commit/021e843427c6f5e79ee4a5b47ef3015599292822
  Author: Andreas Pelme <andreas at pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py

  Log Message:
  -----------
  Fixed #2121 Use `py.path`s fnmatch. This fixes an issue where
python_files handled properly when rewriting assertions.


  Commit: 5de203195ce1a704f33a8d5c54dbe8996fe98b1e
      https://github.com/pytest-dev/pytest/commit/5de203195ce1a704f33a8d5c54dbe8996fe98b1e
  Author: Andreas Pelme <andreas at pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    A changelog/2121.bugfix

  Log Message:
  -----------
  Add changelog for #2121


  Commit: c98ad2a0a0c8c1de278255cfec534dd928be2e85
      https://github.com/pytest-dev/pytest/commit/c98ad2a0a0c8c1de278255cfec534dd928be2e85
  Author: Andreas Pelme <andreas at pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Install py 1.4.33 that contains the fnmatch py.std import fix.


  Commit: bcbad5b1afde40b81372be51dd37272c2a726fec
      https://github.com/pytest-dev/pytest/commit/bcbad5b1afde40b81372be51dd37272c2a726fec
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py
    A changelog/2121.bugfix
    M setup.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Merge pull request #2140 from pelme/issue2121

Handle python_files correctly in assertion rewrite


Compare: https://github.com/pytest-dev/pytest/compare/5d785e415ecd...bcbad5b1afde

From nicoddemus at gmail.com  Sat Jun  3 14:11:39 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 03 Jun 2017 11:11:39 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 05796b: A workaround for Python
 3.6 WindowsConsoleIO break...
Message-ID: <5932fbdb1bbc0_455b3feabe6c1c3468117@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 05796be21a4421e5f76893afd34140706a71b42b
      https://github.com/pytest-dev/pytest/commit/05796be21a4421e5f76893afd34140706a71b42b
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture

Python 3.6 implemented unicode console handling for Windows. This works
by reading/writing to the raw console handle using
``{Read,Write}ConsoleW``.

The problem is that we are going to ``dup2`` over the stdio file
descriptors when doing ``FDCapture`` and this will ``CloseHandle`` the
handles used by Python to write to the console. Though there is still some
weirdness and the console handle seems to only be closed randomly and not
on the first call to ``CloseHandle``, or maybe it gets reopened with the
same handle value when we suspend capturing.

The workaround in this case will reopen stdio with a different fd which
also means a different handle by replicating the logic in
"Py_lifecycle.c:initstdio/create_stdio".

See https://github.com/pytest-dev/py/issues/103


  Commit: 59b3693988fcc19a9f5d7aa5c31cc7de28fcf6b7
      https://github.com/pytest-dev/pytest/commit/59b3693988fcc19a9f5d7aa5c31cc7de28fcf6b7
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  Fixed wrong if in the WindowsConsoleIO workaround


  Commit: 01ed6dfc3bd29b2d76d3e9ed079f2f0f648c0179
      https://github.com/pytest-dev/pytest/commit/01ed6dfc3bd29b2d76d3e9ed079f2f0f648c0179
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    A changelog/103.bugfix

  Log Message:
  -----------
  Added a changelog entry for the WindowsConsoleIO workaround


  Commit: 1863b7c7b263b3161c7ac79854db37ab67919529
      https://github.com/pytest-dev/pytest/commit/1863b7c7b263b3161c7ac79854db37ab67919529
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-03 (Sat, 03 Jun 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/103.bugfix

  Log Message:
  -----------
  Merge pull request #2462 from segevfiner/py36-windowsconsoleio-workaround

[WIP] A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture


Compare: https://github.com/pytest-dev/pytest/compare/f826b23f588f...1863b7c7b263

From nicoddemus at gmail.com  Sat Jun  3 16:35:27 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 03 Jun 2017 13:35:27 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 5ee979: Fix CHANGELOG issue id
Message-ID: <59331d8f863_10623fb7b3f13c2c9429e@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 5ee9793c99be392209a4febc9456a2782843a3a7
      https://github.com/pytest-dev/pytest/commit/5ee9793c99be392209a4febc9456a2782843a3a7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-03 (Sat, 03 Jun 2017)

  Changed paths:
    R changelog/103.bugfix
    A changelog/2467.bugfix

  Log Message:
  -----------
  Fix CHANGELOG issue id

Fix #2467



From nicoddemus at gmail.com  Tue Jun  6 08:52:57 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 06 Jun 2017 05:52:57 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 54a90e: docs: Create links for
 objects to show the api
Message-ID: <5936a5a942774_5e8e3f831b3adc248773d@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 54a90e955588a9850e814c8a514179ab7be0b6ae
      https://github.com/pytest-dev/pytest/commit/54a90e955588a9850e814c8a514179ab7be0b6ae
  Author: ApaDoctor <apadoctor at gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

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

  Log Message:
  -----------
  docs: Create links for objects to show the api


  Commit: 80944e32ad44550799ef5c443aa5b115b8e10c25
      https://github.com/pytest-dev/pytest/commit/80944e32ad44550799ef5c443aa5b115b8e10c25
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    A changelog/2331.doc

  Log Message:
  -----------
  Add CHANGELOG entry


  Commit: 57e2ced96933e15a4428eb5a74143d470cb94084
      https://github.com/pytest-dev/pytest/commit/57e2ced96933e15a4428eb5a74143d470cb94084
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/hookspec.py
    M _pytest/vendored_packages/pluggy.py
    A changelog/2331.doc
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #2473 from ApaDoctor/docs-fixes

docs: Create links for objects to show the api


Compare: https://github.com/pytest-dev/pytest/compare/5ee9793c99be...57e2ced96933

From nicoddemus at gmail.com  Tue Jun  6 20:57:48 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 06 Jun 2017 17:57:48 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] ac9c8f: Failing test for issue
 #2121
Message-ID: <59374f8c1cc02_143143f8ec4a57c28822c3@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: ac9c8fcdab8fcaa932100fed9dd67424609e310b
      https://github.com/pytest-dev/pytest/commit/ac9c8fcdab8fcaa932100fed9dd67424609e310b
  Author: Andreas Pelme <andreas at pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Failing test for issue #2121


  Commit: 021e843427c6f5e79ee4a5b47ef3015599292822
      https://github.com/pytest-dev/pytest/commit/021e843427c6f5e79ee4a5b47ef3015599292822
  Author: Andreas Pelme <andreas at pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py

  Log Message:
  -----------
  Fixed #2121 Use `py.path`s fnmatch. This fixes an issue where
python_files handled properly when rewriting assertions.


  Commit: 5de203195ce1a704f33a8d5c54dbe8996fe98b1e
      https://github.com/pytest-dev/pytest/commit/5de203195ce1a704f33a8d5c54dbe8996fe98b1e
  Author: Andreas Pelme <andreas at pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    A changelog/2121.bugfix

  Log Message:
  -----------
  Add changelog for #2121


  Commit: c98ad2a0a0c8c1de278255cfec534dd928be2e85
      https://github.com/pytest-dev/pytest/commit/c98ad2a0a0c8c1de278255cfec534dd928be2e85
  Author: Andreas Pelme <andreas at pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Install py 1.4.33 that contains the fnmatch py.std import fix.


  Commit: 409d2f1d54d7f17e33b49f6a3dce314931557550
      https://github.com/pytest-dev/pytest/commit/409d2f1d54d7f17e33b49f6a3dce314931557550
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    A changelog/810.doc
    M doc/en/skipping.rst

  Log Message:
  -----------
  Make it clear that pytest.xfail stops the test

Also did a general review of the document to improve the flow

Fix #810


  Commit: 5d785e415ecd35a3e651d7b0906cdca55af4fb1c
      https://github.com/pytest-dev/pytest/commit/5d785e415ecd35a3e651d7b0906cdca55af4fb1c
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    A changelog/810.doc
    M doc/en/skipping.rst

  Log Message:
  -----------
  Merge pull request #2454 from nicoddemus/xfail-docs

Make it clear that pytest.xfail stops the test


  Commit: bcbad5b1afde40b81372be51dd37272c2a726fec
      https://github.com/pytest-dev/pytest/commit/bcbad5b1afde40b81372be51dd37272c2a726fec
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py
    A changelog/2121.bugfix
    M setup.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Merge pull request #2140 from pelme/issue2121

Handle python_files correctly in assertion rewrite


  Commit: f74f14f038285b030ce34f3b0c8f9c59eea08e2d
      https://github.com/pytest-dev/pytest/commit/f74f14f038285b030ce34f3b0c8f9c59eea08e2d
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M AUTHORS
    M _pytest/config.py
    M _pytest/helpconfig.py
    A changelog/1999.bugfix
    M testing/test_conftest.py

  Log Message:
  -----------
  Fix --help with required options

This works by adding an argparse Action that will raise an exception in
order to skip the rest of the argument parsing. This prevents argparse
from quitting due to missing required arguments, similar to the way that
the builtin argparse --help option is implemented by raising SystemExit.

Fixes: #1999


  Commit: 9abff7f72f37b15df74a883b8cff41e9c1db5989
      https://github.com/pytest-dev/pytest/commit/9abff7f72f37b15df74a883b8cff41e9c1db5989
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M _pytest/helpconfig.py

  Log Message:
  -----------
  Add a docstring to HelpAction


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

  Changed paths:
    M AUTHORS
    M _pytest/config.py
    M _pytest/helpconfig.py
    A changelog/1999.bugfix
    M testing/test_conftest.py

  Log Message:
  -----------
  Merge pull request #2458 from segevfiner/fix-required-options-help

Fix --help with required options


  Commit: 05796be21a4421e5f76893afd34140706a71b42b
      https://github.com/pytest-dev/pytest/commit/05796be21a4421e5f76893afd34140706a71b42b
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture

Python 3.6 implemented unicode console handling for Windows. This works
by reading/writing to the raw console handle using
``{Read,Write}ConsoleW``.

The problem is that we are going to ``dup2`` over the stdio file
descriptors when doing ``FDCapture`` and this will ``CloseHandle`` the
handles used by Python to write to the console. Though there is still some
weirdness and the console handle seems to only be closed randomly and not
on the first call to ``CloseHandle``, or maybe it gets reopened with the
same handle value when we suspend capturing.

The workaround in this case will reopen stdio with a different fd which
also means a different handle by replicating the logic in
"Py_lifecycle.c:initstdio/create_stdio".

See https://github.com/pytest-dev/py/issues/103


  Commit: 59b3693988fcc19a9f5d7aa5c31cc7de28fcf6b7
      https://github.com/pytest-dev/pytest/commit/59b3693988fcc19a9f5d7aa5c31cc7de28fcf6b7
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  Fixed wrong if in the WindowsConsoleIO workaround


  Commit: 01ed6dfc3bd29b2d76d3e9ed079f2f0f648c0179
      https://github.com/pytest-dev/pytest/commit/01ed6dfc3bd29b2d76d3e9ed079f2f0f648c0179
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    A changelog/103.bugfix

  Log Message:
  -----------
  Added a changelog entry for the WindowsConsoleIO workaround


  Commit: 1863b7c7b263b3161c7ac79854db37ab67919529
      https://github.com/pytest-dev/pytest/commit/1863b7c7b263b3161c7ac79854db37ab67919529
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-03 (Sat, 03 Jun 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/103.bugfix

  Log Message:
  -----------
  Merge pull request #2462 from segevfiner/py36-windowsconsoleio-workaround

[WIP] A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture


  Commit: 5ee9793c99be392209a4febc9456a2782843a3a7
      https://github.com/pytest-dev/pytest/commit/5ee9793c99be392209a4febc9456a2782843a3a7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-03 (Sat, 03 Jun 2017)

  Changed paths:
    R changelog/103.bugfix
    A changelog/2467.bugfix

  Log Message:
  -----------
  Fix CHANGELOG issue id

Fix #2467


  Commit: 54a90e955588a9850e814c8a514179ab7be0b6ae
      https://github.com/pytest-dev/pytest/commit/54a90e955588a9850e814c8a514179ab7be0b6ae
  Author: ApaDoctor <apadoctor at gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

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

  Log Message:
  -----------
  docs: Create links for objects to show the api


  Commit: 80944e32ad44550799ef5c443aa5b115b8e10c25
      https://github.com/pytest-dev/pytest/commit/80944e32ad44550799ef5c443aa5b115b8e10c25
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    A changelog/2331.doc

  Log Message:
  -----------
  Add CHANGELOG entry


  Commit: 57e2ced96933e15a4428eb5a74143d470cb94084
      https://github.com/pytest-dev/pytest/commit/57e2ced96933e15a4428eb5a74143d470cb94084
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/hookspec.py
    M _pytest/vendored_packages/pluggy.py
    A changelog/2331.doc
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #2473 from ApaDoctor/docs-fixes

docs: Create links for objects to show the api


  Commit: c67bf9d82aa7de5576a34337a16a1f1447085fdd
      https://github.com/pytest-dev/pytest/commit/c67bf9d82aa7de5576a34337a16a1f1447085fdd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M AUTHORS
    M _pytest/assertion/rewrite.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/vendored_packages/pluggy.py
    A changelog/1999.bugfix
    A changelog/2121.bugfix
    A changelog/2331.doc
    A changelog/2467.bugfix
    A changelog/810.doc
    M doc/en/skipping.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M testing/test_assertrewrite.py
    M testing/test_conftest.py

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


Compare: https://github.com/pytest-dev/pytest/compare/9adf513c4b28...c67bf9d82aa7

From nicoddemus at gmail.com  Fri Jun  9 07:17:03 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 09 Jun 2017 04:17:03 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7cbf26: Preparing release
 version 3.1.2
Message-ID: <593a83afebcfb_39e93f97a097fc30916f9@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/tags/3.1.2
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7cbf265bb5b279d8c39ba6dd85d4ef96aacd0163
      https://github.com/pytest-dev/pytest/commit/7cbf265bb5b279d8c39ba6dd85d4ef96aacd0163
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1999.bugfix
    R changelog/2121.bugfix
    R changelog/2331.doc
    R changelog/2459.bugfix
    R changelog/2463.bugfix
    R changelog/2467.bugfix
    R changelog/810.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.2.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Preparing release version 3.1.2



From nicoddemus at gmail.com  Fri Jun  9 07:18:44 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 09 Jun 2017 04:18:44 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7cbf26: Preparing release
 version 3.1.2
Message-ID: <593a841463cf0_1404b3ff18f5d3c3c143344@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7cbf265bb5b279d8c39ba6dd85d4ef96aacd0163
      https://github.com/pytest-dev/pytest/commit/7cbf265bb5b279d8c39ba6dd85d4ef96aacd0163
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1999.bugfix
    R changelog/2121.bugfix
    R changelog/2331.doc
    R changelog/2459.bugfix
    R changelog/2463.bugfix
    R changelog/2467.bugfix
    R changelog/810.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.2.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Preparing release version 3.1.2


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/1999.bugfix
    R changelog/2121.bugfix
    R changelog/2331.doc
    R changelog/2459.bugfix
    R changelog/2463.bugfix
    R changelog/2467.bugfix
    R changelog/810.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.2.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Merge pull request #2483 from nicoddemus/release-3.1.2

Preparing release version 3.1.2


Compare: https://github.com/pytest-dev/pytest/compare/917b9a835277...b2d7c26d80ae

From nicoddemus at gmail.com  Fri Jun  9 17:34:18 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 09 Jun 2017 14:34:18 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 9d41ea: Issue UnicodeWarning
 only for non-ascii unicode
Message-ID: <593b145a4d696_6e5f3fbfa7df1c3089273@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 9d41eaedbf098ad62f7b41de889230a82260b523
      https://github.com/pytest-dev/pytest/commit/9d41eaedbf098ad62f7b41de889230a82260b523
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-05 (Mon, 05 Jun 2017)

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

  Log Message:
  -----------
  Issue UnicodeWarning only for non-ascii unicode

Fix #2463


  Commit: d2db6626cf527287434805bfb15118baac9b6416
      https://github.com/pytest-dev/pytest/commit/d2db6626cf527287434805bfb15118baac9b6416
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

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

  Log Message:
  -----------
  Merge pull request #2466 from nicoddemus/remove-unicode-warning

Remove UnicodeWarning from pytest warnings


  Commit: 2127a2378ad92bf0483f7659524027ab3c49ab15
      https://github.com/pytest-dev/pytest/commit/2127a2378ad92bf0483f7659524027ab3c49ab15
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

  Changed paths:
    M _pytest/_code/code.py
    A changelog/2459.bugfix
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Fix internal error with recursive tracebacks with that frames contain objects that can't be compared

Fix #2459


  Commit: 917b9a835277ae54bfa296a030a69a0e2c6bc19e
      https://github.com/pytest-dev/pytest/commit/917b9a835277ae54bfa296a030a69a0e2c6bc19e
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

  Changed paths:
    M _pytest/_code/code.py
    A changelog/2459.bugfix
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Merge pull request #2476 from nicoddemus/fix-2459-numpy-comparison

Fix internal error when a recursion error occurs and frames contain objects that can't be compared


  Commit: 7cbf265bb5b279d8c39ba6dd85d4ef96aacd0163
      https://github.com/pytest-dev/pytest/commit/7cbf265bb5b279d8c39ba6dd85d4ef96aacd0163
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1999.bugfix
    R changelog/2121.bugfix
    R changelog/2331.doc
    R changelog/2459.bugfix
    R changelog/2463.bugfix
    R changelog/2467.bugfix
    R changelog/810.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.2.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Preparing release version 3.1.2


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/1999.bugfix
    R changelog/2121.bugfix
    R changelog/2331.doc
    R changelog/2459.bugfix
    R changelog/2463.bugfix
    R changelog/2467.bugfix
    R changelog/810.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.2.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Merge pull request #2483 from nicoddemus/release-3.1.2

Preparing release version 3.1.2


  Commit: 467c5263071ba9cc24ec9b37214b007c21b2c761
      https://github.com/pytest-dev/pytest/commit/467c5263071ba9cc24ec9b37214b007c21b2c761
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-09 (Fri, 09 Jun 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M _pytest/warnings.py
    R changelog/1999.bugfix
    R changelog/2121.bugfix
    R changelog/2331.doc
    R changelog/2467.bugfix
    R changelog/810.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.2.rst
    M doc/en/skipping.rst
    M testing/code/test_excinfo.py
    M testing/test_warnings.py

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


Compare: https://github.com/pytest-dev/pytest/compare/c67bf9d82aa7...467c5263071b

From nicoddemus at gmail.com  Sat Jun 10 11:32:07 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 10 Jun 2017 08:32:07 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f0541b: Improve CHANGELOG
 formatting a bit
Message-ID: <593c10f7b8d73_ea9f3fba21665c2c626de@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: f0541b685bb7d27ea87eb8fd8bddbd0280a9b48d
      https://github.com/pytest-dev/pytest/commit/f0541b685bb7d27ea87eb8fd8bddbd0280a9b48d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-10 (Sat, 10 Jun 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Improve CHANGELOG formatting a bit



From nicoddemus at gmail.com  Sun Jun 11 10:25:37 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 11 Jun 2017 07:25:37 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 36251e: move approx to own file
Message-ID: <593d52e1335b6_6a113f8ea746bc3c18289@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 36251e0db473d2d42d602ee759a80eb6f1d80dfc
      https://github.com/pytest-dev/pytest/commit/36251e0db473d2d42d602ee759a80eb6f1d80dfc
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-11 (Sun, 11 Jun 2017)

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

  Log Message:
  -----------
  move approx to own file


  Commit: 6be57a3711465c70b3cb4e5ddf5ee373608f6fbf
      https://github.com/pytest-dev/pytest/commit/6be57a3711465c70b3cb4e5ddf5ee373608f6fbf
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-11 (Sun, 11 Jun 2017)

  Changed paths:
    M _pytest/python.py
    A _pytest/python_api.py
    M pytest.py

  Log Message:
  -----------
  move python api helpers out of the python module

this separates exposed normal api from collection elements


  Commit: f8b2277413ad3b61d5c86039a3c8a0fa92480bc4
      https://github.com/pytest-dev/pytest/commit/f8b2277413ad3b61d5c86039a3c8a0fa92480bc4
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-11 (Sun, 11 Jun 2017)

  Changed paths:
    A changelog/2489.trivial

  Log Message:
  -----------
  changelog fragment


  Commit: 9bd890771673a97e65649bc06af93550b3950052
      https://github.com/pytest-dev/pytest/commit/9bd890771673a97e65649bc06af93550b3950052
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-11 (Sun, 11 Jun 2017)

  Changed paths:
    M _pytest/python.py
    A _pytest/python_api.py
    A changelog/2489.trivial
    M pytest.py

  Log Message:
  -----------
  Merge pull request #2489 from RonnyPfannschmidt/move-python-api

Move python api code to own file


Compare: https://github.com/pytest-dev/pytest/compare/467c5263071b...9bd890771673

From nicoddemus at gmail.com  Tue Jun 13 22:03:05 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 13 Jun 2017 19:03:05 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 5a856b: handle and reraise
 subrequest finalizer exceptions
Message-ID: <594099596549e_35ef3fc6ad1b3c4076439@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 5a856b6e29172cb9f38e7e8c5413e13684307ec0
      https://github.com/pytest-dev/pytest/commit/5a856b6e29172cb9f38e7e8c5413e13684307ec0
  Author: Ryan Fitzpatrick <rfitzpat at redhat.com>
  Date:   2017-06-12 (Mon, 12 Jun 2017)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2440.bugfix
    M testing/python/fixture.py

  Log Message:
  -----------
  handle and reraise subrequest finalizer exceptions


  Commit: 4e4ebbef5a30c28085e0d4a01676f21ed15263f4
      https://github.com/pytest-dev/pytest/commit/4e4ebbef5a30c28085e0d4a01676f21ed15263f4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

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

  Log Message:
  -----------
  Improve test to ensure the expected function is re-raised


  Commit: 336cf3e1f5495dc0fb3c7180d7a41b778e0394b0
      https://github.com/pytest-dev/pytest/commit/336cf3e1f5495dc0fb3c7180d7a41b778e0394b0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2440.bugfix
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #2496 from rmfitzpatrick/pytest2440_handle_subrequest_finalizer_exceptions

Handle exceptions in subrequest finalizers


Compare: https://github.com/pytest-dev/pytest/compare/0908f40e43fb...336cf3e1f549

From nicoddemus at gmail.com  Tue Jun 13 22:12:34 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 13 Jun 2017 19:12:34 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 97367c: Remove obsolete comment
 from rewrite.py
Message-ID: <59409b925652f_7a443f93a883dc389996d@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 97367cf773ec185d9dca6bb87873c35901ce4bc0
      https://github.com/pytest-dev/pytest/commit/97367cf773ec185d9dca6bb87873c35901ce4bc0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py

  Log Message:
  -----------
  Remove obsolete comment from rewrite.py

This was made obsolete by 021e843427c6f5e79ee4a5b47ef3015599292822



From nicoddemus at gmail.com  Thu Jun 22 09:53:31 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 22 Jun 2017 06:53:31 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 620ba5: deprecated_call context
 manager captures warnings ...
Message-ID: <594bcbdb4e0fc_1a43f8cfd5e9c2c120853@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 620ba5971f7c44b36f1c6b62d70c89914c6a071e
      https://github.com/pytest-dev/pytest/commit/620ba5971f7c44b36f1c6b62d70c89914c6a071e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M _pytest/recwarn.py
    A changelog/2469.bugfix
    M testing/test_recwarn.py

  Log Message:
  -----------
  deprecated_call context manager captures warnings already raised

Fix #2469


  Commit: ff8dbd0ad8d50cf1ff9c07e0c6e04fe26d58cc9a
      https://github.com/pytest-dev/pytest/commit/ff8dbd0ad8d50cf1ff9c07e0c6e04fe26d58cc9a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M _pytest/recwarn.py

  Log Message:
  -----------
  Add tracebackhide to function call form of deprecated_call


  Commit: 22b7701431a9f968a1f82581a2e58adfb250cd39
      https://github.com/pytest-dev/pytest/commit/22b7701431a9f968a1f82581a2e58adfb250cd39
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M _pytest/recwarn.py
    A changelog/2469.bugfix
    M testing/test_recwarn.py

  Log Message:
  -----------
  Merge pull request #2480 from nicoddemus/issue-2469-deprecated-call-ctx

deprecated_call context manager captures warnings already raised


Compare: https://github.com/pytest-dev/pytest/compare/5e832017d5bb...22b7701431a9

From nicoddemus at gmail.com  Fri Jun 23 09:15:42 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 23 Jun 2017 06:15:42 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] bdec2c: move marker transfer to
 _pytest.mark
Message-ID: <594d147e2be7_2a173fdbdad11c301516ec@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: bdec2c8f9e1b39914b5e9fbc6d73adc29cf88f3a
      https://github.com/pytest-dev/pytest/commit/bdec2c8f9e1b39914b5e9fbc6d73adc29cf88f3a
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

  Log Message:
  -----------
  move marker transfer to _pytest.mark


  Commit: 64ae6ae25dba3169529ea7ed56d65b749314599b
      https://github.com/pytest-dev/pytest/commit/64ae6ae25dba3169529ea7ed56d65b749314599b
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M _pytest/mark.py

  Log Message:
  -----------
  extract application of marks and legacy markinfos


  Commit: 19b12b22e7e5c23bb9a9a0e74ca36d441481973f
      https://github.com/pytest-dev/pytest/commit/19b12b22e7e5c23bb9a9a0e74ca36d441481973f
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M _pytest/mark.py
    M testing/test_mark.py

  Log Message:
  -----------
  store pristine marks on function.pytestmark

fixes #2516


  Commit: c791895c93308699458cdf73fd647b92ed1779c0
      https://github.com/pytest-dev/pytest/commit/c791895c93308699458cdf73fd647b92ed1779c0
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    A changelog/2516.feature

  Log Message:
  -----------
  changelog addition


  Commit: 1d926011a4d684c4bd505a3e7ecc444f43cdc446
      https://github.com/pytest-dev/pytest/commit/1d926011a4d684c4bd505a3e7ecc444f43cdc446
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

  Log Message:
  -----------
  add deprecation warnings for using markinfo attributes


  Commit: 23d016f1149812babbaf42da3f6c21acd70597c2
      https://github.com/pytest-dev/pytest/commit/23d016f1149812babbaf42da3f6c21acd70597c2
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  -----------
  address review comments

* enhance api for fetching marks off an object
* rename functions for storing marks
* enhance deprecation message for MarkInfo


  Commit: b0b6c355f7ab17fbaccfea6f70efe03866ed5940
      https://github.com/pytest-dev/pytest/commit/b0b6c355f7ab17fbaccfea6f70efe03866ed5940
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M changelog/2516.feature

  Log Message:
  -----------
  fixup changelog, thanks Bruno


  Commit: 8d5f2872d3aa7549299a7bfe7dfca1bd8f022bf5
      https://github.com/pytest-dev/pytest/commit/8d5f2872d3aa7549299a7bfe7dfca1bd8f022bf5
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  minor code style fix


  Commit: bab18e10eb1672f1bd320be4a777cc8b0cc4a273
      https://github.com/pytest-dev/pytest/commit/bab18e10eb1672f1bd320be4a777cc8b0cc4a273
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/2516.feature
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #2517 from RonnyPfannschmidt/mark-expose-nontransfered

Mark expose nontransfered marks via pytestmark property


Compare: https://github.com/pytest-dev/pytest/compare/9bd890771673...bab18e10eb16

From nicoddemus at gmail.com  Fri Jun 23 15:55:34 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 23 Jun 2017 12:55:34 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b3bf7f: add tasks for updating
 vendored libs
Message-ID: <594d723673ec3_3bf73ff9529a9c2489782@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: b3bf7fc4960ec1aec54f09de8713bfba777b1683
      https://github.com/pytest-dev/pytest/commit/b3bf7fc4960ec1aec54f09de8713bfba777b1683
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    A changelog/2474.trivial
    M tasks/__init__.py
    A tasks/vendoring.py

  Log Message:
  -----------
  add tasks for updating vendored libs


  Commit: 6e2b5a3f1b023d2c9e367dafa1ef14a6dcd70d89
      https://github.com/pytest-dev/pytest/commit/6e2b5a3f1b023d2c9e367dafa1ef14a6dcd70d89
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    A changelog/2474.trivial
    M tasks/__init__.py
    A tasks/vendoring.py

  Log Message:
  -----------
  Merge pull request #2523 from RonnyPfannschmidt/vendoring-tasks

Vendoring tasks


Compare: https://github.com/pytest-dev/pytest/compare/bb659fcffe03...6e2b5a3f1b02

From nicoddemus at gmail.com  Fri Jun 23 23:41:45 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 23 Jun 2017 20:41:45 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 0d0b01: introduce deprecation
 warnings for legacy paramete...
Message-ID: <594ddf79c2d09_2c203fc0872f5c38220d2@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0d0b01bded8ab758118d9be1ea64db493045dcf4
      https://github.com/pytest-dev/pytest/commit/0d0b01bded8ab758118d9be1ea64db493045dcf4
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/mark.py
    A changelog/2427.removal

  Log Message:
  -----------
  introduce deprecation warnings for legacy parametersets, fixes #2427


  Commit: 1906f8c565cf214ff81c679db4c35fdc7a423f4a
      https://github.com/pytest-dev/pytest/commit/1906f8c565cf214ff81c679db4c35fdc7a423f4a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/mark.py
    A changelog/2427.removal

  Log Message:
  -----------
  Merge pull request #2524 from RonnyPfannschmidt/fix-2427

introduce deprecation warnings for legacy parametersets, fixes #2427


Compare: https://github.com/pytest-dev/pytest/compare/bab18e10eb16...1906f8c565cf