From nicoddemus at gmail.com  Wed Aug  1 06:09:21 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 01 Aug 2018 03:09:21 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] fcdc1d: fix #3745 - display
 absolute cache_dir if necessar...
Message-ID: <5b6186d1cbdb0_195c2aca45c80f8444789@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: fcdc1d867e25b212ca7681b70cbf785b2645ad06
      https://github.com/pytest-dev/pytest/commit/fcdc1d867e25b212ca7681b70cbf785b2645ad06
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3745.bugfix
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  fix #3745 - display absolute cache_dir if necessary


  Commit: 4588130c1e3eb23ed1e96e49110a80f51a9b3d92
      https://github.com/pytest-dev/pytest/commit/4588130c1e3eb23ed1e96e49110a80f51a9b3d92
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3745.bugfix
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #3756 from RonnyPfannschmidt/fix-3745

fix #3745 - display absolute cache_dir if necessary


Compare: https://github.com/pytest-dev/pytest/compare/253419316ce0...4588130c1e3e
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Wed Aug  1 08:44:32 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 01 Aug 2018 05:44:32 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 57a8f2: fix #3757 by pinning to
 pathlib2 that supports __f...
Message-ID: <5b61ab3084e4d_59442affd7608f7c74065@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 57a8f208bc4369ebfc8cb7ac1445bed50108bdbf
      https://github.com/pytest-dev/pytest/commit/57a8f208bc4369ebfc8cb7ac1445bed50108bdbf
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3757.bugfix.rst
    M setup.py

  Log Message:
  -----------
  fix #3757 by pinning to pathlib2 that supports __fspath__


  Commit: f25683354e95ea13801e4984873bbf3352b97ff1
      https://github.com/pytest-dev/pytest/commit/f25683354e95ea13801e4984873bbf3352b97ff1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3757.bugfix.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3760 from RonnyPfannschmidt/fix-3757-pin-pathlib

fix #3757 by pinning to pathlib2 that supports __fspath__


Compare: https://github.com/pytest-dev/pytest/compare/4588130c1e3e...f25683354e95
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Wed Aug  1 22:40:24 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 01 Aug 2018 19:40:24 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7d8688: Reflect dimension in
 approx repr for numpy arrays.
Message-ID: <5b626f18453ec_16c542ae634b02f8031671@hookshot-fe-dfcc362.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7d8688d54b48daba9ec0bfdbaec8c054060c90dd
      https://github.com/pytest-dev/pytest/commit/7d8688d54b48daba9ec0bfdbaec8c054060c90dd
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  Reflect dimension in approx repr for numpy arrays.


  Commit: ad305e71d7df867c49d074c8fab00fa9f51024a1
      https://github.com/pytest-dev/pytest/commit/ad305e71d7df867c49d074c8fab00fa9f51024a1
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Improve docstrings for Approx classes.


  Commit: cd2085ee718fb297537638bb33a70fc781ea450f
      https://github.com/pytest-dev/pytest/commit/cd2085ee718fb297537638bb33a70fc781ea450f
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  approx(): Detect type errors earlier.


  Commit: 032db159c997e10cd8750fa817944d42fb108323
      https://github.com/pytest-dev/pytest/commit/032db159c997e10cd8750fa817944d42fb108323
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  Let black reformat the code...


  Commit: d02491931ac4eee6d93d8853881c321619c460c3
      https://github.com/pytest-dev/pytest/commit/d02491931ac4eee6d93d8853881c321619c460c3
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Fix the unused import.


  Commit: 327fe4cfcc366f7b2e7fb8f2f90749ecc6edd785
      https://github.com/pytest-dev/pytest/commit/327fe4cfcc366f7b2e7fb8f2f90749ecc6edd785
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update the changelog.


  Commit: bf7c188cc0eeb14963d2006f705cdede126400cb
      https://github.com/pytest-dev/pytest/commit/bf7c188cc0eeb14963d2006f705cdede126400cb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Improve error message for invalid types passed to pytest.approx()

* Hide the internal traceback
* Use !r representation instead of !s (the default for {} formatting)


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

  Changed paths:
    M CHANGELOG.rst
    A changelog/3473.bugfix.rst
    A changelog/3712.bugfix.rst

  Log Message:
  -----------
  Create appropriate CHANGELOG entries


  Commit: 098dca3a9fda8dd6ed999e5e38d36877191690b5
      https://github.com/pytest-dev/pytest/commit/098dca3a9fda8dd6ed999e5e38d36877191690b5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Use {!r} for a few other messages as well


  Commit: 611d254ed5725a098b308e7c18b58e7e670a3529
      https://github.com/pytest-dev/pytest/commit/611d254ed5725a098b308e7c18b58e7e670a3529
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Improve error checking messages: add position and use pprint


  Commit: 6e32a1f73d91c6040960a6e84841cdcffb0393e5
      https://github.com/pytest-dev/pytest/commit/6e32a1f73d91c6040960a6e84841cdcffb0393e5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M testing/python/approx.py

  Log Message:
  -----------
  Use parametrize in repr test for nd arrays


  Commit: 5003bae0de4e1dc3ded16950c24c2aad275c78a4
      https://github.com/pytest-dev/pytest/commit/5003bae0de4e1dc3ded16950c24c2aad275c78a4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Fix 'at' string for non-numeric messages in approx()


  Commit: ad5ddaf55a71ebf640043d34c79cf3672c86be5c
      https://github.com/pytest-dev/pytest/commit/ad5ddaf55a71ebf640043d34c79cf3672c86be5c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Simplify is_numpy_array as suggested in review


  Commit: 2a2f888909e31f4fc9d26593a4addffd75469dd0
      https://github.com/pytest-dev/pytest/commit/2a2f888909e31f4fc9d26593a4addffd75469dd0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Move recursive_map from local to free function


  Commit: 43664d784167011fabd5fb13398084504a6c4016
      https://github.com/pytest-dev/pytest/commit/43664d784167011fabd5fb13398084504a6c4016
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M testing/python/approx.py

  Log Message:
  -----------
  Use ids for parametrized values in test_expected_value_type_error


  Commit: a5c0fb7f6b8d6213111c70d07ace773e6e794614
      https://github.com/pytest-dev/pytest/commit/a5c0fb7f6b8d6213111c70d07ace773e6e794614
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Rename recursive_map -> _recursive_list_map as requested in review


  Commit: 804fc4063aab3b82055c8341327b519300072d0a
      https://github.com/pytest-dev/pytest/commit/804fc4063aab3b82055c8341327b519300072d0a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3473.bugfix.rst
    A changelog/3712.bugfix.rst
    M src/_pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  Merge pull request #3741 from kalekundert/approx_misc_tweaks

Miscellaneous improvements to approx()


Compare: https://github.com/pytest-dev/pytest/compare/f25683354e95...804fc4063aab
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Wed Aug  1 22:40:32 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 01 Aug 2018 19:40:32 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7d1359: Fix recursion in
 pytest.approx() with arrays in nu...
Message-ID: <5b626f203d0c3_466f2ad8867b4f88871c9@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7d13599ba1ad61d4423bc60db14c46a742f1e3fe
      https://github.com/pytest-dev/pytest/commit/7d13599ba1ad61d4423bc60db14c46a742f1e3fe
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3748.bugfix.rst
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Fix recursion in pytest.approx() with arrays in numpy<1.13


  Commit: b8255308d65d91a464991259b0b233dcc4969486
      https://github.com/pytest-dev/pytest/commit/b8255308d65d91a464991259b0b233dcc4969486
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Make the infinite-recusrion fix more explicit.

So we remember what happened and don't accidentally regress in the
future.


  Commit: 5db2e6c7a1f546bdf92906901c7c6270f21edf9b
      https://github.com/pytest-dev/pytest/commit/5db2e6c7a1f546bdf92906901c7c6270f21edf9b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3748.bugfix.rst
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Merge pull request #3761 from nicoddemus/numpy-recursion-error

Fix recursion in pytest.approx() with arrays in numpy<1.13


Compare: https://github.com/pytest-dev/pytest/compare/804fc4063aab...5db2e6c7a1f5
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Thu Aug  2 13:45:19 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 02 Aug 2018 10:45:19 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f7a3f4: Preparing release
 version 3.7.1
Message-ID: <5b63432f4a6ad_38392b0d7d964f8c23167@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/tags/3.7.1
  Home:   https://github.com/pytest-dev/pytest
  Commit: f7a3f45a182ed8b4dabb130d2b46d717b006edeb
      https://github.com/pytest-dev/pytest/commit/f7a3f45a182ed8b4dabb130d2b46d717b006edeb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3473.bugfix.rst
    R changelog/3712.bugfix.rst
    R changelog/3745.bugfix.rst
    R changelog/3747.bugfix.rst
    R changelog/3748.bugfix.rst
    R changelog/3757.bugfix.rst
    R changelog/3763.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.1.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.7.1



      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Thu Aug  2 14:21:49 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 02 Aug 2018 11:21:49 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f7a3f4: Preparing release
 version 3.7.1
Message-ID: <5b634bbdbe84d_53462aefa63f0f78372db@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: f7a3f45a182ed8b4dabb130d2b46d717b006edeb
      https://github.com/pytest-dev/pytest/commit/f7a3f45a182ed8b4dabb130d2b46d717b006edeb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3473.bugfix.rst
    R changelog/3712.bugfix.rst
    R changelog/3745.bugfix.rst
    R changelog/3747.bugfix.rst
    R changelog/3748.bugfix.rst
    R changelog/3757.bugfix.rst
    R changelog/3763.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.1.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.7.1


  Commit: 4d2fa581e1ed8e34ddf50d5e215a8cee412b503e
      https://github.com/pytest-dev/pytest/commit/4d2fa581e1ed8e34ddf50d5e215a8cee412b503e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3473.bugfix.rst
    R changelog/3712.bugfix.rst
    R changelog/3745.bugfix.rst
    R changelog/3747.bugfix.rst
    R changelog/3748.bugfix.rst
    R changelog/3757.bugfix.rst
    R changelog/3763.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.1.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Merge pull request #3769 from nicoddemus/release-3.7.1

Preparing release version 3.7.1


Compare: https://github.com/pytest-dev/pytest/compare/4705fd2bbe1d...4d2fa581e1ed
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Thu Aug  2 14:28:28 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 02 Aug 2018 11:28:28 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a76cc8: Add changelog for #3742
Message-ID: <5b634d4c46095_29602adc313d0f80322d3@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: a76cc8f8c4757452a35e4488a1b3264dc16b3931
      https://github.com/pytest-dev/pytest/commit/a76cc8f8c4757452a35e4488a1b3264dc16b3931
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    M CHANGELOG.rst

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

This was missing from PR #3751



      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Thu Aug  2 14:29:53 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 02 Aug 2018 11:29:53 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7d8688: Reflect dimension in
 approx repr for numpy arrays.
Message-ID: <5b634da1b1f44_8402ad833a9cf788551c@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7d8688d54b48daba9ec0bfdbaec8c054060c90dd
      https://github.com/pytest-dev/pytest/commit/7d8688d54b48daba9ec0bfdbaec8c054060c90dd
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  Reflect dimension in approx repr for numpy arrays.


  Commit: ad305e71d7df867c49d074c8fab00fa9f51024a1
      https://github.com/pytest-dev/pytest/commit/ad305e71d7df867c49d074c8fab00fa9f51024a1
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Improve docstrings for Approx classes.


  Commit: cd2085ee718fb297537638bb33a70fc781ea450f
      https://github.com/pytest-dev/pytest/commit/cd2085ee718fb297537638bb33a70fc781ea450f
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  approx(): Detect type errors earlier.


  Commit: 032db159c997e10cd8750fa817944d42fb108323
      https://github.com/pytest-dev/pytest/commit/032db159c997e10cd8750fa817944d42fb108323
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  Let black reformat the code...


  Commit: d02491931ac4eee6d93d8853881c321619c460c3
      https://github.com/pytest-dev/pytest/commit/d02491931ac4eee6d93d8853881c321619c460c3
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Fix the unused import.


  Commit: 327fe4cfcc366f7b2e7fb8f2f90749ecc6edd785
      https://github.com/pytest-dev/pytest/commit/327fe4cfcc366f7b2e7fb8f2f90749ecc6edd785
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update the changelog.


  Commit: e1ad1a14af483af8df6979fbd61e842198c8996d
      https://github.com/pytest-dev/pytest/commit/e1ad1a14af483af8df6979fbd61e842198c8996d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    A testing/example_scripts/fixtures/custom_item/conftest.py
    A testing/example_scripts/fixtures/custom_item/foo/__init__.py
    A testing/example_scripts/fixtures/custom_item/foo/test_foo.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Add example script and failure for #3742


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

  Changed paths:
    M src/_pytest/main.py
    M testing/test_collection.py

  Log Message:
  -----------
  Only call _collectfile on package instances

As discussed in #3751, this feels like a hack, pushing it only so we can
see how it fares on CI and if there are better solutions out there


  Commit: bf7c188cc0eeb14963d2006f705cdede126400cb
      https://github.com/pytest-dev/pytest/commit/bf7c188cc0eeb14963d2006f705cdede126400cb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Improve error message for invalid types passed to pytest.approx()

* Hide the internal traceback
* Use !r representation instead of !s (the default for {} formatting)


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

  Changed paths:
    M CHANGELOG.rst
    A changelog/3473.bugfix.rst
    A changelog/3712.bugfix.rst

  Log Message:
  -----------
  Create appropriate CHANGELOG entries


  Commit: 098dca3a9fda8dd6ed999e5e38d36877191690b5
      https://github.com/pytest-dev/pytest/commit/098dca3a9fda8dd6ed999e5e38d36877191690b5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Use {!r} for a few other messages as well


  Commit: fcdc1d867e25b212ca7681b70cbf785b2645ad06
      https://github.com/pytest-dev/pytest/commit/fcdc1d867e25b212ca7681b70cbf785b2645ad06
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3745.bugfix
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  fix #3745 - display absolute cache_dir if necessary


  Commit: 57a8f208bc4369ebfc8cb7ac1445bed50108bdbf
      https://github.com/pytest-dev/pytest/commit/57a8f208bc4369ebfc8cb7ac1445bed50108bdbf
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3757.bugfix.rst
    M setup.py

  Log Message:
  -----------
  fix #3757 by pinning to pathlib2 that supports __fspath__


  Commit: 611d254ed5725a098b308e7c18b58e7e670a3529
      https://github.com/pytest-dev/pytest/commit/611d254ed5725a098b308e7c18b58e7e670a3529
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Improve error checking messages: add position and use pprint


  Commit: 6e32a1f73d91c6040960a6e84841cdcffb0393e5
      https://github.com/pytest-dev/pytest/commit/6e32a1f73d91c6040960a6e84841cdcffb0393e5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M testing/python/approx.py

  Log Message:
  -----------
  Use parametrize in repr test for nd arrays


  Commit: 5003bae0de4e1dc3ded16950c24c2aad275c78a4
      https://github.com/pytest-dev/pytest/commit/5003bae0de4e1dc3ded16950c24c2aad275c78a4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Fix 'at' string for non-numeric messages in approx()


  Commit: 4588130c1e3eb23ed1e96e49110a80f51a9b3d92
      https://github.com/pytest-dev/pytest/commit/4588130c1e3eb23ed1e96e49110a80f51a9b3d92
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3745.bugfix
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #3756 from RonnyPfannschmidt/fix-3745

fix #3745 - display absolute cache_dir if necessary


  Commit: ad5ddaf55a71ebf640043d34c79cf3672c86be5c
      https://github.com/pytest-dev/pytest/commit/ad5ddaf55a71ebf640043d34c79cf3672c86be5c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Simplify is_numpy_array as suggested in review


  Commit: 2a2f888909e31f4fc9d26593a4addffd75469dd0
      https://github.com/pytest-dev/pytest/commit/2a2f888909e31f4fc9d26593a4addffd75469dd0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Move recursive_map from local to free function


  Commit: 43664d784167011fabd5fb13398084504a6c4016
      https://github.com/pytest-dev/pytest/commit/43664d784167011fabd5fb13398084504a6c4016
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M testing/python/approx.py

  Log Message:
  -----------
  Use ids for parametrized values in test_expected_value_type_error


  Commit: 7d13599ba1ad61d4423bc60db14c46a742f1e3fe
      https://github.com/pytest-dev/pytest/commit/7d13599ba1ad61d4423bc60db14c46a742f1e3fe
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3748.bugfix.rst
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Fix recursion in pytest.approx() with arrays in numpy<1.13


  Commit: f25683354e95ea13801e4984873bbf3352b97ff1
      https://github.com/pytest-dev/pytest/commit/f25683354e95ea13801e4984873bbf3352b97ff1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3757.bugfix.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3760 from RonnyPfannschmidt/fix-3757-pin-pathlib

fix #3757 by pinning to pathlib2 that supports __fspath__


  Commit: a5c0fb7f6b8d6213111c70d07ace773e6e794614
      https://github.com/pytest-dev/pytest/commit/a5c0fb7f6b8d6213111c70d07ace773e6e794614
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Rename recursive_map -> _recursive_list_map as requested in review


  Commit: b8255308d65d91a464991259b0b233dcc4969486
      https://github.com/pytest-dev/pytest/commit/b8255308d65d91a464991259b0b233dcc4969486
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Make the infinite-recusrion fix more explicit.

So we remember what happened and don't accidentally regress in the
future.


  Commit: c6b11b9f6279fa6ee3ea91ae4f1d5ecfae67ce28
      https://github.com/pytest-dev/pytest/commit/c6b11b9f6279fa6ee3ea91ae4f1d5ecfae67ce28
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3747.bugfix.rst
    M src/_pytest/compat.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Refactor direct fixture call warning to avoid incompatibility with plugins

This refactors the code so we have the real function object right during
collection. This avoids having to unwrap it later and lose attached information
such as "async" functions.

Fix #3747


  Commit: 452e5c1cf02dc76900354732627e57300ccaadf2
      https://github.com/pytest-dev/pytest/commit/452e5c1cf02dc76900354732627e57300ccaadf2
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3763.bugfix.rst
    M src/_pytest/assertion/rewrite.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Fix `TypeError` when the assertion message is `bytes` in python 3.


  Commit: a80e031c629b80ee6921482bbb8aa13764a3068b
      https://github.com/pytest-dev/pytest/commit/a80e031c629b80ee6921482bbb8aa13764a3068b
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M .pre-commit-config.yaml
    R changelog/3745.bugfix
    A changelog/3745.bugfix.rst
    A scripts/fail

  Log Message:
  -----------
  Enforce that changelog files are .rst


  Commit: 82a217486706448211bac62972e92de96214cd03
      https://github.com/pytest-dev/pytest/commit/82a217486706448211bac62972e92de96214cd03
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M changelog/3747.bugfix.rst

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


  Commit: 804fc4063aab3b82055c8341327b519300072d0a
      https://github.com/pytest-dev/pytest/commit/804fc4063aab3b82055c8341327b519300072d0a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3473.bugfix.rst
    A changelog/3712.bugfix.rst
    M src/_pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  Merge pull request #3741 from kalekundert/approx_misc_tweaks

Miscellaneous improvements to approx()


  Commit: 5db2e6c7a1f546bdf92906901c7c6270f21edf9b
      https://github.com/pytest-dev/pytest/commit/5db2e6c7a1f546bdf92906901c7c6270f21edf9b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    A changelog/3748.bugfix.rst
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Merge pull request #3761 from nicoddemus/numpy-recursion-error

Fix recursion in pytest.approx() with arrays in numpy<1.13


  Commit: 33769d0328419636c9f95e84823f3bb180b3977f
      https://github.com/pytest-dev/pytest/commit/33769d0328419636c9f95e84823f3bb180b3977f
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    A changelog/3747.bugfix.rst
    M src/_pytest/compat.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3754 from nicoddemus/fix-function-call-warning

Refactor direct fixture call warning to avoid incompatibility with plugins


  Commit: 7e92930fa9c3e11d8502b367a0502b8503c5014b
      https://github.com/pytest-dev/pytest/commit/7e92930fa9c3e11d8502b367a0502b8503c5014b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    A changelog/3763.bugfix.rst
    M src/_pytest/assertion/rewrite.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Merge pull request #3764 from asottile/fix_3763

Fix `TypeError` when the assertion message is `bytes` in python 3.


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

  Changed paths:
    M src/_pytest/main.py
    A testing/example_scripts/fixtures/custom_item/conftest.py
    A testing/example_scripts/fixtures/custom_item/foo/__init__.py
    A testing/example_scripts/fixtures/custom_item/foo/test_foo.py
    M testing/python/fixture.py
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #3751 from nicoddemus/collect-file-bug

Workaround for #3742


  Commit: 4705fd2bbe1da0f153839d11145dc0ab154fc754
      https://github.com/pytest-dev/pytest/commit/4705fd2bbe1da0f153839d11145dc0ab154fc754
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M .pre-commit-config.yaml
    R changelog/3745.bugfix
    A changelog/3745.bugfix.rst
    A scripts/fail

  Log Message:
  -----------
  Merge pull request #3765 from asottile/require_changelog_rst

Enforce that changelog files are .rst


  Commit: f7a3f45a182ed8b4dabb130d2b46d717b006edeb
      https://github.com/pytest-dev/pytest/commit/f7a3f45a182ed8b4dabb130d2b46d717b006edeb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3473.bugfix.rst
    R changelog/3712.bugfix.rst
    R changelog/3745.bugfix.rst
    R changelog/3747.bugfix.rst
    R changelog/3748.bugfix.rst
    R changelog/3757.bugfix.rst
    R changelog/3763.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.1.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.7.1


  Commit: 4d2fa581e1ed8e34ddf50d5e215a8cee412b503e
      https://github.com/pytest-dev/pytest/commit/4d2fa581e1ed8e34ddf50d5e215a8cee412b503e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3473.bugfix.rst
    R changelog/3712.bugfix.rst
    R changelog/3745.bugfix.rst
    R changelog/3747.bugfix.rst
    R changelog/3748.bugfix.rst
    R changelog/3757.bugfix.rst
    R changelog/3763.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.1.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Merge pull request #3769 from nicoddemus/release-3.7.1

Preparing release version 3.7.1


  Commit: a76cc8f8c4757452a35e4488a1b3264dc16b3931
      https://github.com/pytest-dev/pytest/commit/a76cc8f8c4757452a35e4488a1b3264dc16b3931
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    M CHANGELOG.rst

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

This was missing from PR #3751


Compare: https://github.com/pytest-dev/pytest/compare/253419316ce0...a76cc8f8c475
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sun Aug  5 08:07:04 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 05 Aug 2018 05:07:04 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 2c0d2e: Only consider actual
 functions when considering ho...
Message-ID: <5b66e86867f5_11f12ad2fc9fcf781224@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 2c0d2eef40bf6393643f045ec1766e1b60ccc999
      https://github.com/pytest-dev/pytest/commit/2c0d2eef40bf6393643f045ec1766e1b60ccc999
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-04 (Sat, 04 Aug 2018)

  Changed paths:
    A changelog/3775.bugfix.rst
    M src/_pytest/config/__init__.py
    A testing/example_scripts/config/collect_pytest_prefix/conftest.py
    A testing/example_scripts/config/collect_pytest_prefix/test_foo.py
    M testing/test_config.py

  Log Message:
  -----------
  Only consider actual functions when considering hooks

Fix #3775


  Commit: d11781920b60ec2177b91d66d67736d62479d5cf
      https://github.com/pytest-dev/pytest/commit/d11781920b60ec2177b91d66d67736d62479d5cf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-05 (Sun, 05 Aug 2018)

  Changed paths:
    A changelog/3775.bugfix.rst
    M src/_pytest/config/__init__.py
    A testing/example_scripts/config/collect_pytest_prefix/conftest.py
    A testing/example_scripts/config/collect_pytest_prefix/test_foo.py
    M testing/test_config.py

  Log Message:
  -----------
  Merge pull request #3782 from nicoddemus/pytest-non-functions

Only consider actual functions when collecting hooks


Compare: https://github.com/pytest-dev/pytest/compare/a76cc8f8c475...d11781920b60
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sun Aug  5 17:04:00 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 05 Aug 2018 14:04:00 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 0a1c2a: Add a changelog blurb
 and title, similar to tox
Message-ID: <5b676640422f_53f82ae4cf27ef8c136f7@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0a1c2a7ca1d37070b0ca819c7e465bd35b4d79ff
      https://github.com/pytest-dev/pytest/commit/0a1c2a7ca1d37070b0ca819c7e465bd35b4d79ff
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-04 (Sat, 04 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/changelog.rst

  Log Message:
  -----------
  Add a changelog blurb and title, similar to tox


  Commit: 855fd17014e904124e4cb644d730cbaabfc07e1f
      https://github.com/pytest-dev/pytest/commit/855fd17014e904124e4cb644d730cbaabfc07e1f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-05 (Sun, 05 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/changelog.rst

  Log Message:
  -----------
  Merge pull request #3779 from nicoddemus/changelog-title

Add a changelog blurb and title, similar to tox


Compare: https://github.com/pytest-dev/pytest/compare/d11781920b60...855fd17014e9
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Mon Aug  6 09:09:33 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 06 Aug 2018 06:09:33 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] dcafb8: Add example for package
 recursion bug
Message-ID: <5b68488dde797_13162afbd5518f7833610@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: dcafb8c48ca42afd940db76ee48b72982f646bc0
      https://github.com/pytest-dev/pytest/commit/dcafb8c48ca42afd940db76ee48b72982f646bc0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-03 (Fri, 03 Aug 2018)

  Changed paths:
    A testing/example_scripts/collect/package_infinite_recursion/conftest.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
    M testing/python/collect.py

  Log Message:
  -----------
  Add example for package recursion bug


  Commit: fe0a76e1a61fab631ba21ca29a4cd13c71a3f807
      https://github.com/pytest-dev/pytest/commit/fe0a76e1a61fab631ba21ca29a4cd13c71a3f807
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-03 (Fri, 03 Aug 2018)

  Changed paths:
    A changelog/3771.bugfix.rst
    M src/_pytest/python.py

  Log Message:
  -----------
  Fix recursion bug if a pytest_ignore_collect returns False instead of None


  Commit: e7230691652ff31fcc1cd92e4f5bf080f386b681
      https://github.com/pytest-dev/pytest/commit/e7230691652ff31fcc1cd92e4f5bf080f386b681
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-06 (Mon, 06 Aug 2018)

  Changed paths:
    A changelog/3771.bugfix.rst
    M src/_pytest/python.py
    A testing/example_scripts/collect/package_infinite_recursion/conftest.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
    M testing/python/collect.py

  Log Message:
  -----------
  Merge pull request #3771 from nicoddemus/package-infinite-recursion-bug

Fix infinite recursion collection bug with pytest_ignore_collect hook


Compare: https://github.com/pytest-dev/pytest/compare/855fd17014e9...e7230691652f
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Wed Aug  8 20:30:51 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 08 Aug 2018 17:30:51 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 126896: Add option to disable
 plugin auto-loading
Message-ID: <5b6b8b3bbb712_5d5d2af6fbd52f88666e7@hookshot-fe-b0febf1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 126896f69d065b46efbf55e6e2b30865ab4569c0
      https://github.com/pytest-dev/pytest/commit/126896f69d065b46efbf55e6e2b30865ab4569c0
  Author: Virgil Dupras <hsoft at hardcoded.net>
  Date:   2018-08-07 (Tue, 07 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3784.feature.rst
    M doc/en/reference.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/helpconfig.py
    M testing/test_config.py

  Log Message:
  -----------
  Add option to disable plugin auto-loading

If `PYTEST_DISABLE_PLUGIN_AUTOLOAD` is set, disable auto-loading of
plugins through setuptools entrypoints. Only plugins that have been
explicitly specified are loaded.

ref #3784.


  Commit: 5f97711377e00cdbbd29024fb5cba7b4ed9f5c0a
      https://github.com/pytest-dev/pytest/commit/5f97711377e00cdbbd29024fb5cba7b4ed9f5c0a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-08 (Wed, 08 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3784.feature.rst
    M doc/en/reference.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/helpconfig.py
    M testing/test_config.py

  Log Message:
  -----------
  Merge pull request #3787 from hsoft/no-plugin-autoload

Add option to disable plugin auto-loading


Compare: https://github.com/pytest-dev/pytest/compare/a76cc8f8c475...5f97711377e0
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Thu Aug  9 11:26:11 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 09 Aug 2018 08:26:11 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] ef8ec0: Fix issue where
 fixtures would lose the decorated ...
Message-ID: <5b6c5d1324012_4f6b2ac073c60f80477cd@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: ef8ec01e3979aff992d63540a0e36a957e133c76
      https://github.com/pytest-dev/pytest/commit/ef8ec01e3979aff992d63540a0e36a957e133c76
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-04 (Sat, 04 Aug 2018)

  Changed paths:
    M src/_pytest/compat.py
    M src/_pytest/fixtures.py
    M testing/acceptance_test.py
    A testing/example_scripts/acceptance/fixture_mock_integration.py
    M testing/test_compat.py

  Log Message:
  -----------
  Fix issue where fixtures would lose the decorated functionality

Fix #3774


  Commit: 67106f056b0633b35dd4a080ef120fa61b55cf37
      https://github.com/pytest-dev/pytest/commit/67106f056b0633b35dd4a080ef120fa61b55cf37
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-09 (Thu, 09 Aug 2018)

  Changed paths:
    M src/_pytest/compat.py
    M src/_pytest/fixtures.py
    M testing/test_compat.py

  Log Message:
  -----------
  Use a custom holder class so we can be sure __pytest_wrapper__ was set by us


  Commit: 4d8903fd0b89369e0e44f084e93c43d2ce26d736
      https://github.com/pytest-dev/pytest/commit/4d8903fd0b89369e0e44f084e93c43d2ce26d736
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-09 (Thu, 09 Aug 2018)

  Changed paths:
    M src/_pytest/compat.py
    M src/_pytest/fixtures.py
    M testing/acceptance_test.py
    A testing/example_scripts/acceptance/fixture_mock_integration.py
    M testing/test_compat.py

  Log Message:
  -----------
  Merge pull request #3780 from nicoddemus/mock-integration-fix

Fix issue where fixtures would lose the decorated functionality


Compare: https://github.com/pytest-dev/pytest/compare/5d3c5123f883...4d8903fd0b89
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Wed Aug 15 20:42:27 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 15 Aug 2018 17:42:27 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] bfd0ad: Fix test collection
 from packages mixed with direc...
Message-ID: <5b74c873418_10fb2adbe3306ecc24399@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: bfd0addaeb29d25e88cbc56fb529b2181d401308
      https://github.com/pytest-dev/pytest/commit/bfd0addaeb29d25e88cbc56fb529b2181d401308
  Author: turturica <Ionut Turturica>
  Date:   2018-08-10 (Fri, 10 Aug 2018)

  Changed paths:
    M src/_pytest/python.py

  Log Message:
  -----------
  Fix test collection from packages mixed with directories. #3768 and #3789


  Commit: e92893ed2443840058a1ed3321e471b319534f62
      https://github.com/pytest-dev/pytest/commit/e92893ed2443840058a1ed3321e471b319534f62
  Author: turturica <Ionut Turturica>
  Date:   2018-08-10 (Fri, 10 Aug 2018)

  Changed paths:
    M testing/python/collect.py

  Log Message:
  -----------
  Add test for packages mixed with modules.


  Commit: abae60c8d047aae92f5bb5215f42ab15771673a6
      https://github.com/pytest-dev/pytest/commit/abae60c8d047aae92f5bb5215f42ab15771673a6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-10 (Fri, 10 Aug 2018)

  Changed paths:
    A changelog/3768.bugfix.rst
    A changelog/3789.bugfix.rst

  Log Message:
  -----------
  Add CHANGELOG entries


  Commit: 64faa41d061a700b380daf12afb5bda385a21c10
      https://github.com/pytest-dev/pytest/commit/64faa41d061a700b380daf12afb5bda385a21c10
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-15 (Wed, 15 Aug 2018)

  Changed paths:
    A changelog/3768.bugfix.rst
    A changelog/3789.bugfix.rst
    M src/_pytest/python.py
    M testing/python/collect.py

  Log Message:
  -----------
  Merge pull request #3802 from jonozzz/fix-3768

Fix test collection from packages mixed with directories. #3768 and #3789


Compare: https://github.com/pytest-dev/pytest/compare/ca1bb9a3a183...64faa41d061a
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sat Aug 18 09:49:03 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 18 Aug 2018 06:49:03 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] e5a3c8: Preparing release
 version 3.7.2
Message-ID: <5b7823cf3003_47ca2b026ad86ed074872@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/tags/3.7.2
  Home:   https://github.com/pytest-dev/pytest
  Commit: e5a3c870b4fa6c3a1abd7f464b419c95190ced4a
      https://github.com/pytest-dev/pytest/commit/e5a3c870b4fa6c3a1abd7f464b419c95190ced4a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-16 (Thu, 16 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3671.bugfix.rst
    R changelog/3746.doc.rst
    R changelog/3768.bugfix.rst
    R changelog/3771.bugfix.rst
    R changelog/3774.bugfix.rst
    R changelog/3775.bugfix.rst
    R changelog/3788.bugfix.rst
    R changelog/3789.bugfix.rst
    R changelog/3804.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst

  Log Message:
  -----------
  Preparing release version 3.7.2


  Commit: e0b088b52ea2c9ad9748acbed62dccfd20eccf42
      https://github.com/pytest-dev/pytest/commit/e0b088b52ea2c9ad9748acbed62dccfd20eccf42
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-16 (Thu, 16 Aug 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Changelog tweaks


Compare: https://github.com/pytest-dev/pytest/compare/e5a3c870b4fa^...e0b088b52ea2
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sat Aug 18 10:18:21 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 18 Aug 2018 07:18:21 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] e5a3c8: Preparing release
 version 3.7.2
Message-ID: <5b782aad9196c_41112b110df7eec0672f7@hookshot-fe-b0febf1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: e5a3c870b4fa6c3a1abd7f464b419c95190ced4a
      https://github.com/pytest-dev/pytest/commit/e5a3c870b4fa6c3a1abd7f464b419c95190ced4a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-16 (Thu, 16 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3671.bugfix.rst
    R changelog/3746.doc.rst
    R changelog/3768.bugfix.rst
    R changelog/3771.bugfix.rst
    R changelog/3774.bugfix.rst
    R changelog/3775.bugfix.rst
    R changelog/3788.bugfix.rst
    R changelog/3789.bugfix.rst
    R changelog/3804.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst

  Log Message:
  -----------
  Preparing release version 3.7.2


  Commit: e0b088b52ea2c9ad9748acbed62dccfd20eccf42
      https://github.com/pytest-dev/pytest/commit/e0b088b52ea2c9ad9748acbed62dccfd20eccf42
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-16 (Thu, 16 Aug 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Changelog tweaks


  Commit: 2fe824b8c47dc661eeb984555e54b8ed9ca2b66d
      https://github.com/pytest-dev/pytest/commit/2fe824b8c47dc661eeb984555e54b8ed9ca2b66d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3671.bugfix.rst
    R changelog/3746.doc.rst
    R changelog/3768.bugfix.rst
    R changelog/3771.bugfix.rst
    R changelog/3774.bugfix.rst
    R changelog/3775.bugfix.rst
    R changelog/3788.bugfix.rst
    R changelog/3789.bugfix.rst
    R changelog/3804.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst

  Log Message:
  -----------
  Merge pull request #3821 from nicoddemus/release-3.7.2

Preparing release version 3.7.2


Compare: https://github.com/pytest-dev/pytest/compare/7d4c4c66d419...2fe824b8c47d
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sat Aug 18 11:54:49 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 18 Aug 2018 08:54:49 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] c3e494: Replace broken type
 annotations with type comments
Message-ID: <5b7841491deb2_1c962b0cbd998ed88726c@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: c3e494f6cf2fe7de97090193d0a96d4f499083c7
      https://github.com/pytest-dev/pytest/commit/c3e494f6cf2fe7de97090193d0a96d4f499083c7
  Author: Vlad Shcherbina <vlad.shcherbina at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    A changelog/3826.trivial.rst
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Replace broken type annotations with type comments

Fixes #3826.


  Commit: 29975e5b37c176c93f2312626900c2cab11072f0
      https://github.com/pytest-dev/pytest/commit/29975e5b37c176c93f2312626900c2cab11072f0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    A changelog/3826.trivial.rst
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Merge pull request #3827 from Vlad-Shcherbina/funcfixtureinfo-type-hints

Replace broken type annotations with type comments


Compare: https://github.com/pytest-dev/pytest/compare/2fe824b8c47d...29975e5b37c1
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sat Aug 18 13:06:29 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 18 Aug 2018 10:06:29 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] da9d81: Added test.
Message-ID: <5b785215b7ab0_18542b1b9b5c0ecc53842@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: da9d814da43a32f9eb3924e5b5618a80d7786731
      https://github.com/pytest-dev/pytest/commit/da9d814da43a32f9eb3924e5b5618a80d7786731
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Added test.


  Commit: 2b71cb9c381effaea13fa00c096a8f4c76a663b5
      https://github.com/pytest-dev/pytest/commit/2b71cb9c381effaea13fa00c096a8f4c76a663b5
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py
    M src/_pytest/logging.py

  Log Message:
  -----------
  Added activation/deactivation of capture fixture in logging emit.


  Commit: f66764e1c00624b91c3ab9554c7872f9611ebc42
      https://github.com/pytest-dev/pytest/commit/f66764e1c00624b91c3ab9554c7872f9611ebc42
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3819.bugfix.rst

  Log Message:
  -----------
  Added changelog and updated AUTHORS.


  Commit: e391c47ed8e6b4e68ec6e97b2ea3195a198e218f
      https://github.com/pytest-dev/pytest/commit/e391c47ed8e6b4e68ec6e97b2ea3195a198e218f
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

  Changed paths:
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Update capture suspend test for logging.


  Commit: 3059bfb1b3a45ab517da945acf74fe20abcad5a4
      https://github.com/pytest-dev/pytest/commit/3059bfb1b3a45ab517da945acf74fe20abcad5a4
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Update test with another problem.


  Commit: 090f67a980adb7460d8600b6e49f7719c7c6e870
      https://github.com/pytest-dev/pytest/commit/090f67a980adb7460d8600b6e49f7719c7c6e870
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

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

  Log Message:
  -----------
  Refactored implementation and updated tests.


  Commit: 14db2f91ba5e94ebf55c55000b0da1e3b755cc26
      https://github.com/pytest-dev/pytest/commit/14db2f91ba5e94ebf55c55000b0da1e3b755cc26
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  Fixed global not called if no capsys fixture. Using now capsys context manager as well.


  Commit: 9fa7745795afd20e116cdd8ae93211a32054697b
      https://github.com/pytest-dev/pytest/commit/9fa7745795afd20e116cdd8ae93211a32054697b
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py
    M src/_pytest/logging.py

  Log Message:
  -----------
  Refactor, tests passing.


  Commit: eb2d0745301d597b7ef03450bea29c509237d60a
      https://github.com/pytest-dev/pytest/commit/eb2d0745301d597b7ef03450bea29c509237d60a
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py
    M src/_pytest/logging.py

  Log Message:
  -----------
  Black changes.


  Commit: 9f7345d6639f803330835febee2694ceb925e08a
      https://github.com/pytest-dev/pytest/commit/9f7345d6639f803330835febee2694ceb925e08a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  Avoid leaving a reference to the last item on CaptureManager


  Commit: f674217c43c21f17b3693ce8b7b0e5bd06de2197
      https://github.com/pytest-dev/pytest/commit/f674217c43c21f17b3693ce8b7b0e5bd06de2197
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/logging.py

  Log Message:
  -----------
  Moved dummy_context_manager to compat module


  Commit: 5cf7d1dba21b51d4d20dc61b5a2f50bf5fc4fbf0
      https://github.com/pytest-dev/pytest/commit/5cf7d1dba21b51d4d20dc61b5a2f50bf5fc4fbf0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

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

  Log Message:
  -----------
  "suspend" method of capture fixture private

Also change the context-manager to global_and_fixture_disabled to
better convey its meaning


  Commit: 28aff051ab88ab055b315f10287a6657c437e47d
      https://github.com/pytest-dev/pytest/commit/28aff051ab88ab055b315f10287a6657c437e47d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3819.bugfix.rst
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/logging.py
    M testing/logging/test_reporting.py
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #3822 from Sup3rGeo/bugfix/capsys-with-cli-logging

Bugfix/capsys with cli logging


Compare: https://github.com/pytest-dev/pytest/compare/29975e5b37c1...28aff051ab88
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sat Aug 18 18:43:38 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 18 Aug 2018 15:43:38 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] dff7b2: tox: clean up docs
 target
Message-ID: <5b78a11a52ded_5bbe2b0c512d8ed45454b@hookshot-fe-da92815.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: dff7b203f7ac83192611c361ebf89e861ba94e70
      https://github.com/pytest-dev/pytest/commit/dff7b203f7ac83192611c361ebf89e861ba94e70
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  tox: clean up docs target


  Commit: dcafb8c48ca42afd940db76ee48b72982f646bc0
      https://github.com/pytest-dev/pytest/commit/dcafb8c48ca42afd940db76ee48b72982f646bc0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-03 (Fri, 03 Aug 2018)

  Changed paths:
    A testing/example_scripts/collect/package_infinite_recursion/conftest.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
    M testing/python/collect.py

  Log Message:
  -----------
  Add example for package recursion bug


  Commit: fe0a76e1a61fab631ba21ca29a4cd13c71a3f807
      https://github.com/pytest-dev/pytest/commit/fe0a76e1a61fab631ba21ca29a4cd13c71a3f807
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-03 (Fri, 03 Aug 2018)

  Changed paths:
    A changelog/3771.bugfix.rst
    M src/_pytest/python.py

  Log Message:
  -----------
  Fix recursion bug if a pytest_ignore_collect returns False instead of None


  Commit: 0a1c2a7ca1d37070b0ca819c7e465bd35b4d79ff
      https://github.com/pytest-dev/pytest/commit/0a1c2a7ca1d37070b0ca819c7e465bd35b4d79ff
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-04 (Sat, 04 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/changelog.rst

  Log Message:
  -----------
  Add a changelog blurb and title, similar to tox


  Commit: ef8ec01e3979aff992d63540a0e36a957e133c76
      https://github.com/pytest-dev/pytest/commit/ef8ec01e3979aff992d63540a0e36a957e133c76
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-04 (Sat, 04 Aug 2018)

  Changed paths:
    M src/_pytest/compat.py
    M src/_pytest/fixtures.py
    M testing/acceptance_test.py
    A testing/example_scripts/acceptance/fixture_mock_integration.py
    M testing/test_compat.py

  Log Message:
  -----------
  Fix issue where fixtures would lose the decorated functionality

Fix #3774


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

  Changed paths:
    A changelog/3775.bugfix.rst
    M src/_pytest/config/__init__.py
    A testing/example_scripts/config/collect_pytest_prefix/conftest.py
    A testing/example_scripts/config/collect_pytest_prefix/test_foo.py
    M testing/test_config.py

  Log Message:
  -----------
  Only consider actual functions when considering hooks

Fix #3775


  Commit: d11781920b60ec2177b91d66d67736d62479d5cf
      https://github.com/pytest-dev/pytest/commit/d11781920b60ec2177b91d66d67736d62479d5cf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-05 (Sun, 05 Aug 2018)

  Changed paths:
    A changelog/3775.bugfix.rst
    M src/_pytest/config/__init__.py
    A testing/example_scripts/config/collect_pytest_prefix/conftest.py
    A testing/example_scripts/config/collect_pytest_prefix/test_foo.py
    M testing/test_config.py

  Log Message:
  -----------
  Merge pull request #3782 from nicoddemus/pytest-non-functions

Only consider actual functions when collecting hooks


  Commit: 855fd17014e904124e4cb644d730cbaabfc07e1f
      https://github.com/pytest-dev/pytest/commit/855fd17014e904124e4cb644d730cbaabfc07e1f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-05 (Sun, 05 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/changelog.rst

  Log Message:
  -----------
  Merge pull request #3779 from nicoddemus/changelog-title

Add a changelog blurb and title, similar to tox


  Commit: e7230691652ff31fcc1cd92e4f5bf080f386b681
      https://github.com/pytest-dev/pytest/commit/e7230691652ff31fcc1cd92e4f5bf080f386b681
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-06 (Mon, 06 Aug 2018)

  Changed paths:
    A changelog/3771.bugfix.rst
    M src/_pytest/python.py
    A testing/example_scripts/collect/package_infinite_recursion/conftest.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
    M testing/python/collect.py

  Log Message:
  -----------
  Merge pull request #3771 from nicoddemus/package-infinite-recursion-bug

Fix infinite recursion collection bug with pytest_ignore_collect hook


  Commit: aa358433b0d63655981e2bac112ab5a490927716
      https://github.com/pytest-dev/pytest/commit/aa358433b0d63655981e2bac112ab5a490927716
  Author: Wes Thomas <westhomas at gmail.com>
  Date:   2018-08-08 (Wed, 08 Aug 2018)

  Changed paths:
    A changelog/3788.bugfix.rst
    M src/_pytest/unittest.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Fix AttributeError bug in TestCaseFunction.teardown by creating TestCaseFunction._testcase as attribute of class with a None default.


  Commit: 051db6a33d75e0aff4664be12eb85206ec9d8234
      https://github.com/pytest-dev/pytest/commit/051db6a33d75e0aff4664be12eb85206ec9d8234
  Author: Wes Thomas <westhomas at gmail.com>
  Date:   2018-08-08 (Wed, 08 Aug 2018)

  Changed paths:
    M testing/test_unittest.py

  Log Message:
  -----------
  Trimming Trailing Whitespace


  Commit: 74d9f56d0f254f63468a3e53f1691e591d2e4c75
      https://github.com/pytest-dev/pytest/commit/74d9f56d0f254f63468a3e53f1691e591d2e4c75
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-08 (Wed, 08 Aug 2018)

  Changed paths:
    M changelog/3788.bugfix.rst

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


  Commit: 5d3c5123f8836c53a7b9b1368e6a1fbab5801035
      https://github.com/pytest-dev/pytest/commit/5d3c5123f8836c53a7b9b1368e6a1fbab5801035
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-08-09 (Thu, 09 Aug 2018)

  Changed paths:
    A changelog/3788.bugfix.rst
    M src/_pytest/unittest.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Merge pull request #3792 from decisio/pr-3788-fix-teardown-exception

Pr 3788 fix teardown exception


  Commit: 67106f056b0633b35dd4a080ef120fa61b55cf37
      https://github.com/pytest-dev/pytest/commit/67106f056b0633b35dd4a080ef120fa61b55cf37
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-09 (Thu, 09 Aug 2018)

  Changed paths:
    M src/_pytest/compat.py
    M src/_pytest/fixtures.py
    M testing/test_compat.py

  Log Message:
  -----------
  Use a custom holder class so we can be sure __pytest_wrapper__ was set by us


  Commit: 4d8903fd0b89369e0e44f084e93c43d2ce26d736
      https://github.com/pytest-dev/pytest/commit/4d8903fd0b89369e0e44f084e93c43d2ce26d736
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-09 (Thu, 09 Aug 2018)

  Changed paths:
    M src/_pytest/compat.py
    M src/_pytest/fixtures.py
    M testing/acceptance_test.py
    A testing/example_scripts/acceptance/fixture_mock_integration.py
    M testing/test_compat.py

  Log Message:
  -----------
  Merge pull request #3780 from nicoddemus/mock-integration-fix

Fix issue where fixtures would lose the decorated functionality


  Commit: 220288ac773c630bcf768174fd9db142b7249a6b
      https://github.com/pytest-dev/pytest/commit/220288ac773c630bcf768174fd9db142b7249a6b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-09 (Thu, 09 Aug 2018)

  Changed paths:
    A changelog/3774.bugfix.rst

  Log Message:
  -----------
  Add CHANGELOG for issue #3774, missing from PR #3780


  Commit: 266f05c4c4ce981bfa7a1d2266380380aaf4bb72
      https://github.com/pytest-dev/pytest/commit/266f05c4c4ce981bfa7a1d2266380380aaf4bb72
  Author: turturica <Ionut Turturica>
  Date:   2018-08-09 (Thu, 09 Aug 2018)

  Changed paths:
    M src/_pytest/main.py
    M testing/test_collection.py

  Log Message:
  -----------
  Fix #3751


  Commit: be11d3e19526148716b49705369cf0d2eeaf31a8
      https://github.com/pytest-dev/pytest/commit/be11d3e19526148716b49705369cf0d2eeaf31a8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-10 (Fri, 10 Aug 2018)

  Changed paths:
    M src/_pytest/config/argparsing.py

  Log Message:
  -----------
  Improve warning messages when addoption is called with string as `type`

Encountered the warning myself and to me the message was not clear about
what should be done to fix the warning


  Commit: bfd0addaeb29d25e88cbc56fb529b2181d401308
      https://github.com/pytest-dev/pytest/commit/bfd0addaeb29d25e88cbc56fb529b2181d401308
  Author: turturica <Ionut Turturica>
  Date:   2018-08-10 (Fri, 10 Aug 2018)

  Changed paths:
    M src/_pytest/python.py

  Log Message:
  -----------
  Fix test collection from packages mixed with directories. #3768 and #3789


  Commit: 50db718a6a0ea09be107f6bf9e9aa1a7002a91de
      https://github.com/pytest-dev/pytest/commit/50db718a6a0ea09be107f6bf9e9aa1a7002a91de
  Author: turturica <Ionut Turturica>
  Date:   2018-08-10 (Fri, 10 Aug 2018)

  Changed paths:
    M testing/test_collection.py

  Log Message:
  -----------
  Add a test description.


  Commit: 27b5435a40384a7e5b2ba85a9916774d171c4d66
      https://github.com/pytest-dev/pytest/commit/27b5435a40384a7e5b2ba85a9916774d171c4d66
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-10 (Fri, 10 Aug 2018)

  Changed paths:
    M testing/test_collection.py

  Log Message:
  -----------
  Fix docs formatting and improve test a bit


  Commit: e92893ed2443840058a1ed3321e471b319534f62
      https://github.com/pytest-dev/pytest/commit/e92893ed2443840058a1ed3321e471b319534f62
  Author: turturica <Ionut Turturica>
  Date:   2018-08-10 (Fri, 10 Aug 2018)

  Changed paths:
    M testing/python/collect.py

  Log Message:
  -----------
  Add test for packages mixed with modules.


  Commit: abae60c8d047aae92f5bb5215f42ab15771673a6
      https://github.com/pytest-dev/pytest/commit/abae60c8d047aae92f5bb5215f42ab15771673a6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-10 (Fri, 10 Aug 2018)

  Changed paths:
    A changelog/3768.bugfix.rst
    A changelog/3789.bugfix.rst

  Log Message:
  -----------
  Add CHANGELOG entries


  Commit: abbd7c30a43b56106fb323892311b9d4ba7a3105
      https://github.com/pytest-dev/pytest/commit/abbd7c30a43b56106fb323892311b9d4ba7a3105
  Author: Josh Holland <anowlcalledjosh at gmail.com>
  Date:   2018-08-11 (Sat, 11 Aug 2018)

  Changed paths:
    A changelog/3746.doc.rst
    M src/_pytest/python.py

  Log Message:
  -----------
  Unhide documentation for metafunc.config

Fixes #3746.


  Commit: 87a99275fb851f5efd4114f654c5b65e99e03cd9
      https://github.com/pytest-dev/pytest/commit/87a99275fb851f5efd4114f654c5b65e99e03cd9
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-13 (Mon, 13 Aug 2018)

  Changed paths:
    A changelog/3746.doc.rst
    M src/_pytest/python.py

  Log Message:
  -----------
  Merge pull request #3807 from anowlcalledjosh/metafunc-config-doc

Unhide documentation for metafunc.config


  Commit: 22ee2093b8d5e1ebfc4f7a0b4d2df9a64a41460b
      https://github.com/pytest-dev/pytest/commit/22ee2093b8d5e1ebfc4f7a0b4d2df9a64a41460b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-08-14 (Tue, 14 Aug 2018)

  Changed paths:
    M src/_pytest/config/argparsing.py

  Log Message:
  -----------
  Merge pull request #3801 from nicoddemus/improve-warning-addoption

Improve warning messages when addoption is called with string as `type`


  Commit: 68bbd42213c33884ea5df2ac0df21570f057c1f8
      https://github.com/pytest-dev/pytest/commit/68bbd42213c33884ea5df2ac0df21570f057c1f8
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-08-14 (Tue, 14 Aug 2018)

  Changed paths:
    A changelog/3774.bugfix.rst

  Log Message:
  -----------
  Merge pull request #3795 from nicoddemus/changelog-3774

Add CHANGELOG for issue #3774, missing from PR #3780


  Commit: b88e09a6970c7b0211d691e3cbdb56389655d442
      https://github.com/pytest-dev/pytest/commit/b88e09a6970c7b0211d691e3cbdb56389655d442
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-08-14 (Tue, 14 Aug 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3548 from blueyed/fix-docs

tox: clean up docs target


  Commit: 6367f0f5f19185ae031e465fca904298b124b880
      https://github.com/pytest-dev/pytest/commit/6367f0f5f19185ae031e465fca904298b124b880
  Author: Sankt Petersbug <sankt.petersbug at gmail.com>
  Date:   2018-08-14 (Tue, 14 Aug 2018)

  Changed paths:
    M src/_pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  fix `filterwarnings` mark not registered


  Commit: cb77e65c97896b6fca8ce5f3d33541200a3d8b65
      https://github.com/pytest-dev/pytest/commit/cb77e65c97896b6fca8ce5f3d33541200a3d8b65
  Author: Sankt Petersbug <sankt.petersbug at gmail.com>
  Date:   2018-08-14 (Tue, 14 Aug 2018)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  updated AUTHORS


  Commit: e06a077ac25771591ed9cd21f26390e7e0d28e57
      https://github.com/pytest-dev/pytest/commit/e06a077ac25771591ed9cd21f26390e7e0d28e57
  Author: Sankt Petersbug <sankt.petersbug at gmail.com>
  Date:   2018-08-14 (Tue, 14 Aug 2018)

  Changed paths:
    A changelog/3671.bugfix.rst

  Log Message:
  -----------
  added changelog


  Commit: c1c08852f99e647335fb8e5b1040450f7cc09e00
      https://github.com/pytest-dev/pytest/commit/c1c08852f99e647335fb8e5b1040450f7cc09e00
  Author: Sankt Petersbug <sankt.petersbug at gmail.com>
  Date:   2018-08-14 (Tue, 14 Aug 2018)

  Changed paths:
    M changelog/3671.bugfix.rst

  Log Message:
  -----------
  lint checks


  Commit: 212ee450b7836a4f2ab5e8626c521d5febcf94fe
      https://github.com/pytest-dev/pytest/commit/212ee450b7836a4f2ab5e8626c521d5febcf94fe
  Author: Sankt Petersbug <sankt.petersbug at gmail.com>
  Date:   2018-08-14 (Tue, 14 Aug 2018)

  Changed paths:
    M testing/test_warnings.py

  Log Message:
  -----------
  simplified test function


  Commit: 78ef531420f2327a0daaa1c28a19ceefb9ce7b7f
      https://github.com/pytest-dev/pytest/commit/78ef531420f2327a0daaa1c28a19ceefb9ce7b7f
  Author: Sankt Petersbug <sankt.petersbug at gmail.com>
  Date:   2018-08-14 (Tue, 14 Aug 2018)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  corrected the position of myname


  Commit: ca1bb9a3a183f666484809b027b30c1d9fab81e8
      https://github.com/pytest-dev/pytest/commit/ca1bb9a3a183f666484809b027b30c1d9fab81e8
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-15 (Wed, 15 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3671.bugfix.rst
    M src/_pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Merge pull request #3815 from sankt-petersbug/fix-3671

Fix #3671 - `filterwarnings` Is an Unregistered Marker


  Commit: 64faa41d061a700b380daf12afb5bda385a21c10
      https://github.com/pytest-dev/pytest/commit/64faa41d061a700b380daf12afb5bda385a21c10
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-15 (Wed, 15 Aug 2018)

  Changed paths:
    A changelog/3768.bugfix.rst
    A changelog/3789.bugfix.rst
    M src/_pytest/python.py
    M testing/python/collect.py

  Log Message:
  -----------
  Merge pull request #3802 from jonozzz/fix-3768

Fix test collection from packages mixed with directories. #3768 and #3789


  Commit: 17644ff285a30aa43ec4c02c167fbdf4ad47a291
      https://github.com/pytest-dev/pytest/commit/17644ff285a30aa43ec4c02c167fbdf4ad47a291
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-15 (Wed, 15 Aug 2018)

  Changed paths:
    A changelog/3804.bugfix.rst
    M src/_pytest/_code/code.py
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Fix traceback reporting for exceptions with `__cause__` cycles.


  Commit: 939a792c41f87b5920df8af3ced4fecd2095b23a
      https://github.com/pytest-dev/pytest/commit/939a792c41f87b5920df8af3ced4fecd2095b23a
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-08-16 (Thu, 16 Aug 2018)

  Changed paths:
    M src/_pytest/main.py
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #3798 from jonozzz/fix-3751

Fix #3751


  Commit: 7d4c4c66d4198d1494eeaed59244d73cd2f4c8aa
      https://github.com/pytest-dev/pytest/commit/7d4c4c66d4198d1494eeaed59244d73cd2f4c8aa
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-08-16 (Thu, 16 Aug 2018)

  Changed paths:
    A changelog/3804.bugfix.rst
    M src/_pytest/_code/code.py
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Merge pull request #3805 from asottile/cause_cycles

Fix traceback reporting for exceptions with `__cause__` cycles.


  Commit: da9d814da43a32f9eb3924e5b5618a80d7786731
      https://github.com/pytest-dev/pytest/commit/da9d814da43a32f9eb3924e5b5618a80d7786731
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Added test.


  Commit: 2b71cb9c381effaea13fa00c096a8f4c76a663b5
      https://github.com/pytest-dev/pytest/commit/2b71cb9c381effaea13fa00c096a8f4c76a663b5
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py
    M src/_pytest/logging.py

  Log Message:
  -----------
  Added activation/deactivation of capture fixture in logging emit.


  Commit: e5a3c870b4fa6c3a1abd7f464b419c95190ced4a
      https://github.com/pytest-dev/pytest/commit/e5a3c870b4fa6c3a1abd7f464b419c95190ced4a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-16 (Thu, 16 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3671.bugfix.rst
    R changelog/3746.doc.rst
    R changelog/3768.bugfix.rst
    R changelog/3771.bugfix.rst
    R changelog/3774.bugfix.rst
    R changelog/3775.bugfix.rst
    R changelog/3788.bugfix.rst
    R changelog/3789.bugfix.rst
    R changelog/3804.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst

  Log Message:
  -----------
  Preparing release version 3.7.2


  Commit: e0b088b52ea2c9ad9748acbed62dccfd20eccf42
      https://github.com/pytest-dev/pytest/commit/e0b088b52ea2c9ad9748acbed62dccfd20eccf42
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-16 (Thu, 16 Aug 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Changelog tweaks


  Commit: f66764e1c00624b91c3ab9554c7872f9611ebc42
      https://github.com/pytest-dev/pytest/commit/f66764e1c00624b91c3ab9554c7872f9611ebc42
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3819.bugfix.rst

  Log Message:
  -----------
  Added changelog and updated AUTHORS.


  Commit: e391c47ed8e6b4e68ec6e97b2ea3195a198e218f
      https://github.com/pytest-dev/pytest/commit/e391c47ed8e6b4e68ec6e97b2ea3195a198e218f
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

  Changed paths:
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Update capture suspend test for logging.


  Commit: 3059bfb1b3a45ab517da945acf74fe20abcad5a4
      https://github.com/pytest-dev/pytest/commit/3059bfb1b3a45ab517da945acf74fe20abcad5a4
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Update test with another problem.


  Commit: 090f67a980adb7460d8600b6e49f7719c7c6e870
      https://github.com/pytest-dev/pytest/commit/090f67a980adb7460d8600b6e49f7719c7c6e870
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-17 (Fri, 17 Aug 2018)

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

  Log Message:
  -----------
  Refactored implementation and updated tests.


  Commit: c3e494f6cf2fe7de97090193d0a96d4f499083c7
      https://github.com/pytest-dev/pytest/commit/c3e494f6cf2fe7de97090193d0a96d4f499083c7
  Author: Vlad Shcherbina <vlad.shcherbina at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    A changelog/3826.trivial.rst
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Replace broken type annotations with type comments

Fixes #3826.


  Commit: 14db2f91ba5e94ebf55c55000b0da1e3b755cc26
      https://github.com/pytest-dev/pytest/commit/14db2f91ba5e94ebf55c55000b0da1e3b755cc26
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  Fixed global not called if no capsys fixture. Using now capsys context manager as well.


  Commit: 9fa7745795afd20e116cdd8ae93211a32054697b
      https://github.com/pytest-dev/pytest/commit/9fa7745795afd20e116cdd8ae93211a32054697b
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py
    M src/_pytest/logging.py

  Log Message:
  -----------
  Refactor, tests passing.


  Commit: eb2d0745301d597b7ef03450bea29c509237d60a
      https://github.com/pytest-dev/pytest/commit/eb2d0745301d597b7ef03450bea29c509237d60a
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py
    M src/_pytest/logging.py

  Log Message:
  -----------
  Black changes.


  Commit: 9f7345d6639f803330835febee2694ceb925e08a
      https://github.com/pytest-dev/pytest/commit/9f7345d6639f803330835febee2694ceb925e08a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  Avoid leaving a reference to the last item on CaptureManager


  Commit: f674217c43c21f17b3693ce8b7b0e5bd06de2197
      https://github.com/pytest-dev/pytest/commit/f674217c43c21f17b3693ce8b7b0e5bd06de2197
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/logging.py

  Log Message:
  -----------
  Moved dummy_context_manager to compat module


  Commit: 2fe824b8c47dc661eeb984555e54b8ed9ca2b66d
      https://github.com/pytest-dev/pytest/commit/2fe824b8c47dc661eeb984555e54b8ed9ca2b66d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3671.bugfix.rst
    R changelog/3746.doc.rst
    R changelog/3768.bugfix.rst
    R changelog/3771.bugfix.rst
    R changelog/3774.bugfix.rst
    R changelog/3775.bugfix.rst
    R changelog/3788.bugfix.rst
    R changelog/3789.bugfix.rst
    R changelog/3804.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst

  Log Message:
  -----------
  Merge pull request #3821 from nicoddemus/release-3.7.2

Preparing release version 3.7.2


  Commit: 5cf7d1dba21b51d4d20dc61b5a2f50bf5fc4fbf0
      https://github.com/pytest-dev/pytest/commit/5cf7d1dba21b51d4d20dc61b5a2f50bf5fc4fbf0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

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

  Log Message:
  -----------
  "suspend" method of capture fixture private

Also change the context-manager to global_and_fixture_disabled to
better convey its meaning


  Commit: 29975e5b37c176c93f2312626900c2cab11072f0
      https://github.com/pytest-dev/pytest/commit/29975e5b37c176c93f2312626900c2cab11072f0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    A changelog/3826.trivial.rst
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Merge pull request #3827 from Vlad-Shcherbina/funcfixtureinfo-type-hints

Replace broken type annotations with type comments


  Commit: 28aff051ab88ab055b315f10287a6657c437e47d
      https://github.com/pytest-dev/pytest/commit/28aff051ab88ab055b315f10287a6657c437e47d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3819.bugfix.rst
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/logging.py
    M testing/logging/test_reporting.py
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #3822 from Sup3rGeo/bugfix/capsys-with-cli-logging

Bugfix/capsys with cli logging


  Commit: c64a8c9c7f1b0fff2fcd05701d795648787e9c64
      https://github.com/pytest-dev/pytest/commit/c64a8c9c7f1b0fff2fcd05701d795648787e9c64
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    A changelog/3819.bugfix.rst
    A changelog/3826.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.2.rst
    M doc/en/changelog.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M src/_pytest/_code/code.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/config/argparsing.py
    M src/_pytest/fixtures.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/python.py
    M src/_pytest/unittest.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    A testing/example_scripts/acceptance/fixture_mock_integration.py
    A testing/example_scripts/collect/package_infinite_recursion/conftest.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
    A testing/example_scripts/config/collect_pytest_prefix/conftest.py
    A testing/example_scripts/config/collect_pytest_prefix/test_foo.py
    M testing/logging/test_reporting.py
    M testing/python/collect.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.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: a6cdd0d9da824e32343408ef63fdf017a15f0f57
      https://github.com/pytest-dev/pytest/commit/a6cdd0d9da824e32343408ef63fdf017a15f0f57
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    A changelog/3819.bugfix.rst
    A changelog/3826.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.2.rst
    M doc/en/changelog.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M src/_pytest/_code/code.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/config/argparsing.py
    M src/_pytest/fixtures.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/python.py
    M src/_pytest/unittest.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    A testing/example_scripts/acceptance/fixture_mock_integration.py
    A testing/example_scripts/collect/package_infinite_recursion/conftest.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
    A testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
    A testing/example_scripts/config/collect_pytest_prefix/conftest.py
    A testing/example_scripts/config/collect_pytest_prefix/test_foo.py
    M testing/logging/test_reporting.py
    M testing/python/collect.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

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

Merge master into features


Compare: https://github.com/pytest-dev/pytest/compare/5f97711377e0...a6cdd0d9da82
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Mon Aug 20 14:32:47 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 20 Aug 2018 11:32:47 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 273670: Fixes capfd so data is
 available after teardown.
Message-ID: <5b7b094fc1757_11c42b2a949ecebc23684@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 273670b2a204f950df93d87baff26b04a47c0400
      https://github.com/pytest-dev/pytest/commit/273670b2a204f950df93d87baff26b04a47c0400
  Author: Tyler Richard <trichard at blueorigin.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  Fixes capfd so data is available after teardown.


  Commit: c24c7e75e26516e032c750d49cec2b840fb128cf
      https://github.com/pytest-dev/pytest/commit/c24c7e75e26516e032c750d49cec2b840fb128cf
  Author: Tyler Richard <trichard at blueorigin.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Added regression test for capfd in a fixture


  Commit: f4c5994d27287e1ac2440a4ae17032f272208cb3
      https://github.com/pytest-dev/pytest/commit/f4c5994d27287e1ac2440a4ae17032f272208cb3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    A changelog/3033.bugfix.rst
    M src/_pytest/capture.py
    M testing/test_capture.py

  Log Message:
  -----------
  Fixtures during teardown can use capsys and capfd to get output from tests

Fix #3033


  Commit: 43657f252f1e4101fad3061c1dfea88c6ad5e055
      https://github.com/pytest-dev/pytest/commit/43657f252f1e4101fad3061c1dfea88c6ad5e055
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

  Changed paths:
    A changelog/3033.bugfix.rst
    M src/_pytest/capture.py
    M testing/test_capture.py

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

Fixtures during teardown can use capsys and capfd to get output from tests


Compare: https://github.com/pytest-dev/pytest/compare/d3bdfc704bc5...43657f252f1e
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Mon Aug 20 19:01:53 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 20 Aug 2018 16:01:53 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 539a22: Added support for
 xfailed and xpassed outcomes to ...
Message-ID: <5b7b48615ec7e_3cda2b15005feed09169c@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 539a22c750e2232ca6f0664976a4940e65c48ef5
      https://github.com/pytest-dev/pytest/commit/539a22c750e2232ca6f0664976a4940e65c48ef5
  Author: wim glenn <hey at wimglenn.com>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3837.feature.rst
    M src/_pytest/pytester.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Added support for xfailed and xpassed outcomes to the ``pytester.RunResult.assert_outcomes`` signature.


  Commit: 044d2b8e6e4717a3cbc5316117e1433098c3fe08
      https://github.com/pytest-dev/pytest/commit/044d2b8e6e4717a3cbc5316117e1433098c3fe08
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3837.feature.rst
    M src/_pytest/pytester.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Merge pull request #3838 from wimglenn/runresult_xfail

Support xfailed and xpassed outcomes in RunResult.


Compare: https://github.com/pytest-dev/pytest/compare/a6cdd0d9da82...044d2b8e6e47
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Tue Aug 21 19:12:34 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 21 Aug 2018 16:12:34 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7d9b19: Refactoring: Separated
 suspend from snapping (stop...
Message-ID: <5b7c9c627fef8_7fea2ae8a7392ed836484@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7d9b198f734f7d1968c88476545da29fb90c1040
      https://github.com/pytest-dev/pytest/commit/7d9b198f734f7d1968c88476545da29fb90c1040
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  Refactoring: Separated suspend from snapping (stopped always snapping when suspending - solves bug but still missing tests), reorganized functions and context managers.


  Commit: 2255892d65810cc4db2b82e2621ed313a0c47f7f
      https://github.com/pytest-dev/pytest/commit/2255892d65810cc4db2b82e2621ed313a0c47f7f
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Improved test to cover more cases.


  Commit: 9e382e8d29f0563925eedb3dc5139aaee72a1e1c
      https://github.com/pytest-dev/pytest/commit/9e382e8d29f0563925eedb3dc5139aaee72a1e1c
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Fixed test.


  Commit: 8b2c91836b507727141b12b1f47c8d29ef744d1e
      https://github.com/pytest-dev/pytest/commit/8b2c91836b507727141b12b1f47c8d29ef744d1e
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  Fixed activation and used just runtest_protocol hook


  Commit: 0564b52c0e1ecdce87b98f902091f3e06a01cc13
      https://github.com/pytest-dev/pytest/commit/0564b52c0e1ecdce87b98f902091f3e06a01cc13
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M src/_pytest/debugging.py
    M src/_pytest/setuponly.py
    M testing/logging/test_reporting.py
    M testing/test_capture.py

  Log Message:
  -----------
  Fixed integration with other modules/tests


  Commit: 7ea4992f169edf84eec10735be688523759d4543
      https://github.com/pytest-dev/pytest/commit/7ea4992f169edf84eec10735be688523759d4543
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py
    M testing/logging/test_reporting.py
    M testing/test_capture.py

  Log Message:
  -----------
  Fixed linting.


  Commit: d611b035891f481570721d105d392db642412368
      https://github.com/pytest-dev/pytest/commit/d611b035891f481570721d105d392db642412368
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Parametrized tests for capfd as well. Separated global capture test.


  Commit: 70ebab3537f52163989df6ca6832d6dbb77f41bf
      https://github.com/pytest-dev/pytest/commit/70ebab3537f52163989df6ca6832d6dbb77f41bf
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

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

  Log Message:
  -----------
  Renamed snap_global_capture to read_global_capture.


  Commit: f1079a82222e06406c60db17492fb275b8fac6c1
      https://github.com/pytest-dev/pytest/commit/f1079a82222e06406c60db17492fb275b8fac6c1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

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

  Log Message:
  -----------
  Merge pull request #3832 from Sup3rGeo/bugfix/capsys-with-cli-logging

Bugfix/capsys with cli logging (again)


Compare: https://github.com/pytest-dev/pytest/compare/43657f252f1e...f1079a82222e
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Wed Aug 22 07:17:10 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 22 Aug 2018 04:17:10 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 07a560: Fix collection error
 when tests is specified with ...
Message-ID: <5b7d463639090_48272ae755b52ec8323d4@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 07a560ff246a28e4ab8567404d7f55afb40a3c36
      https://github.com/pytest-dev/pytest/commit/07a560ff246a28e4ab8567404d7f55afb40a3c36
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    A changelog/3843.bugfix.rst
    M src/_pytest/main.py
    M testing/acceptance_test.py

  Log Message:
  -----------
  Fix collection error when tests is specified with --doctest-modules

The problem was that _matchnodes would receive two items: [DoctestModule, Module]. It would then collect the first one, *cache it*, and fail to match against the name in the command line. Next, it would reuse the cached item (DoctestModule) instead of collecting the Module which would eventually find the "test" name on it.

Added the type of the node to the cache key to avoid this problem, although I'm not a big fan of caches that have different key types.

Fix #3843


  Commit: 2137e2b15b3261d2ee1af7d7ed2a5b0ae4dbfa4c
      https://github.com/pytest-dev/pytest/commit/2137e2b15b3261d2ee1af7d7ed2a5b0ae4dbfa4c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    A changelog/3843.bugfix.rst
    M src/_pytest/main.py
    M testing/acceptance_test.py

  Log Message:
  -----------
  Merge pull request #3846 from nicoddemus/issue-3843

Fix collection error when tests is specified with --doctest-modules


Compare: https://github.com/pytest-dev/pytest/compare/3b521bedf8a5...2137e2b15b32
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Wed Aug 22 18:03:57 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 22 Aug 2018 15:03:57 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a12ead: resolving Issue #3824 -
 expanding docs
Message-ID: <5b7dddcd92d74_5a1a2ac40b46aed43729@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: a12eadd9ef32a8312d49669d98aa533247db2fec
      https://github.com/pytest-dev/pytest/commit/a12eadd9ef32a8312d49669d98aa533247db2fec
  Author: Jennifer Rinker <rink at win.dtu.dk>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3824.doc.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  resolving Issue #3824 - expanding docs


  Commit: 5a7aa123ea29987287a4e01b8e61aacce282cd40
      https://github.com/pytest-dev/pytest/commit/5a7aa123ea29987287a4e01b8e61aacce282cd40
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M doc/en/example/pythoncollection.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Improve docs formatting


  Commit: 17eec5b97e7efe256e76b733c26048fb2d29c599
      https://github.com/pytest-dev/pytest/commit/17eec5b97e7efe256e76b733c26048fb2d29c599
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3824.doc.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Merge pull request #3856 from jennirinker/master

Resolving Issue #3824


Compare: https://github.com/pytest-dev/pytest/compare/2137e2b15b32...17eec5b97e7e
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Thu Aug 23 05:05:33 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 23 Aug 2018 02:05:33 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 0fc4a8: py.builtins._totext ->
 string literals or six.text...
Message-ID: <5b7e78ddea452_1e0b2ab41a0f4ecc22120@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0fc4a806e517ed64717df107a9dca3995326a06f
      https://github.com/pytest-dev/pytest/commit/0fc4a806e517ed64717df107a9dca3995326a06f
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/_pytest/outcomes.py
    M src/_pytest/python.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  py.builtins._totext -> string literals or six.text_type


  Commit: c2cd3378864ba5e3756413e41042b30742030f04
      https://github.com/pytest-dev/pytest/commit/c2cd3378864ba5e3756413e41042b30742030f04
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M bench/empty.py
    M doc/en/example/assertion/failure_demo.py
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M testing/code/test_source.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  py.builtin.exec_ => six.exec_


  Commit: dccac69d82b5677bcd8ec7775a12b0d13f6e69ac
      https://github.com/pytest-dev/pytest/commit/dccac69d82b5677bcd8ec7775a12b0d13f6e69ac
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M testing/test_assertion.py

  Log Message:
  -----------
  py.builtin.text -> six.text_type


  Commit: 7099ea9bb0a4fa2b03d3793729bf7cf3254aa04f
      https://github.com/pytest-dev/pytest/commit/7099ea9bb0a4fa2b03d3793729bf7cf3254aa04f
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/_pytest/fixtures.py
    M src/_pytest/runner.py
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  py.builtin._reraise -> six.reraise


  Commit: 6f7365509dbf3f734c160e9fe94dfc99f6b0f6fd
      https://github.com/pytest-dev/pytest/commit/6f7365509dbf3f734c160e9fe94dfc99f6b0f6fd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M bench/empty.py
    M doc/en/example/assertion/failure_demo.py
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/fixtures.py
    M src/_pytest/outcomes.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M src/_pytest/runner.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #3860 from asottile/purge_more_py

Purge more usage of `py` module


Compare: https://github.com/pytest-dev/pytest/compare/17eec5b97e7e...6f7365509dbf
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Thu Aug 23 18:02:41 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 23 Aug 2018 15:02:41 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] cd07c4: Use unittest.mock if is
 only aviable
Message-ID: <5b7f2f01b2d59_207cc2ab383a98ed4505b8@hookshot-fe-dfcc362.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: cd07c4d4ffad1c9a6fa1c1d8857e7aee1290ccf8
      https://github.com/pytest-dev/pytest/commit/cd07c4d4ffad1c9a6fa1c1d8857e7aee1290ccf8
  Author: Ond?ej S?kup <mimi.vx at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M testing/example_scripts/acceptance/fixture_mock_integration.py

  Log Message:
  -----------
  Use unittest.mock if is only aviable

from Python 3.3 is mock part of python standard library in unittest namespace


  Commit: d10d59c013d9575940750cd6c7eed44603bf7597
      https://github.com/pytest-dev/pytest/commit/d10d59c013d9575940750cd6c7eed44603bf7597
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M testing/example_scripts/acceptance/fixture_mock_integration.py

  Log Message:
  -----------
  Merge pull request #3858 from mimi1vx/test_mock

Use unittest.mock if is only aviable


Compare: https://github.com/pytest-dev/pytest/compare/d54aa8ce13c7...d10d59c013d9
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Fri Aug 24 06:28:53 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 24 Aug 2018 03:28:53 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 3f3368: Move information on
 `pip install -e` to the top
Message-ID: <5b7fdde5c3e1c_29342ad87beb8ed4881d9@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 3f336869e2e632c6f66432065073a45046f39ccc
      https://github.com/pytest-dev/pytest/commit/3f336869e2e632c6f66432065073a45046f39ccc
  Author: Gandalf Saxe <gandalfsaxe at gmail.com>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Move information on `pip install -e` to the top

Should fix complaints in #2421.


  Commit: 40b4fe64af7446f56b612d0ea26bb2e0a5b4705a
      https://github.com/pytest-dev/pytest/commit/40b4fe64af7446f56b612d0ea26bb2e0a5b4705a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

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


  Commit: c82906105c7f6f233ab7d08cdb9bf6b64c0f81e3
      https://github.com/pytest-dev/pytest/commit/c82906105c7f6f233ab7d08cdb9bf6b64c0f81e3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Merge pull request #3865 from GandalfSaxe/patch-1

Move information on `pip install -e` to the top


Compare: https://github.com/pytest-dev/pytest/compare/4c147407987c...c82906105c7f
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Fri Aug 24 21:09:36 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 24 Aug 2018 18:09:36 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 14ffad: correct cmdclass
Message-ID: <5b80ac5065250_1c262ad93aa64ecc844c1@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 14ffadf004f8111338d201dcd7883b714df09a4d
      https://github.com/pytest-dev/pytest/commit/14ffadf004f8111338d201dcd7883b714df09a4d
  Author: Andrew Champion <awchampion at gmail.com>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  correct cmdclass


  Commit: f6948597e41e4e8029345d42bffe67f36d797e3a
      https://github.com/pytest-dev/pytest/commit/f6948597e41e4e8029345d42bffe67f36d797e3a
  Author: Andrew Champion <awchampion at gmail.com>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    A changelog/3870.doc.rst

  Log Message:
  -----------
  add to changelog


  Commit: 72a58bbafef9e09b1a527ae7c2e1b2a5b17abd0a
      https://github.com/pytest-dev/pytest/commit/72a58bbafef9e09b1a527ae7c2e1b2a5b17abd0a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    A changelog/3870.doc.rst
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Merge pull request #3871 from schmamps/cmdclass

Correct cmdclass for doc: Good Integration Practices


Compare: https://github.com/pytest-dev/pytest/compare/c82906105c7f...72a58bbafef9
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sat Aug 25 09:44:11 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 25 Aug 2018 06:44:11 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d0bd01: Collect any tests from
 a package's __init__.py
Message-ID: <5b815d2b19bcb_631a2abe407f4ecc101791@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d0bd01beca0308cfb263ec7f44c9acf0933a1fc0
      https://github.com/pytest-dev/pytest/commit/d0bd01beca0308cfb263ec7f44c9acf0933a1fc0
  Author: turturica <Ionut Turturica>
  Date:   2018-08-09 (Thu, 09 Aug 2018)

  Changed paths:
    M src/_pytest/python.py

  Log Message:
  -----------
  Collect any tests from a package's __init__.py


  Commit: e4f76f63505aaa3574e4e71b57fe9b173ed85225
      https://github.com/pytest-dev/pytest/commit/e4f76f63505aaa3574e4e71b57fe9b173ed85225
  Author: turturica <Ionut Turturica>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M AUTHORS
    M CHANGELOG.rst
    A changelog/3033.bugfix.rst
    R changelog/3771.bugfix.rst
    R changelog/3775.bugfix.rst
    R changelog/3788.bugfix.rst
    A changelog/3816.bugfix.rst
    A changelog/3819.bugfix.rst
    A changelog/3824.doc.rst
    A changelog/3826.trivial.rst
    A changelog/3833.doc.rst
    A changelog/3843.bugfix.rst
    A changelog/3845.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.2.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/reference.rst
    M doc/en/skipping.rst
    M src/_pytest/_code/code.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/config/argparsing.py
    M src/_pytest/debugging.py
    M src/_pytest/fixtures.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M src/_pytest/setuponly.py
    M src/_pytest/terminal.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/logging/test_reporting.py
    M testing/python/collect.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_terminal.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854


  Commit: 4d3c1ab4f09ad352b9b0a274f0d802826771e4ed
      https://github.com/pytest-dev/pytest/commit/4d3c1ab4f09ad352b9b0a274f0d802826771e4ed
  Author: turturica <Ionut Turturica>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/_pytest/python.py
    M testing/python/collect.py

  Log Message:
  -----------
  Fixes #3854


  Commit: 5f8b50c0946b17d5ee5054066cd2ee6dd75e187b
      https://github.com/pytest-dev/pytest/commit/5f8b50c0946b17d5ee5054066cd2ee6dd75e187b
  Author: turturica <Ionut Turturica>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

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

  Log Message:
  -----------
  Address #3796 and add a test for it.


  Commit: 72e6482994974741ddc2058807cf4d3f7b771ced
      https://github.com/pytest-dev/pytest/commit/72e6482994974741ddc2058807cf4d3f7b771ced
  Author: turturica <Ionut Turturica>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M src/_pytest/python.py

  Log Message:
  -----------
  Make linting happy.


  Commit: 3396225f74561f741dcc576e63c6f169bc08eda5
      https://github.com/pytest-dev/pytest/commit/3396225f74561f741dcc576e63c6f169bc08eda5
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M bench/empty.py
    A changelog/3848.bugfix.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/multipython.py
    M doc/en/goodpractices.rst
    M src/_pytest/_code/_py2traceback.py
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M src/_pytest/config/argparsing.py
    M src/_pytest/fixtures.py
    M src/_pytest/outcomes.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M src/_pytest/runner.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/example_scripts/acceptance/fixture_mock_integration.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_parseopt.py
    M testing/test_pdb.py
    M testing/test_pytester.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854


  Commit: 459b040d2179ba6af0a8c51c1134a9979331959c
      https://github.com/pytest-dev/pytest/commit/459b040d2179ba6af0a8c51c1134a9979331959c
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Fix dedent after merge.


  Commit: e3df1031ca2662763a5d9ad7d9282e62accb8821
      https://github.com/pytest-dev/pytest/commit/e3df1031ca2662763a5d9ad7d9282e62accb8821
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Add encoding: utf8 for python 2.7


  Commit: dce8df45d5b86c7b20802ee790a8c6da2ecd55cb
      https://github.com/pytest-dev/pytest/commit/dce8df45d5b86c7b20802ee790a8c6da2ecd55cb
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    A changelog/3796.bugfix.rst
    A changelog/3854.bugfix.rst
    M testing/python/fixture.py

  Log Message:
  -----------
  Added changelog items.


  Commit: f0226e9329d364084be6bc22f0c11a8053ae9d9c
      https://github.com/pytest-dev/pytest/commit/f0226e9329d364084be6bc22f0c11a8053ae9d9c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M testing/python/collect.py

  Log Message:
  -----------
  Fix test_package_ordering on Windows


  Commit: 8cf0e46bbf51bcf1d95019ce7c4d501e8cc4b7d7
      https://github.com/pytest-dev/pytest/commit/8cf0e46bbf51bcf1d95019ce7c4d501e8cc4b7d7
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M changelog/3796.bugfix.rst
    M changelog/3854.bugfix.rst
    M testing/python/collect.py

  Log Message:
  -----------
  test_package_ordering: Collect *.py, but keep a mix of case for filenames. The test doesn't make sense for Windows, because of its case-insensitivity.


  Commit: 1e4ecda8845dcf32bdfd395063b797a91d54e80d
      https://github.com/pytest-dev/pytest/commit/1e4ecda8845dcf32bdfd395063b797a91d54e80d
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Fix the package fixture ordering in Windows.


  Commit: c336449729659ede3f3f2535172f911a8c268b86
      https://github.com/pytest-dev/pytest/commit/c336449729659ede3f3f2535172f911a8c268b86
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Make linting happy. Argh.


  Commit: be4b359c7430eef2b18041e0dab2fa5e4ee7ec22
      https://github.com/pytest-dev/pytest/commit/be4b359c7430eef2b18041e0dab2fa5e4ee7ec22
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    A changelog/3796.bugfix.rst
    A changelog/3854.bugfix.rst
    M src/_pytest/fixtures.py
    M src/_pytest/python.py
    M testing/python/collect.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3861 from jonozzz/fix-3854

Fix #3854


Compare: https://github.com/pytest-dev/pytest/compare/72a58bbafef9...be4b359c7430
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sat Aug 25 19:14:29 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 25 Aug 2018 16:14:29 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 415fcb: Travis: use
 TOXENV=linting for linting stage
Message-ID: <5b81e2d52c46a_69f52aede7506ec81714e@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 415fcb912bb7c877a31150c53e42275644e70f46
      https://github.com/pytest-dev/pytest/commit/415fcb912bb7c877a31150c53e42275644e70f46
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Travis: use TOXENV=linting for linting stage

This will run it with `--show-diff-on-failure` then, and helps to keep
it in line / in a central place.


  Commit: 71b4995775e49bb4e7ddd024a486a96f762b7a91
      https://github.com/pytest-dev/pytest/commit/71b4995775e49bb4e7ddd024a486a96f762b7a91
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge pull request #3874 from blueyed/improve-pre-commit

Travis: use TOXENV=linting for linting stage


Compare: https://github.com/pytest-dev/pytest/compare/be4b359c7430...71b4995775e4
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sun Aug 26 07:50:19 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 26 Aug 2018 04:50:19 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] de6f2c: Collect tests from
 __init__.py files if they match...
Message-ID: <5b8293fb23b4b_6fc62aea8bc5eedc3340@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: de6f2c0336a03e34ed5b060f13c3932e9710db14
      https://github.com/pytest-dev/pytest/commit/de6f2c0336a03e34ed5b060f13c3932e9710db14
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    A changelog/3773.bugfix.rst
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    A testing/example_scripts/collect/collect_init_tests/pytest.ini
    A testing/example_scripts/collect/collect_init_tests/tests/__init__.py
    A testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
    M testing/test_collection.py

  Log Message:
  -----------
  Collect tests from __init__.py files if they match 'python_files'

Fix #3773


  Commit: dd5f5ca4cb1713bdddc2c9cba73dcd7b5251b332
      https://github.com/pytest-dev/pytest/commit/dd5f5ca4cb1713bdddc2c9cba73dcd7b5251b332
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    A changelog/3773.bugfix.rst
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    A testing/example_scripts/collect/collect_init_tests/pytest.ini
    A testing/example_scripts/collect/collect_init_tests/tests/__init__.py
    A testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #3872 from nicoddemus/tests-in-init-files

Collect tests from __init__.py files if they match 'python_files'


Compare: https://github.com/pytest-dev/pytest/compare/71b4995775e4...dd5f5ca4cb17
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sun Aug 26 07:53:58 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 26 Aug 2018 04:53:58 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f872fc: Remove dangerous
 sys.path manipulations in test_pl...
Message-ID: <5b8294d6a64f1_40272b0493caced036920@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: f872fcb5d0ba99bce5b1017c067d3b18ecccf15c
      https://github.com/pytest-dev/pytest/commit/f872fcb5d0ba99bce5b1017c067d3b18ecccf15c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Remove dangerous sys.path manipulations in test_pluginmanager

Noticed these while working in something else


  Commit: b0541e9d317f40390c9bbc69af2e8a8a426502df
      https://github.com/pytest-dev/pytest/commit/b0541e9d317f40390c9bbc69af2e8a8a426502df
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M testing/test_monkeypatch.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Correctly restore sys.path in test and remove dead code in test_pytester

The code in test_pytester has been refactored into a class right
above the dead code, and the code has been left there by mistake
apparently.


  Commit: 2577a6ce8abef54fca9c09308fe4e44ebec93762
      https://github.com/pytest-dev/pytest/commit/2577a6ce8abef54fca9c09308fe4e44ebec93762
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M testing/test_monkeypatch.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Merge pull request #3873 from nicoddemus/sys-path-fix

Remove dangerous sys.path manipulations in test_pluginmanager


Compare: https://github.com/pytest-dev/pytest/compare/dd5f5ca4cb17...2577a6ce8abe
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sun Aug 26 08:17:42 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 26 Aug 2018 05:17:42 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 3da88d: Use skip_install for
 testing tox env
Message-ID: <5b829a66494ed_d0b2ae526a84ec8823c3@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 3da88d794f8b50b15f2bfc7012fd2ee9d262fd6f
      https://github.com/pytest-dev/pytest/commit/3da88d794f8b50b15f2bfc7012fd2ee9d262fd6f
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Use skip_install for testing tox env


  Commit: c15b537e3d06bc1df864e6dd4f7f7cbe0b1052c4
      https://github.com/pytest-dev/pytest/commit/c15b537e3d06bc1df864e6dd4f7f7cbe0b1052c4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3878 from asottile/skip_install_linting

Use skip_install for testing tox env


Compare: https://github.com/pytest-dev/pytest/compare/2577a6ce8abe...c15b537e3d06
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sun Aug 26 08:19:04 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 26 Aug 2018 05:19:04 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d3f532: tox: coveralls: also
 report to codecov
Message-ID: <5b829ab89bf51_1f8b2adb13362ec81921e@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d3f5324386cf64bb1be2c64b9f885cfaa39a3604
      https://github.com/pytest-dev/pytest/commit/d3f5324386cf64bb1be2c64b9f885cfaa39a3604
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  tox: coveralls: also report to codecov

This is meant to get base coverage on master for codecov.


  Commit: 4d19b9434793a5a688f2b13d507618650f891ed9
      https://github.com/pytest-dev/pytest/commit/4d19b9434793a5a688f2b13d507618650f891ed9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3877 from blueyed/codecov-master

tox: coveralls: also report to codecov


Compare: https://github.com/pytest-dev/pytest/compare/c15b537e3d06...4d19b9434793
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sun Aug 26 08:22:32 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 26 Aug 2018 05:22:32 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 508774: Code block: :: missing
 and 4 spaces instead of 5
Message-ID: <5b829b883cabd_6a642b01a10a0ec4601f7@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 508774742e3f55caa3d1b2942738ed778a4cb0cb
      https://github.com/pytest-dev/pytest/commit/508774742e3f55caa3d1b2942738ed778a4cb0cb
  Author: Gandalf Saxe <gandalfsaxe at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Code block: :: missing and 4 spaces instead of 5

I just noticed the newly committed code block doesn't format as a code block without `::` in the paragraph before. Perhaps doesn't make a difference, but also corrected 5 spaces to 4 which seems standard.


  Commit: 7ae23901d3198294cb8073c0b6daa768d3985fee
      https://github.com/pytest-dev/pytest/commit/7ae23901d3198294cb8073c0b6daa768d3985fee
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Merge pull request #3881 from GandalfSaxe/patch-2

Code block: :: missing and 4 spaces instead of 5


Compare: https://github.com/pytest-dev/pytest/compare/4d19b9434793...7ae23901d319
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sun Aug 26 14:57:53 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 26 Aug 2018 11:57:53 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] c31018: Preparing release
 version 3.7.3
Message-ID: <5b82f831f241a_24a02b0610d34ec470930@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

  Branch: refs/tags/3.7.3
  Home:   https://github.com/pytest-dev/pytest
  Commit: c31018d9bcf0d206bcb134a376ea0f8e880510f1
      https://github.com/pytest-dev/pytest/commit/c31018d9bcf0d206bcb134a376ea0f8e880510f1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3033.bugfix.rst
    R changelog/3773.bugfix.rst
    R changelog/3796.bugfix.rst
    R changelog/3816.bugfix.rst
    R changelog/3819.bugfix.rst
    R changelog/3824.doc.rst
    R changelog/3826.trivial.rst
    R changelog/3833.doc.rst
    R changelog/3843.bugfix.rst
    R changelog/3845.trivial.rst
    R changelog/3848.bugfix.rst
    R changelog/3854.bugfix.rst
    R changelog/3870.doc.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.3.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.7.3


  Commit: b69f853acbc3ff705751b69f8955a0e25a2bf92c
      https://github.com/pytest-dev/pytest/commit/b69f853acbc3ff705751b69f8955a0e25a2bf92c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Tweak CHANGELOG for 3.7.3


  Commit: 70bdacf01aa0917d4499c1aff4f9f2061968a655
      https://github.com/pytest-dev/pytest/commit/70bdacf01aa0917d4499c1aff4f9f2061968a655
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M doc/en/example/pythoncollection.rst

  Log Message:
  -----------
  Fix collection example docs


Compare: https://github.com/pytest-dev/pytest/compare/c31018d9bcf0^...70bdacf01aa0
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sun Aug 26 15:41:41 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 26 Aug 2018 12:41:41 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] c31018: Preparing release
 version 3.7.3
Message-ID: <5b830275aa840_7d9e2ab6c2ad8ed4100531@hookshot-fe-b0febf1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: c31018d9bcf0d206bcb134a376ea0f8e880510f1
      https://github.com/pytest-dev/pytest/commit/c31018d9bcf0d206bcb134a376ea0f8e880510f1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3033.bugfix.rst
    R changelog/3773.bugfix.rst
    R changelog/3796.bugfix.rst
    R changelog/3816.bugfix.rst
    R changelog/3819.bugfix.rst
    R changelog/3824.doc.rst
    R changelog/3826.trivial.rst
    R changelog/3833.doc.rst
    R changelog/3843.bugfix.rst
    R changelog/3845.trivial.rst
    R changelog/3848.bugfix.rst
    R changelog/3854.bugfix.rst
    R changelog/3870.doc.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.3.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.7.3


  Commit: b69f853acbc3ff705751b69f8955a0e25a2bf92c
      https://github.com/pytest-dev/pytest/commit/b69f853acbc3ff705751b69f8955a0e25a2bf92c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Tweak CHANGELOG for 3.7.3


  Commit: 70bdacf01aa0917d4499c1aff4f9f2061968a655
      https://github.com/pytest-dev/pytest/commit/70bdacf01aa0917d4499c1aff4f9f2061968a655
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M doc/en/example/pythoncollection.rst

  Log Message:
  -----------
  Fix collection example docs


  Commit: e74ad4ff9b89936c2ef9c4e34054ae9d3ba1e31f
      https://github.com/pytest-dev/pytest/commit/e74ad4ff9b89936c2ef9c4e34054ae9d3ba1e31f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M CHANGELOG.rst

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


  Commit: a31967431f3d112da547ddbd05c4efdb90cb8ad6
      https://github.com/pytest-dev/pytest/commit/a31967431f3d112da547ddbd05c4efdb90cb8ad6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3033.bugfix.rst
    R changelog/3773.bugfix.rst
    R changelog/3796.bugfix.rst
    R changelog/3816.bugfix.rst
    R changelog/3819.bugfix.rst
    R changelog/3824.doc.rst
    R changelog/3826.trivial.rst
    R changelog/3833.doc.rst
    R changelog/3843.bugfix.rst
    R changelog/3845.trivial.rst
    R changelog/3848.bugfix.rst
    R changelog/3854.bugfix.rst
    R changelog/3870.doc.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.3.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Merge pull request #3882 from nicoddemus/release-3.7.3

Release 3.7.3


Compare: https://github.com/pytest-dev/pytest/compare/7ae23901d319...a31967431f3d
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Sun Aug 26 18:41:32 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 26 Aug 2018 15:41:32 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d0bd01: Collect any tests from
 a package's __init__.py
Message-ID: <5b832c9c5becc_4ed2afd78678ec875519@hookshot-fe-b0febf1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: d0bd01beca0308cfb263ec7f44c9acf0933a1fc0
      https://github.com/pytest-dev/pytest/commit/d0bd01beca0308cfb263ec7f44c9acf0933a1fc0
  Author: turturica <Ionut Turturica>
  Date:   2018-08-09 (Thu, 09 Aug 2018)

  Changed paths:
    M src/_pytest/python.py

  Log Message:
  -----------
  Collect any tests from a package's __init__.py


  Commit: 273670b2a204f950df93d87baff26b04a47c0400
      https://github.com/pytest-dev/pytest/commit/273670b2a204f950df93d87baff26b04a47c0400
  Author: Tyler Richard <trichard at blueorigin.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  Fixes capfd so data is available after teardown.


  Commit: c24c7e75e26516e032c750d49cec2b840fb128cf
      https://github.com/pytest-dev/pytest/commit/c24c7e75e26516e032c750d49cec2b840fb128cf
  Author: Tyler Richard <trichard at blueorigin.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Added regression test for capfd in a fixture


  Commit: f4c5994d27287e1ac2440a4ae17032f272208cb3
      https://github.com/pytest-dev/pytest/commit/f4c5994d27287e1ac2440a4ae17032f272208cb3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-18 (Sat, 18 Aug 2018)

  Changed paths:
    A changelog/3033.bugfix.rst
    M src/_pytest/capture.py
    M testing/test_capture.py

  Log Message:
  -----------
  Fixtures during teardown can use capsys and capfd to get output from tests

Fix #3033


  Commit: 7d9b198f734f7d1968c88476545da29fb90c1040
      https://github.com/pytest-dev/pytest/commit/7d9b198f734f7d1968c88476545da29fb90c1040
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  Refactoring: Separated suspend from snapping (stopped always snapping when suspending - solves bug but still missing tests), reorganized functions and context managers.


  Commit: 2255892d65810cc4db2b82e2621ed313a0c47f7f
      https://github.com/pytest-dev/pytest/commit/2255892d65810cc4db2b82e2621ed313a0c47f7f
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Improved test to cover more cases.


  Commit: 9e382e8d29f0563925eedb3dc5139aaee72a1e1c
      https://github.com/pytest-dev/pytest/commit/9e382e8d29f0563925eedb3dc5139aaee72a1e1c
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Fixed test.


  Commit: 8b2c91836b507727141b12b1f47c8d29ef744d1e
      https://github.com/pytest-dev/pytest/commit/8b2c91836b507727141b12b1f47c8d29ef744d1e
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  Fixed activation and used just runtest_protocol hook


  Commit: 0564b52c0e1ecdce87b98f902091f3e06a01cc13
      https://github.com/pytest-dev/pytest/commit/0564b52c0e1ecdce87b98f902091f3e06a01cc13
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M src/_pytest/debugging.py
    M src/_pytest/setuponly.py
    M testing/logging/test_reporting.py
    M testing/test_capture.py

  Log Message:
  -----------
  Fixed integration with other modules/tests


  Commit: 7ea4992f169edf84eec10735be688523759d4543
      https://github.com/pytest-dev/pytest/commit/7ea4992f169edf84eec10735be688523759d4543
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M src/_pytest/capture.py
    M testing/logging/test_reporting.py
    M testing/test_capture.py

  Log Message:
  -----------
  Fixed linting.


  Commit: e620798d33346187005b44ab0ff96decd5b5e95a
      https://github.com/pytest-dev/pytest/commit/e620798d33346187005b44ab0ff96decd5b5e95a
  Author: wim glenn <hey at wimglenn.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    A changelog/3833.doc.rst
    M doc/en/reference.rst
    M src/_pytest/pytester.py

  Log Message:
  -----------
  more autodocs for pytester


  Commit: e4bea9068bf800f1610b228457232cbdfd949343
      https://github.com/pytest-dev/pytest/commit/e4bea9068bf800f1610b228457232cbdfd949343
  Author: wim glenn <hey at wimglenn.com>
  Date:   2018-08-19 (Sun, 19 Aug 2018)

  Changed paths:
    M changelog/3833.doc.rst

  Log Message:
  -----------
  end of line for this file, perhaps?


  Commit: 308d789d9246a9beb97e935c4ce3efc615a66f71
      https://github.com/pytest-dev/pytest/commit/308d789d9246a9beb97e935c4ce3efc615a66f71
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

  Changed paths:
    A changelog/3833.doc.rst
    M doc/en/reference.rst
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Merge pull request #3835 from wimglenn/issue3833

more autodocs for pytester


  Commit: d611b035891f481570721d105d392db642412368
      https://github.com/pytest-dev/pytest/commit/d611b035891f481570721d105d392db642412368
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Parametrized tests for capfd as well. Separated global capture test.


  Commit: 4de247cfa0e5067d7270ae2de6fe1f2dac9bd592
      https://github.com/pytest-dev/pytest/commit/4de247cfa0e5067d7270ae2de6fe1f2dac9bd592
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

  Changed paths:
    M .pre-commit-config.yaml

  Log Message:
  -----------
  Use more flexible `language_version: python3`


  Commit: d3bdfc704bc53b3323da2b4e4d76aac1984c8725
      https://github.com/pytest-dev/pytest/commit/d3bdfc704bc53b3323da2b4e4d76aac1984c8725
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

  Changed paths:
    M .pre-commit-config.yaml

  Log Message:
  -----------
  Merge pull request #3839 from asottile/more_flexible

Use more flexible `language_version: python3`


  Commit: 70ebab3537f52163989df6ca6832d6dbb77f41bf
      https://github.com/pytest-dev/pytest/commit/70ebab3537f52163989df6ca6832d6dbb77f41bf
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

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

  Log Message:
  -----------
  Renamed snap_global_capture to read_global_capture.


  Commit: 43657f252f1e4101fad3061c1dfea88c6ad5e055
      https://github.com/pytest-dev/pytest/commit/43657f252f1e4101fad3061c1dfea88c6ad5e055
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

  Changed paths:
    A changelog/3033.bugfix.rst
    M src/_pytest/capture.py
    M testing/test_capture.py

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

Fixtures during teardown can use capsys and capfd to get output from tests


  Commit: 223eef6261ef31393452694fcec257f8a389fd94
      https://github.com/pytest-dev/pytest/commit/223eef6261ef31393452694fcec257f8a389fd94
  Author: Sankt Petersbug <sankt.petersbug at gmail.com>
  Date:   2018-08-20 (Mon, 20 Aug 2018)

  Changed paths:
    A changelog/3816.bugfix.rst
    M src/_pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Fix '--show-capture=no' capture teardown logs

Add a check before printing teardown logs.

'print_teardown_sections' method does not check '--show-capture' option
value, and teardown logs are always printed.

Resolves: #3816


  Commit: f1079a82222e06406c60db17492fb275b8fac6c1
      https://github.com/pytest-dev/pytest/commit/f1079a82222e06406c60db17492fb275b8fac6c1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

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

  Log Message:
  -----------
  Merge pull request #3832 from Sup3rGeo/bugfix/capsys-with-cli-logging

Bugfix/capsys with cli logging (again)


  Commit: 672f4bb5aa9fdb7303a9144507b2aea19c99b534
      https://github.com/pytest-dev/pytest/commit/672f4bb5aa9fdb7303a9144507b2aea19c99b534
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M changelog/3816.bugfix.rst

  Log Message:
  -----------
  Improve CHANGELOG


  Commit: 717775a1c69e21fff65c73d2a33e4bdc6a15c50e
      https://github.com/pytest-dev/pytest/commit/717775a1c69e21fff65c73d2a33e4bdc6a15c50e
  Author: Natan Lao <natanlao at users.noreply.github.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M doc/en/skipping.rst

  Log Message:
  -----------
  Remove warning about #568 from documentation

The documentation (https://docs.pytest.org/en/latest/skipping.html) references
issue #568, which has since been fixed.


  Commit: 07a560ff246a28e4ab8567404d7f55afb40a3c36
      https://github.com/pytest-dev/pytest/commit/07a560ff246a28e4ab8567404d7f55afb40a3c36
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    A changelog/3843.bugfix.rst
    M src/_pytest/main.py
    M testing/acceptance_test.py

  Log Message:
  -----------
  Fix collection error when tests is specified with --doctest-modules

The problem was that _matchnodes would receive two items: [DoctestModule, Module]. It would then collect the first one, *cache it*, and fail to match against the name in the command line. Next, it would reuse the cached item (DoctestModule) instead of collecting the Module which would eventually find the "test" name on it.

Added the type of the node to the cache key to avoid this problem, although I'm not a big fan of caches that have different key types.

Fix #3843


  Commit: 80bea79512b28d266dc8b9b9be919426990fc7a3
      https://github.com/pytest-dev/pytest/commit/80bea79512b28d266dc8b9b9be919426990fc7a3
  Author: Natan Lao <natanlao at users.noreply.github.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    A changelog/3845.trivial.rst

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


  Commit: eb8d14519527dc3469c1663ecc1c5bbd9d73d454
      https://github.com/pytest-dev/pytest/commit/eb8d14519527dc3469c1663ecc1c5bbd9d73d454
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M changelog/3845.trivial.rst

  Log Message:
  -----------
  Add link to issue in the CHANGELOG entry


  Commit: 5b2c8fa007624e8b1cbc15e7a67913f00abc8c19
      https://github.com/pytest-dev/pytest/commit/5b2c8fa007624e8b1cbc15e7a67913f00abc8c19
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

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

  Log Message:
  -----------
  Merge pull request #3845 from natanlao/patch-1

Remove warning about #568 from documentation


  Commit: 3b521bedf8a5cbc8e777e383b902c816fd8e9b27
      https://github.com/pytest-dev/pytest/commit/3b521bedf8a5cbc8e777e383b902c816fd8e9b27
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    A changelog/3816.bugfix.rst
    M src/_pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #3841 from sankt-petersbug/fix-3816

Fix '--show-capture=no' capture teardown logs


  Commit: 89446af51ec723cb628f6d2cf16f10ae2628e25d
      https://github.com/pytest-dev/pytest/commit/89446af51ec723cb628f6d2cf16f10ae2628e25d
  Author: wim glenn <hey at wimglenn.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    A changelog/3848.bugfix.rst
    M src/_pytest/pytester.py

  Log Message:
  -----------
  fixed a bunch of unicode bugs in pytester.py


  Commit: 2137e2b15b3261d2ee1af7d7ed2a5b0ae4dbfa4c
      https://github.com/pytest-dev/pytest/commit/2137e2b15b3261d2ee1af7d7ed2a5b0ae4dbfa4c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    A changelog/3843.bugfix.rst
    M src/_pytest/main.py
    M testing/acceptance_test.py

  Log Message:
  -----------
  Merge pull request #3846 from nicoddemus/issue-3843

Fix collection error when tests is specified with --doctest-modules


  Commit: a12eadd9ef32a8312d49669d98aa533247db2fec
      https://github.com/pytest-dev/pytest/commit/a12eadd9ef32a8312d49669d98aa533247db2fec
  Author: Jennifer Rinker <rink at win.dtu.dk>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3824.doc.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  resolving Issue #3824 - expanding docs


  Commit: 5a7aa123ea29987287a4e01b8e61aacce282cd40
      https://github.com/pytest-dev/pytest/commit/5a7aa123ea29987287a4e01b8e61aacce282cd40
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M doc/en/example/pythoncollection.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Improve docs formatting


  Commit: 8e2c7b4979e12429641e91acd46b3357ceecddf2
      https://github.com/pytest-dev/pytest/commit/8e2c7b4979e12429641e91acd46b3357ceecddf2
  Author: wim glenn <wim.glenn at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M testing/test_pytester.py

  Log Message:
  -----------
  Add a failing testcase for PR #3848


  Commit: b08e156b7943db70a94f96943312b912730504aa
      https://github.com/pytest-dev/pytest/commit/b08e156b7943db70a94f96943312b912730504aa
  Author: wim glenn <wim.glenn at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M testing/test_pytester.py

  Log Message:
  -----------
  strip trailing whitespace


  Commit: 917b99e4382626505296e94201dd7f6b253cdd78
      https://github.com/pytest-dev/pytest/commit/917b99e4382626505296e94201dd7f6b253cdd78
  Author: wim glenn <wim.glenn at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/_pytest/config/argparsing.py

  Log Message:
  -----------
  More unicode whack-a-mole

It seems pytest's very comprehensive CI sniffed out a few other places with similar bugs.  Ideally we should find all the places where args are not stringy and solve it at the source, but who knows how many people are relying on the implicit string conversion.  See [here](https://github.com/pytest-dev/pytest/blob/master/src/_pytest/config/__init__.py#L160-L166) for one such problem area (args with a single py.path.local instance is converted here, but a list or tuple containing some are not).


  Commit: cd07c4d4ffad1c9a6fa1c1d8857e7aee1290ccf8
      https://github.com/pytest-dev/pytest/commit/cd07c4d4ffad1c9a6fa1c1d8857e7aee1290ccf8
  Author: Ond?ej S?kup <mimi.vx at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M testing/example_scripts/acceptance/fixture_mock_integration.py

  Log Message:
  -----------
  Use unittest.mock if is only aviable

from Python 3.3 is mock part of python standard library in unittest namespace


  Commit: 17eec5b97e7efe256e76b733c26048fb2d29c599
      https://github.com/pytest-dev/pytest/commit/17eec5b97e7efe256e76b733c26048fb2d29c599
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3824.doc.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Merge pull request #3856 from jennirinker/master

Resolving Issue #3824


  Commit: 8804c7333a9bc26956950443b3d75c657762ba28
      https://github.com/pytest-dev/pytest/commit/8804c7333a9bc26956950443b3d75c657762ba28
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M changelog/3848.bugfix.rst

  Log Message:
  -----------
  Fix CHANGELOG formatting


  Commit: 8bb8b913570f215a9bff505799418ef9034609ec
      https://github.com/pytest-dev/pytest/commit/8bb8b913570f215a9bff505799418ef9034609ec
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/multipython.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/test_argcomplete.py
    M testing/test_assertrewrite.py
    M testing/test_helpconfig.py
    M testing/test_parseopt.py
    M testing/test_pdb.py
    M testing/test_terminal.py

  Log Message:
  -----------
  pyupgrade 1.4: tests


  Commit: 0d65783dce057dbfb276d1d7867037a8467dd20f
      https://github.com/pytest-dev/pytest/commit/0d65783dce057dbfb276d1d7867037a8467dd20f
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/_pytest/_code/_py2traceback.py

  Log Message:
  -----------
  Fix unicode errors when changing to .format(...)


  Commit: e4f76f63505aaa3574e4e71b57fe9b173ed85225
      https://github.com/pytest-dev/pytest/commit/e4f76f63505aaa3574e4e71b57fe9b173ed85225
  Author: turturica <Ionut Turturica>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M AUTHORS
    M CHANGELOG.rst
    A changelog/3033.bugfix.rst
    R changelog/3771.bugfix.rst
    R changelog/3775.bugfix.rst
    R changelog/3788.bugfix.rst
    A changelog/3816.bugfix.rst
    A changelog/3819.bugfix.rst
    A changelog/3824.doc.rst
    A changelog/3826.trivial.rst
    A changelog/3833.doc.rst
    A changelog/3843.bugfix.rst
    A changelog/3845.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.2.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/reference.rst
    M doc/en/skipping.rst
    M src/_pytest/_code/code.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/config/argparsing.py
    M src/_pytest/debugging.py
    M src/_pytest/fixtures.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M src/_pytest/setuponly.py
    M src/_pytest/terminal.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/logging/test_reporting.py
    M testing/python/collect.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_terminal.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854


  Commit: 4d3c1ab4f09ad352b9b0a274f0d802826771e4ed
      https://github.com/pytest-dev/pytest/commit/4d3c1ab4f09ad352b9b0a274f0d802826771e4ed
  Author: turturica <Ionut Turturica>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/_pytest/python.py
    M testing/python/collect.py

  Log Message:
  -----------
  Fixes #3854


  Commit: 0fc4a806e517ed64717df107a9dca3995326a06f
      https://github.com/pytest-dev/pytest/commit/0fc4a806e517ed64717df107a9dca3995326a06f
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/_pytest/outcomes.py
    M src/_pytest/python.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  py.builtins._totext -> string literals or six.text_type


  Commit: c2cd3378864ba5e3756413e41042b30742030f04
      https://github.com/pytest-dev/pytest/commit/c2cd3378864ba5e3756413e41042b30742030f04
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M bench/empty.py
    M doc/en/example/assertion/failure_demo.py
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M testing/code/test_source.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  py.builtin.exec_ => six.exec_


  Commit: dccac69d82b5677bcd8ec7775a12b0d13f6e69ac
      https://github.com/pytest-dev/pytest/commit/dccac69d82b5677bcd8ec7775a12b0d13f6e69ac
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M testing/test_assertion.py

  Log Message:
  -----------
  py.builtin.text -> six.text_type


  Commit: 7099ea9bb0a4fa2b03d3793729bf7cf3254aa04f
      https://github.com/pytest-dev/pytest/commit/7099ea9bb0a4fa2b03d3793729bf7cf3254aa04f
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/_pytest/fixtures.py
    M src/_pytest/runner.py
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  py.builtin._reraise -> six.reraise


  Commit: 6f7365509dbf3f734c160e9fe94dfc99f6b0f6fd
      https://github.com/pytest-dev/pytest/commit/6f7365509dbf3f734c160e9fe94dfc99f6b0f6fd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M bench/empty.py
    M doc/en/example/assertion/failure_demo.py
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/fixtures.py
    M src/_pytest/outcomes.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M src/_pytest/runner.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #3860 from asottile/purge_more_py

Purge more usage of `py` module


  Commit: 85482d575e6a868c829fe6f9b9d9fe3a6cab4a53
      https://github.com/pytest-dev/pytest/commit/85482d575e6a868c829fe6f9b9d9fe3a6cab4a53
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Replace Source with dedent where possible


  Commit: 3f336869e2e632c6f66432065073a45046f39ccc
      https://github.com/pytest-dev/pytest/commit/3f336869e2e632c6f66432065073a45046f39ccc
  Author: Gandalf Saxe <gandalfsaxe at gmail.com>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Move information on `pip install -e` to the top

Should fix complaints in #2421.


  Commit: 52fa8c98bbb518d036eb1fc00dd77af6138b0bb8
      https://github.com/pytest-dev/pytest/commit/52fa8c98bbb518d036eb1fc00dd77af6138b0bb8
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #3864 from asottile/source_to_dedent

Replace Source with dedent where possible


  Commit: d54aa8ce13c7644dc0605f310cd4c0ae5be8d930
      https://github.com/pytest-dev/pytest/commit/d54aa8ce13c7644dc0605f310cd4c0ae5be8d930
  Author: wim glenn <wim.glenn at gmail.com>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    A changelog/3848.bugfix.rst
    M src/_pytest/config/argparsing.py
    M src/_pytest/pytester.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Merge pull request #3848 from wimglenn/pytester_unicode_bugfixes

fixed a bunch of unicode bugs in pytester.py


  Commit: d10d59c013d9575940750cd6c7eed44603bf7597
      https://github.com/pytest-dev/pytest/commit/d10d59c013d9575940750cd6c7eed44603bf7597
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M testing/example_scripts/acceptance/fixture_mock_integration.py

  Log Message:
  -----------
  Merge pull request #3858 from mimi1vx/test_mock

Use unittest.mock if is only aviable


  Commit: 40b4fe64af7446f56b612d0ea26bb2e0a5b4705a
      https://github.com/pytest-dev/pytest/commit/40b4fe64af7446f56b612d0ea26bb2e0a5b4705a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

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


  Commit: f2e35c8c4ff832ee107d851f2c6193fd614b763b
      https://github.com/pytest-dev/pytest/commit/f2e35c8c4ff832ee107d851f2c6193fd614b763b
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/multipython.py
    M src/_pytest/_code/_py2traceback.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/test_argcomplete.py
    M testing/test_assertrewrite.py
    M testing/test_helpconfig.py
    M testing/test_parseopt.py
    M testing/test_pdb.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #3859 from asottile/pyupgrade_1_4

Some pyupgrade 1.4.x changes


  Commit: 99e31f6fb17177b60046dd2fc44c0a313cf4b8aa
      https://github.com/pytest-dev/pytest/commit/99e31f6fb17177b60046dd2fc44c0a313cf4b8aa
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M testing/test_capture.py

  Log Message:
  -----------
  Use `bytes` directly instead of `binary_type`

`bytes` is an alias for `str` in python2.6+


  Commit: 5f8b50c0946b17d5ee5054066cd2ee6dd75e187b
      https://github.com/pytest-dev/pytest/commit/5f8b50c0946b17d5ee5054066cd2ee6dd75e187b
  Author: turturica <Ionut Turturica>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

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

  Log Message:
  -----------
  Address #3796 and add a test for it.


  Commit: 72e6482994974741ddc2058807cf4d3f7b771ced
      https://github.com/pytest-dev/pytest/commit/72e6482994974741ddc2058807cf4d3f7b771ced
  Author: turturica <Ionut Turturica>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M src/_pytest/python.py

  Log Message:
  -----------
  Make linting happy.


  Commit: 4c147407987c19c011f58c4f24999433f9231204
      https://github.com/pytest-dev/pytest/commit/4c147407987c19c011f58c4f24999433f9231204
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #3868 from asottile/bytes_py26_plus

Use `bytes` directly instead of `binary_type`


  Commit: c82906105c7f6f233ab7d08cdb9bf6b64c0f81e3
      https://github.com/pytest-dev/pytest/commit/c82906105c7f6f233ab7d08cdb9bf6b64c0f81e3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Merge pull request #3865 from GandalfSaxe/patch-1

Move information on `pip install -e` to the top


  Commit: 3396225f74561f741dcc576e63c6f169bc08eda5
      https://github.com/pytest-dev/pytest/commit/3396225f74561f741dcc576e63c6f169bc08eda5
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M bench/empty.py
    A changelog/3848.bugfix.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/multipython.py
    M doc/en/goodpractices.rst
    M src/_pytest/_code/_py2traceback.py
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M src/_pytest/config/argparsing.py
    M src/_pytest/fixtures.py
    M src/_pytest/outcomes.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M src/_pytest/runner.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/example_scripts/acceptance/fixture_mock_integration.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_parseopt.py
    M testing/test_pdb.py
    M testing/test_pytester.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854


  Commit: 459b040d2179ba6af0a8c51c1134a9979331959c
      https://github.com/pytest-dev/pytest/commit/459b040d2179ba6af0a8c51c1134a9979331959c
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Fix dedent after merge.


  Commit: 14ffadf004f8111338d201dcd7883b714df09a4d
      https://github.com/pytest-dev/pytest/commit/14ffadf004f8111338d201dcd7883b714df09a4d
  Author: Andrew Champion <awchampion at gmail.com>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  correct cmdclass


  Commit: e3df1031ca2662763a5d9ad7d9282e62accb8821
      https://github.com/pytest-dev/pytest/commit/e3df1031ca2662763a5d9ad7d9282e62accb8821
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Add encoding: utf8 for python 2.7


  Commit: f6948597e41e4e8029345d42bffe67f36d797e3a
      https://github.com/pytest-dev/pytest/commit/f6948597e41e4e8029345d42bffe67f36d797e3a
  Author: Andrew Champion <awchampion at gmail.com>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    A changelog/3870.doc.rst

  Log Message:
  -----------
  add to changelog


  Commit: dce8df45d5b86c7b20802ee790a8c6da2ecd55cb
      https://github.com/pytest-dev/pytest/commit/dce8df45d5b86c7b20802ee790a8c6da2ecd55cb
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    A changelog/3796.bugfix.rst
    A changelog/3854.bugfix.rst
    M testing/python/fixture.py

  Log Message:
  -----------
  Added changelog items.


  Commit: f0226e9329d364084be6bc22f0c11a8053ae9d9c
      https://github.com/pytest-dev/pytest/commit/f0226e9329d364084be6bc22f0c11a8053ae9d9c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M testing/python/collect.py

  Log Message:
  -----------
  Fix test_package_ordering on Windows


  Commit: 8cf0e46bbf51bcf1d95019ce7c4d501e8cc4b7d7
      https://github.com/pytest-dev/pytest/commit/8cf0e46bbf51bcf1d95019ce7c4d501e8cc4b7d7
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M changelog/3796.bugfix.rst
    M changelog/3854.bugfix.rst
    M testing/python/collect.py

  Log Message:
  -----------
  test_package_ordering: Collect *.py, but keep a mix of case for filenames. The test doesn't make sense for Windows, because of its case-insensitivity.


  Commit: 1e4ecda8845dcf32bdfd395063b797a91d54e80d
      https://github.com/pytest-dev/pytest/commit/1e4ecda8845dcf32bdfd395063b797a91d54e80d
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Fix the package fixture ordering in Windows.


  Commit: c336449729659ede3f3f2535172f911a8c268b86
      https://github.com/pytest-dev/pytest/commit/c336449729659ede3f3f2535172f911a8c268b86
  Author: turturica <Ionut Turturica>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Make linting happy. Argh.


  Commit: 72a58bbafef9e09b1a527ae7c2e1b2a5b17abd0a
      https://github.com/pytest-dev/pytest/commit/72a58bbafef9e09b1a527ae7c2e1b2a5b17abd0a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    A changelog/3870.doc.rst
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Merge pull request #3871 from schmamps/cmdclass

Correct cmdclass for doc: Good Integration Practices


  Commit: be4b359c7430eef2b18041e0dab2fa5e4ee7ec22
      https://github.com/pytest-dev/pytest/commit/be4b359c7430eef2b18041e0dab2fa5e4ee7ec22
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    A changelog/3796.bugfix.rst
    A changelog/3854.bugfix.rst
    M src/_pytest/fixtures.py
    M src/_pytest/python.py
    M testing/python/collect.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3861 from jonozzz/fix-3854

Fix #3854


  Commit: de6f2c0336a03e34ed5b060f13c3932e9710db14
      https://github.com/pytest-dev/pytest/commit/de6f2c0336a03e34ed5b060f13c3932e9710db14
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    A changelog/3773.bugfix.rst
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    A testing/example_scripts/collect/collect_init_tests/pytest.ini
    A testing/example_scripts/collect/collect_init_tests/tests/__init__.py
    A testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
    M testing/test_collection.py

  Log Message:
  -----------
  Collect tests from __init__.py files if they match 'python_files'

Fix #3773


  Commit: f872fcb5d0ba99bce5b1017c067d3b18ecccf15c
      https://github.com/pytest-dev/pytest/commit/f872fcb5d0ba99bce5b1017c067d3b18ecccf15c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Remove dangerous sys.path manipulations in test_pluginmanager

Noticed these while working in something else


  Commit: 415fcb912bb7c877a31150c53e42275644e70f46
      https://github.com/pytest-dev/pytest/commit/415fcb912bb7c877a31150c53e42275644e70f46
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Travis: use TOXENV=linting for linting stage

This will run it with `--show-diff-on-failure` then, and helps to keep
it in line / in a central place.


  Commit: b0541e9d317f40390c9bbc69af2e8a8a426502df
      https://github.com/pytest-dev/pytest/commit/b0541e9d317f40390c9bbc69af2e8a8a426502df
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M testing/test_monkeypatch.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Correctly restore sys.path in test and remove dead code in test_pytester

The code in test_pytester has been refactored into a class right
above the dead code, and the code has been left there by mistake
apparently.


  Commit: 71b4995775e49bb4e7ddd024a486a96f762b7a91
      https://github.com/pytest-dev/pytest/commit/71b4995775e49bb4e7ddd024a486a96f762b7a91
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge pull request #3874 from blueyed/improve-pre-commit

Travis: use TOXENV=linting for linting stage


  Commit: 3da88d794f8b50b15f2bfc7012fd2ee9d262fd6f
      https://github.com/pytest-dev/pytest/commit/3da88d794f8b50b15f2bfc7012fd2ee9d262fd6f
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Use skip_install for testing tox env


  Commit: d3f5324386cf64bb1be2c64b9f885cfaa39a3604
      https://github.com/pytest-dev/pytest/commit/d3f5324386cf64bb1be2c64b9f885cfaa39a3604
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  tox: coveralls: also report to codecov

This is meant to get base coverage on master for codecov.


  Commit: 508774742e3f55caa3d1b2942738ed778a4cb0cb
      https://github.com/pytest-dev/pytest/commit/508774742e3f55caa3d1b2942738ed778a4cb0cb
  Author: Gandalf Saxe <gandalfsaxe at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Code block: :: missing and 4 spaces instead of 5

I just noticed the newly committed code block doesn't format as a code block without `::` in the paragraph before. Perhaps doesn't make a difference, but also corrected 5 spaces to 4 which seems standard.


  Commit: dd5f5ca4cb1713bdddc2c9cba73dcd7b5251b332
      https://github.com/pytest-dev/pytest/commit/dd5f5ca4cb1713bdddc2c9cba73dcd7b5251b332
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    A changelog/3773.bugfix.rst
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    A testing/example_scripts/collect/collect_init_tests/pytest.ini
    A testing/example_scripts/collect/collect_init_tests/tests/__init__.py
    A testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #3872 from nicoddemus/tests-in-init-files

Collect tests from __init__.py files if they match 'python_files'


  Commit: 2577a6ce8abef54fca9c09308fe4e44ebec93762
      https://github.com/pytest-dev/pytest/commit/2577a6ce8abef54fca9c09308fe4e44ebec93762
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M testing/test_monkeypatch.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Merge pull request #3873 from nicoddemus/sys-path-fix

Remove dangerous sys.path manipulations in test_pluginmanager


  Commit: c15b537e3d06bc1df864e6dd4f7f7cbe0b1052c4
      https://github.com/pytest-dev/pytest/commit/c15b537e3d06bc1df864e6dd4f7f7cbe0b1052c4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3878 from asottile/skip_install_linting

Use skip_install for testing tox env


  Commit: 4d19b9434793a5a688f2b13d507618650f891ed9
      https://github.com/pytest-dev/pytest/commit/4d19b9434793a5a688f2b13d507618650f891ed9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3877 from blueyed/codecov-master

tox: coveralls: also report to codecov


  Commit: 7ae23901d3198294cb8073c0b6daa768d3985fee
      https://github.com/pytest-dev/pytest/commit/7ae23901d3198294cb8073c0b6daa768d3985fee
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Merge pull request #3881 from GandalfSaxe/patch-2

Code block: :: missing and 4 spaces instead of 5


  Commit: c31018d9bcf0d206bcb134a376ea0f8e880510f1
      https://github.com/pytest-dev/pytest/commit/c31018d9bcf0d206bcb134a376ea0f8e880510f1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3033.bugfix.rst
    R changelog/3773.bugfix.rst
    R changelog/3796.bugfix.rst
    R changelog/3816.bugfix.rst
    R changelog/3819.bugfix.rst
    R changelog/3824.doc.rst
    R changelog/3826.trivial.rst
    R changelog/3833.doc.rst
    R changelog/3843.bugfix.rst
    R changelog/3845.trivial.rst
    R changelog/3848.bugfix.rst
    R changelog/3854.bugfix.rst
    R changelog/3870.doc.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.3.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.7.3


  Commit: b69f853acbc3ff705751b69f8955a0e25a2bf92c
      https://github.com/pytest-dev/pytest/commit/b69f853acbc3ff705751b69f8955a0e25a2bf92c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Tweak CHANGELOG for 3.7.3


  Commit: 70bdacf01aa0917d4499c1aff4f9f2061968a655
      https://github.com/pytest-dev/pytest/commit/70bdacf01aa0917d4499c1aff4f9f2061968a655
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M doc/en/example/pythoncollection.rst

  Log Message:
  -----------
  Fix collection example docs


  Commit: e74ad4ff9b89936c2ef9c4e34054ae9d3ba1e31f
      https://github.com/pytest-dev/pytest/commit/e74ad4ff9b89936c2ef9c4e34054ae9d3ba1e31f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M CHANGELOG.rst

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


  Commit: a31967431f3d112da547ddbd05c4efdb90cb8ad6
      https://github.com/pytest-dev/pytest/commit/a31967431f3d112da547ddbd05c4efdb90cb8ad6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3033.bugfix.rst
    R changelog/3773.bugfix.rst
    R changelog/3796.bugfix.rst
    R changelog/3816.bugfix.rst
    R changelog/3819.bugfix.rst
    R changelog/3824.doc.rst
    R changelog/3826.trivial.rst
    R changelog/3833.doc.rst
    R changelog/3843.bugfix.rst
    R changelog/3845.trivial.rst
    R changelog/3848.bugfix.rst
    R changelog/3854.bugfix.rst
    R changelog/3870.doc.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.3.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Merge pull request #3882 from nicoddemus/release-3.7.3

Release 3.7.3


  Commit: 2f2d5861bb14c9b61d4bea846b6d8043b9f6081d
      https://github.com/pytest-dev/pytest/commit/2f2d5861bb14c9b61d4bea846b6d8043b9f6081d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M bench/empty.py
    R changelog/3819.bugfix.rst
    R changelog/3826.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.3.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/multipython.py
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/goodpractices.rst
    M doc/en/reference.rst
    M doc/en/skipping.rst
    M src/_pytest/_code/_py2traceback.py
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M src/_pytest/capture.py
    M src/_pytest/config/argparsing.py
    M src/_pytest/debugging.py
    M src/_pytest/fixtures.py
    M src/_pytest/main.py
    M src/_pytest/outcomes.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M src/_pytest/runner.py
    M src/_pytest/setuponly.py
    M src/_pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/example_scripts/acceptance/fixture_mock_integration.py
    A testing/example_scripts/collect/collect_init_tests/pytest.ini
    A testing/example_scripts/collect/collect_init_tests/tests/__init__.py
    A testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
    M testing/logging/test_reporting.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_monkeypatch.py
    M testing/test_parseopt.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_terminal.py
    M tox.ini

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


  Commit: 80eef29681c9a5412f73022552bf24a98c80ac9a
      https://github.com/pytest-dev/pytest/commit/80eef29681c9a5412f73022552bf24a98c80ac9a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M bench/empty.py
    R changelog/3819.bugfix.rst
    R changelog/3826.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.3.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/multipython.py
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/goodpractices.rst
    M doc/en/reference.rst
    M doc/en/skipping.rst
    M src/_pytest/_code/_py2traceback.py
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M src/_pytest/capture.py
    M src/_pytest/config/argparsing.py
    M src/_pytest/debugging.py
    M src/_pytest/fixtures.py
    M src/_pytest/main.py
    M src/_pytest/outcomes.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M src/_pytest/runner.py
    M src/_pytest/setuponly.py
    M src/_pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/example_scripts/acceptance/fixture_mock_integration.py
    A testing/example_scripts/collect/collect_init_tests/pytest.ini
    A testing/example_scripts/collect/collect_init_tests/tests/__init__.py
    A testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
    M testing/logging/test_reporting.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_monkeypatch.py
    M testing/test_parseopt.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_terminal.py
    M tox.ini

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

Merge master into features


Compare: https://github.com/pytest-dev/pytest/compare/044d2b8e6e47...80eef29681c9
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Mon Aug 27 06:20:46 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 27 Aug 2018 03:20:46 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 1e8e17: Improve the coverage of
 testing/code
Message-ID: <5b83d07e8c457_272e22ad26e922ed8963ac@hookshot-fe-dfcc362.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 1e8e17c01e6bd36ce2c70dd161e2279c3fcbaaf5
      https://github.com/pytest-dev/pytest/commit/1e8e17c01e6bd36ce2c70dd161e2279c3fcbaaf5
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M testing/code/test_code.py
    M testing/code/test_source.py

  Log Message:
  -----------
  Improve the coverage of testing/code


  Commit: 9620b167d952c77576584cd544410e3661849f29
      https://github.com/pytest-dev/pytest/commit/9620b167d952c77576584cd544410e3661849f29
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M testing/code/test_code.py
    M testing/code/test_source.py

  Log Message:
  -----------
  Merge pull request #3887 from asottile/improve_test_code

Improve the coverage of testing/code


Compare: https://github.com/pytest-dev/pytest/compare/10544c4cb81c...9620b167d952
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Mon Aug 27 18:07:04 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 27 Aug 2018 15:07:04 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 6991a1: Fix bad console output
 when using console_output_s...
Message-ID: <5b84760867889_6bff2af2e387eed812515@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 6991a16edb751f61cc50f4e204f498dd1a7463b4
      https://github.com/pytest-dev/pytest/commit/6991a16edb751f61cc50f4e204f498dd1a7463b4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    A changelog/3883.bugfix.rst
    M src/_pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Fix bad console output when using console_output_style=classic

Fix #3883


  Commit: 2a059b1c1bff392252c02413c89913dd672af168
      https://github.com/pytest-dev/pytest/commit/2a059b1c1bff392252c02413c89913dd672af168
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    A changelog/3883.bugfix.rst
    M src/_pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #3885 from nicoddemus/bad-output-classic

Fix bad console output when using console_output_style=classic


Compare: https://github.com/pytest-dev/pytest/compare/9620b167d952...2a059b1c1bff
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Tue Aug 28 15:54:16 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 28 Aug 2018 12:54:16 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 93f783: Add the
 progress_display_mode ini option
Message-ID: <5b85a8687f3a5_31d42ae484eb8ed8865ba@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 93f783228c3dfebd77a53e1d2e5fa81b49ae107a
      https://github.com/pytest-dev/pytest/commit/93f783228c3dfebd77a53e1d2e5fa81b49ae107a
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    A changelog/3829.feature.rst
    M src/_pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Add the progress_display_mode ini option


  Commit: 5fefc48f3332c7143d6f1ce5d4e70dc933100319
      https://github.com/pytest-dev/pytest/commit/5fefc48f3332c7143d6f1ce5d4e70dc933100319
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M testing/test_terminal.py

  Log Message:
  -----------
  Fixing pre-commit hooks


  Commit: 5e260c4d3442505c8b3cbe2fc9e8571f872e7310
      https://github.com/pytest-dev/pytest/commit/5e260c4d3442505c8b3cbe2fc9e8571f872e7310
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M changelog/3829.feature.rst

  Log Message:
  -----------
  Fixing changelog file.


  Commit: dda5e5ea328db9b80dbb098a925f2117c486010a
      https://github.com/pytest-dev/pytest/commit/dda5e5ea328db9b80dbb098a925f2117c486010a
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M changelog/3829.feature.rst

  Log Message:
  -----------
  Fixing backticks in changelog file.


  Commit: 325319dc3b27febe63b6e2ea59bf6e4923207529
      https://github.com/pytest-dev/pytest/commit/325319dc3b27febe63b6e2ea59bf6e4923207529
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M testing/test_terminal.py

  Log Message:
  -----------
  Fixing xdist test to properly configure an ini file.


  Commit: 2a917a582ed21e679e310dc37b964439d2ee7bad
      https://github.com/pytest-dev/pytest/commit/2a917a582ed21e679e310dc37b964439d2ee7bad
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-08-25 (Sat, 25 Aug 2018)

  Changed paths:
    M testing/test_terminal.py

  Log Message:
  -----------
  Removing accidental change to test


  Commit: 8f4685e02479c051db62ee2cf00c074b5e7ce026
      https://github.com/pytest-dev/pytest/commit/8f4685e02479c051db62ee2cf00c074b5e7ce026
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-08-26 (Sun, 26 Aug 2018)

  Changed paths:
    M doc/en/reference.rst
    M src/_pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Move count display style to be part of console_output_style, fixed test progress for count console output style.


  Commit: 23295e1e987cdf5c926e94d75b55dada945d65be
      https://github.com/pytest-dev/pytest/commit/23295e1e987cdf5c926e94d75b55dada945d65be
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M doc/en/reference.rst

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


  Commit: 4b94760c8e32400cce807eef132e40499e871a50
      https://github.com/pytest-dev/pytest/commit/4b94760c8e32400cce807eef132e40499e871a50
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M changelog/3829.feature.rst
    M src/_pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Removed spacing in count display.


  Commit: a605ad4d11d2c1c8a5ce3f1810d431e765b422f3
      https://github.com/pytest-dev/pytest/commit/a605ad4d11d2c1c8a5ce3f1810d431e765b422f3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    A changelog/3829.feature.rst
    M doc/en/reference.rst
    M src/_pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #3880 from jeffreyrack/3829-progress_display_mode

#3829 -- Add the ability to show test progress as number of tests completed instead of a percent.


Compare: https://github.com/pytest-dev/pytest/compare/80eef29681c9...a605ad4d11d2
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Tue Aug 28 16:06:19 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 28 Aug 2018 13:06:19 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] ab5af5: Fix macOS specific code
 that uses capturemanager.
Message-ID: <5b85ab3b3fa3a_56af2acdbcbb4ec892745@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: ab5af524a454585bc6ce02374964f198cbcf8670
      https://github.com/pytest-dev/pytest/commit/ab5af524a454585bc6ce02374964f198cbcf8670
  Author: Jiri Kuncar <jiri.kuncar at gmail.com>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    A changelog/3888.bugfix.rst
    M src/_pytest/doctest.py

  Log Message:
  -----------
  Fix macOS specific code that uses capturemanager.

https://github.com/pytest-dev/pytest/issues/3888#issuecomment-416206606

closes #3888

Co-authored-by: Bruno Oliveira <nicoddemus at gmail.com>


  Commit: f786335dbbd54ddfad4595daa477124ceee9c82c
      https://github.com/pytest-dev/pytest/commit/f786335dbbd54ddfad4595daa477124ceee9c82c
  Author: Jiri Kuncar <jiri.kuncar at gmail.com>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  travis: run tests on macOS

closes #3892


  Commit: 29e114b463946a2bc394c695be1b6885df8ed964
      https://github.com/pytest-dev/pytest/commit/29e114b463946a2bc394c695be1b6885df8ed964
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Try to fix test in MacOS-X


  Commit: b2f7e02a02e60e8568440e080759436ef71e8ace
      https://github.com/pytest-dev/pytest/commit/b2f7e02a02e60e8568440e080759436ef71e8ace
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Reorganize osx environments to avoid repetition as suggested in review


  Commit: a260e58020430a04ebdfbd1cafe7fcedcb23fc28
      https://github.com/pytest-dev/pytest/commit/a260e58020430a04ebdfbd1cafe7fcedcb23fc28
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Drop 3.6 from OS-X to reduce build time


  Commit: 32575f92c9b75b994876075b1a0902b8bebfaea3
      https://github.com/pytest-dev/pytest/commit/32575f92c9b75b994876075b1a0902b8bebfaea3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  set TOXENV in test-macos template otherwise it will inherit "coveralls"


  Commit: b77e533693fab0c960e735cae4bafab22d382262
      https://github.com/pytest-dev/pytest/commit/b77e533693fab0c960e735cae4bafab22d382262
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M .travis.yml
    A changelog/3888.bugfix.rst
    M src/_pytest/doctest.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3893 from jirikuncar/3892-macos

travis: run tests on macOS


Compare: https://github.com/pytest-dev/pytest/compare/2a059b1c1bff...b77e533693fa
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Tue Aug 28 17:16:11 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 28 Aug 2018 14:16:11 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 82a7ca: Avoid possible infinite
 recursion when writing pyc...
Message-ID: <5b85bb9bc9b95_3a1d2abea9660ed064931@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 82a7ca96152b9b17285fcffc70cc88d5df7990a6
      https://github.com/pytest-dev/pytest/commit/82a7ca96152b9b17285fcffc70cc88d5df7990a6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    A changelog/3506.bugfix.rst
    M src/_pytest/assertion/rewrite.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Avoid possible infinite recursion when writing pyc files in assert rewrite

What happens is that atomic_write on Python 2.7 on Windows will try
to convert the paths to unicode, but this triggers the import of
the encoding module for the file system codec, which in turn triggers
the rewrite, which in turn again tries to import the module, and so on.

This short-circuits the cases where we try to import another file when
writing a pyc file; I don't expect this to affect anything because
the only modules that could be affected are those imported by
atomic_writes.

Fix #3506


  Commit: 10c1c7c41aec6d123cf97e3be38a4afccd99899a
      https://github.com/pytest-dev/pytest/commit/10c1c7c41aec6d123cf97e3be38a4afccd99899a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    A changelog/3506.bugfix.rst
    M src/_pytest/assertion/rewrite.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Merge pull request #3895 from nicoddemus/issue-3506

Avoid possible infinite recursion when writing pyc files in assert rewrite


Compare: https://github.com/pytest-dev/pytest/compare/16f452ef9866...10c1c7c41aec
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Wed Aug 29 07:20:04 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 29 Aug 2018 04:20:04 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b0a32d: Use https;
 save a redirect
Message-ID: <5b8681649a933_56f32afde8a9aec84121e@hookshot-fe-265448d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: b0a32da0b55fe973f02bd0bd835b52434a2f7bc3
      https://github.com/pytest-dev/pytest/commit/b0a32da0b55fe973f02bd0bd835b52434a2f7bc3
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Use https; save a redirect


  Commit: 2e090896d52d8d3340e2218ed2101748bd6b0a5b
      https://github.com/pytest-dev/pytest/commit/2e090896d52d8d3340e2218ed2101748bd6b0a5b
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Use https


  Commit: bde3d1a0cde50be7beee8428fd7d614e73f4b6b7
      https://github.com/pytest-dev/pytest/commit/bde3d1a0cde50be7beee8428fd7d614e73f4b6b7
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Use https; save a redirect


  Commit: f19cfbb825d9cd824939138a93f9e12abdd68255
      https://github.com/pytest-dev/pytest/commit/f19cfbb825d9cd824939138a93f9e12abdd68255
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M doc/en/funcarg_compare.rst

  Log Message:
  -----------
  Fix 404 to a somewhat better historical note


  Commit: 00e0b43010694691db8a2eb35ff00f04a1f9d715
      https://github.com/pytest-dev/pytest/commit/00e0b43010694691db8a2eb35ff00f04a1f9d715
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M scripts/release.minor.rst
    M scripts/release.patch.rst

  Log Message:
  -----------
  Use https, save a redirect


  Commit: e040fd20a379b4e9be4de71ce61e0d31216ee87c
      https://github.com/pytest-dev/pytest/commit/e040fd20a379b4e9be4de71ce61e0d31216ee87c
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M src/_pytest/python.py

  Log Message:
  -----------
  Use https, save a redirect


  Commit: 67c3c28877548b6d3a3c83d1dc090d9760120b14
      https://github.com/pytest-dev/pytest/commit/67c3c28877548b6d3a3c83d1dc090d9760120b14
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M src/_pytest/skipping.py

  Log Message:
  -----------
  Use https, save a redirect


  Commit: 28c3ef1c7713e62b0ef392c1000d8c0f1d892fcc
      https://github.com/pytest-dev/pytest/commit/28c3ef1c7713e62b0ef392c1000d8c0f1d892fcc
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M src/_pytest/terminal.py

  Log Message:
  -----------
  Use https, save a redirect, fix hostname


  Commit: 103d980b2d3969fc9aa59ef7514b36c91260d809
      https://github.com/pytest-dev/pytest/commit/103d980b2d3969fc9aa59ef7514b36c91260d809
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M src/_pytest/warnings.py

  Log Message:
  -----------
  Use https, save a redirect


  Commit: 8ef21f56d35dc70000018387d7b6ae99660ff608
      https://github.com/pytest-dev/pytest/commit/8ef21f56d35dc70000018387d7b6ae99660ff608
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M testing/deprecated_test.py

  Log Message:
  -----------
  Fix 404


  Commit: eab5020e248f80a141cf63d1fd241e839e1702c3
      https://github.com/pytest-dev/pytest/commit/eab5020e248f80a141cf63d1fd241e839e1702c3
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M scripts/release.minor.rst
    M scripts/release.patch.rst

  Log Message:
  -----------
  Fix hostname


  Commit: 37a65684d62977b9c10df1349eae241d5ed5fec6
      https://github.com/pytest-dev/pytest/commit/37a65684d62977b9c10df1349eae241d5ed5fec6
  Author: Steve Piercy <web at stevepiercy.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    A changelog/3902.doc.rst

  Log Message:
  -----------
  add changelog entry


  Commit: bf47033169cdaa30b7d8d16a5c08468a12334719
      https://github.com/pytest-dev/pytest/commit/bf47033169cdaa30b7d8d16a5c08468a12334719
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-28 (Tue, 28 Aug 2018)

  Changed paths:
    M changelog/3902.doc.rst

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


  Commit: 4345efaffc4768efe844bfdc266969c4416f0753
      https://github.com/pytest-dev/pytest/commit/4345efaffc4768efe844bfdc266969c4416f0753
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-29 (Wed, 29 Aug 2018)

  Changed paths:
    M README.rst
    A changelog/3902.doc.rst
    M doc/en/funcarg_compare.rst
    M scripts/release.minor.rst
    M scripts/release.patch.rst
    M setup.py
    M src/_pytest/python.py
    M src/_pytest/skipping.py
    M src/_pytest/terminal.py
    M src/_pytest/warnings.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Merge pull request #3902 from stevepiercy/fix-pytest.org-links

Fix pytest.org links


Compare: https://github.com/pytest-dev/pytest/compare/10c1c7c41aec...4345efaffc47
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Wed Aug 29 17:53:37 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 29 Aug 2018 14:53:37 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 3ca706: Skip the "test" stage
 when making a release
Message-ID: <5b8715e1641c2_51312aeaf498cec027472@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 3ca70692de997e8c1880472efc1e4e908d3fec44
      https://github.com/pytest-dev/pytest/commit/3ca70692de997e8c1880472efc1e4e908d3fec44
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-29 (Wed, 29 Aug 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Skip the "test" stage when making a release

Given that our guidelines demand that the CI have already passed, it seems
wasteful to run all those jobs again for the exact same commit.

As discussed in https://github.com/pytest-dev/pytest/pull/3906#issuecomment-417094481,
this will skip the "test" stage when building a tag for deployment.


  Commit: 338953a25db58527d5205980b13f650d51e4bb1f
      https://github.com/pytest-dev/pytest/commit/338953a25db58527d5205980b13f650d51e4bb1f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-29 (Wed, 29 Aug 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge pull request #3908 from nicoddemus/optimize-release

Skip the "test" stage when making a release


Compare: https://github.com/pytest-dev/pytest/compare/f1bd46266bab...338953a25db5
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Thu Aug 30 18:41:24 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 30 Aug 2018 15:41:24 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f73029: Travis: report coverage
 with all builds
Message-ID: <5b887294c3b34_43f82ac091794ed4651ca@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: f730291e67b8b5f27973b281b857ec293e7e349a
      https://github.com/pytest-dev/pytest/commit/f730291e67b8b5f27973b281b857ec293e7e349a
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-08-29 (Wed, 29 Aug 2018)

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

  Log Message:
  -----------
  Travis: report coverage with all builds

- Skips pypy for coverage, reports only py37 to coveralls
- tox: allow for TOXENV=py37-coverage
- tracks coverage in subprocesses, using coverage-enable-subprocess, and
  parallel=1
- removes usedevelop with doctesting to match `--source` being used with
  coverage
- keep coveralls for now, used with AppVeyor


  Commit: 417516c3787a5de0df0abdcc51a47c40ea411d0d
      https://github.com/pytest-dev/pytest/commit/417516c3787a5de0df0abdcc51a47c40ea411d0d
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-08-29 (Wed, 29 Aug 2018)

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

  Log Message:
  -----------
  squash! Travis: report coverage with all builds

doctesting: remove changedir

With coverage 5 we could use COVERAGE_RCFILE to make it find the
.coveragerc, or we could add `--rcfile` to _PYTEST_TOX_COVERAGE_RUN, but
I've thought that this should not be the job that has to test if
`--pyargs` actually works.


  Commit: f0e852b4db6667e08c88bb4422f85e8e1de80b53
      https://github.com/pytest-dev/pytest/commit/f0e852b4db6667e08c88bb4422f85e8e1de80b53
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-30 (Thu, 30 Aug 2018)

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

  Log Message:
  -----------
  Merge pull request #2800 from blueyed/coverage

Travis: report coverage with all builds


Compare: https://github.com/pytest-dev/pytest/compare/338953a25db5...f0e852b4db66
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Thu Aug 30 18:41:45 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 30 Aug 2018 15:41:45 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 8c96ee: doc fix: raises accepts
 tuples instead of lists (f...
Message-ID: <5b8872a96b79e_5da72b0b7ba06ed098880@hookshot-fe-cace476.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 8c96eea583d9bcbc6d88f17f1d0f5331414deada
      https://github.com/pytest-dev/pytest/commit/8c96eea583d9bcbc6d88f17f1d0f5331414deada
  Author: hoefling <oleg.hoefling at gmail.com>
  Date:   2018-08-30 (Thu, 30 Aug 2018)

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

  Log Message:
  -----------
  doc fix: raises accepts tuples instead of lists (fixes #3907)


  Commit: 9bd4b0a05ee18e80e4835cd8d42cef1806b9f0f2
      https://github.com/pytest-dev/pytest/commit/9bd4b0a05ee18e80e4835cd8d42cef1806b9f0f2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-30 (Thu, 30 Aug 2018)

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

  Log Message:
  -----------
  Merge pull request #3910 from hoefling/docfix

doc fix: raises accepts tuples instead of lists


Compare: https://github.com/pytest-dev/pytest/compare/f0e852b4db66...9bd4b0a05ee1
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

From nicoddemus at gmail.com  Thu Aug 30 18:51:50 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 30 Aug 2018 15:51:50 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 3035b2: T3853:removed needless
 message printed with --fail...
Message-ID: <5b887506a2f0f_56582b1bdf06eed024935@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 3035b2724db117264ce49a336b1aed5c201025ef
      https://github.com/pytest-dev/pytest/commit/3035b2724db117264ce49a336b1aed5c201025ef
  Author: dhirensr <dhirensr at gmail.com>
  Date:   2018-08-30 (Thu, 30 Aug 2018)

  Changed paths:
    M AUTHORS
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  T3853:removed needless message printed with --failed-first,--last-failed and no failed tests


  Commit: ade01b1f5b197bff47248bacc5325b0c05cf2ab2
      https://github.com/pytest-dev/pytest/commit/ade01b1f5b197bff47248bacc5325b0c05cf2ab2
  Author: dhirensr <dhirensr at gmail.com>
  Date:   2018-08-30 (Thu, 30 Aug 2018)

  Changed paths:
    A changelog/3853.feature.rst

  Log Message:
  -----------
  T3853:Added changelog file


  Commit: 0183d46275ca9e3c14fe523ac22c5e26e97ea98a
      https://github.com/pytest-dev/pytest/commit/0183d46275ca9e3c14fe523ac22c5e26e97ea98a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-30 (Thu, 30 Aug 2018)

  Changed paths:
    R changelog/3853.feature.rst
    A changelog/3853.trivial.rst

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


  Commit: 84a033fd97381301adcde2548d1ea169424f67ed
      https://github.com/pytest-dev/pytest/commit/84a033fd97381301adcde2548d1ea169424f67ed
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-30 (Thu, 30 Aug 2018)

  Changed paths:
    M changelog/3853.trivial.rst

  Log Message:
  -----------
  Remove extra newline


  Commit: 64f00683f2ed73f924340cc5161f5d02d1e11d0b
      https://github.com/pytest-dev/pytest/commit/64f00683f2ed73f924340cc5161f5d02d1e11d0b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-08-30 (Thu, 30 Aug 2018)

  Changed paths:
    M AUTHORS
    A changelog/3853.trivial.rst
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #3912 from dhirensr/needless_message

Needless message printed with --failed-first and no failed tests #3853


Compare: https://github.com/pytest-dev/pytest/compare/a605ad4d11d2...64f00683f2ed
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.