From nicoddemus at gmail.com  Mon Jul  2 09:34:06 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 02 Jul 2018 06:34:06 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a43205: Fix monkeypatch doc
Message-ID: <5b3a29cec0097_6fa92b1541fd5c10844d5@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: a43205b4bc572aad746b9fbd6f6701722d86bce1
      https://github.com/pytest-dev/pytest/commit/a43205b4bc572aad746b9fbd6f6701722d86bce1
  Author: T.E.A de Souza <tea.desouza at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M src/_pytest/monkeypatch.py

  Log Message:
  -----------
  Fix monkeypatch doc

`delenv` is incorrectly documented.


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

  Changed paths:
    M src/_pytest/monkeypatch.py

  Log Message:
  -----------
  Merge pull request #3648 from eelstork/patch-1

Fix monkeypatch doc


Compare: https://github.com/pytest-dev/pytest/compare/2b75a311a78b...b50911285a4d
      **NOTE:** This service 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 Jul  3 20:46:28 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 03 Jul 2018 17:46:28 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 55ebf2: Switch to new API
Message-ID: <5b3c18e4e25b4_33c82b11f36d1c146357d@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 55ebf261ce9eee7d7dd67a332deb151747e8648e
      https://github.com/pytest-dev/pytest/commit/55ebf261ce9eee7d7dd67a332deb151747e8648e
  Author: Jean-Paul Calderone <exarkun at twistedmatrix.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M src/_pytest/mark/structures.py

  Log Message:
  -----------
  Switch to new API


  Commit: b815f67e656d77b089babb7f68340014aab01807
      https://github.com/pytest-dev/pytest/commit/b815f67e656d77b089babb7f68340014aab01807
  Author: Jean-Paul Calderone <exarkun at twistedmatrix.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    A changelog/3653.trivial.rst

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


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

  Changed paths:
    M changelog/3653.trivial.rst

  Log Message:
  -----------
  Add note to the changelog


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

  Changed paths:
    A changelog/3653.trivial.rst
    M src/_pytest/mark/structures.py

  Log Message:
  -----------
  Merge pull request #3654 from LeastAuthority/3653.deprecated-convert

Switch to new API


Compare: https://github.com/pytest-dev/pytest/compare/b50911285a4d...3ed8e28ef310
      **NOTE:** This service 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 Jul  4 16:53:29 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 04 Jul 2018 13:53:29 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 43c034: Preparing release
 version 3.6.3
Message-ID: <5b3d33c9a2a58_2e932b0147941c1849158@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/tags/3.6.3
  Home:   https://github.com/pytest-dev/pytest
  Commit: 43c0346d681800d41510ad3c0cfc5f8fd1bf04e4
      https://github.com/pytest-dev/pytest/commit/43c0346d681800d41510ad3c0cfc5f8fd1bf04e4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    R changelog/3630.bugfix.rst
    R changelog/3631.bugfix.rst
    R changelog/3653.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.6.3


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

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

  Log Message:
  -----------
  Run pre-commit on all doc files


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Improve CHANGELOG for 3.6.3


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

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  HOWTORELEASE: create branch first and run pre-commit after generate-release task

This makes more sense because we need to install from
tasks/requirements.txt


Compare: https://github.com/pytest-dev/pytest/compare/43c0346d6818^...73d787df3a13
      **NOTE:** This service 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 Jul  4 17:45:46 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 04 Jul 2018 14:45:46 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 43c034: Preparing release
 version 3.6.3
Message-ID: <5b3d400aaa5bf_5e362b1591037c04289eb@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 43c0346d681800d41510ad3c0cfc5f8fd1bf04e4
      https://github.com/pytest-dev/pytest/commit/43c0346d681800d41510ad3c0cfc5f8fd1bf04e4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    R changelog/3630.bugfix.rst
    R changelog/3631.bugfix.rst
    R changelog/3653.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.6.3


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

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

  Log Message:
  -----------
  Run pre-commit on all doc files


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Improve CHANGELOG for 3.6.3


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

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  HOWTORELEASE: create branch first and run pre-commit after generate-release task

This makes more sense because we need to install from
tasks/requirements.txt


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

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    R changelog/3630.bugfix.rst
    R changelog/3631.bugfix.rst
    R changelog/3653.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/builtin.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Merge pull request #3656 from nicoddemus/release-3.6.3

Release 3.6.3


Compare: https://github.com/pytest-dev/pytest/compare/3ed8e28ef310...b64c26674d10
      **NOTE:** This service 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 Jul  4 20:11:31 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 04 Jul 2018 17:11:31 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 5bd5b8: fix #3631 - don't store
 legacy markinfo when its i...
Message-ID: <5b3d6233bbd7_30412b23a6c3dc1053399@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

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

  Changed paths:
    A changelog/3631.bugfix.rst
    M src/_pytest/mark/structures.py
    M testing/test_mark.py

  Log Message:
  -----------
  fix #3631 - don't store legacy markinfo when its impossible


  Commit: 342f2cdc17d5030ddc59d88b647fbc4c732c502d
      https://github.com/pytest-dev/pytest/commit/342f2cdc17d5030ddc59d88b647fbc4c732c502d
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

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

  Log Message:
  -----------
  Fixes #3630


  Commit: 738933938a51f324187bef3188eb2d8ea69e83b9
      https://github.com/pytest-dev/pytest/commit/738933938a51f324187bef3188eb2d8ea69e83b9
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    A changelog/3630.bugfix.rst

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


  Commit: a6636fddcdcbb198e750f4097d5d0c08442e1f00
      https://github.com/pytest-dev/pytest/commit/a6636fddcdcbb198e750f4097d5d0c08442e1f00
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Fixed open function with encoding in python 2.7


  Commit: 3a1c15316b55656ed57355dec27d223e378bf481
      https://github.com/pytest-dev/pytest/commit/3a1c15316b55656ed57355dec27d223e378bf481
  Author: Victor <victor.maryama at typhoon-hil.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Updated test for python 2.7


  Commit: dad3e773198a95e49a0b5a1e805bd0318c508996
      https://github.com/pytest-dev/pytest/commit/dad3e773198a95e49a0b5a1e805bd0318c508996
  Author: victor <victor.maryama at typhoon-hil.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Improve test readability.


  Commit: 26e1784e52fdd16c420349c1f45d8a210cf7c368
      https://github.com/pytest-dev/pytest/commit/26e1784e52fdd16c420349c1f45d8a210cf7c368
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    A changelog/3630.bugfix.rst
    M src/_pytest/logging.py
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Merge pull request #3641 from Sup3rGeo/bugfix/logfile-unicode

Fixes #3630


  Commit: 2b75a311a78b9e07de4335738c374f3dfbc6a68e
      https://github.com/pytest-dev/pytest/commit/2b75a311a78b9e07de4335738c374f3dfbc6a68e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    A changelog/3631.bugfix.rst
    M src/_pytest/mark/structures.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #3637 from RonnyPfannschmidt/fix-3631

fix #3631 - don't store legacy markinfo when its impossible


  Commit: a43205b4bc572aad746b9fbd6f6701722d86bce1
      https://github.com/pytest-dev/pytest/commit/a43205b4bc572aad746b9fbd6f6701722d86bce1
  Author: T.E.A de Souza <tea.desouza at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M src/_pytest/monkeypatch.py

  Log Message:
  -----------
  Fix monkeypatch doc

`delenv` is incorrectly documented.


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

  Changed paths:
    M src/_pytest/monkeypatch.py

  Log Message:
  -----------
  Merge pull request #3648 from eelstork/patch-1

Fix monkeypatch doc


  Commit: 55ebf261ce9eee7d7dd67a332deb151747e8648e
      https://github.com/pytest-dev/pytest/commit/55ebf261ce9eee7d7dd67a332deb151747e8648e
  Author: Jean-Paul Calderone <exarkun at twistedmatrix.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M src/_pytest/mark/structures.py

  Log Message:
  -----------
  Switch to new API


  Commit: b815f67e656d77b089babb7f68340014aab01807
      https://github.com/pytest-dev/pytest/commit/b815f67e656d77b089babb7f68340014aab01807
  Author: Jean-Paul Calderone <exarkun at twistedmatrix.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    A changelog/3653.trivial.rst

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


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

  Changed paths:
    M changelog/3653.trivial.rst

  Log Message:
  -----------
  Add note to the changelog


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

  Changed paths:
    A changelog/3653.trivial.rst
    M src/_pytest/mark/structures.py

  Log Message:
  -----------
  Merge pull request #3654 from LeastAuthority/3653.deprecated-convert

Switch to new API


  Commit: 43c0346d681800d41510ad3c0cfc5f8fd1bf04e4
      https://github.com/pytest-dev/pytest/commit/43c0346d681800d41510ad3c0cfc5f8fd1bf04e4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    R changelog/3630.bugfix.rst
    R changelog/3631.bugfix.rst
    R changelog/3653.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.6.3


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

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

  Log Message:
  -----------
  Run pre-commit on all doc files


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Improve CHANGELOG for 3.6.3


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

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  HOWTORELEASE: create branch first and run pre-commit after generate-release task

This makes more sense because we need to install from
tasks/requirements.txt


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

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    R changelog/3630.bugfix.rst
    R changelog/3631.bugfix.rst
    R changelog/3653.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/builtin.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Merge pull request #3656 from nicoddemus/release-3.6.3

Release 3.6.3


  Commit: 7696d5371a85147f24b22cf6786b6331827bcc1b
      https://github.com/pytest-dev/pytest/commit/7696d5371a85147f24b22cf6786b6331827bcc1b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/builtin.rst
    M doc/en/example/simple.rst
    M src/_pytest/logging.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M testing/logging/test_reporting.py
    M testing/test_mark.py

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


  Commit: 3f5e06ecc465b1befb5e6ad062a264b47bab9f45
      https://github.com/pytest-dev/pytest/commit/3f5e06ecc465b1befb5e6ad062a264b47bab9f45
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/builtin.rst
    M doc/en/example/simple.rst
    M src/_pytest/logging.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M testing/logging/test_reporting.py
    M testing/test_mark.py

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

Merge master into features


Compare: https://github.com/pytest-dev/pytest/compare/8680dfc93964...3f5e06ecc465
      **NOTE:** This service 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 Jul  5 06:17:05 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 05 Jul 2018 03:17:05 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 50f030: Correct code blocks in
 docs
Message-ID: <5b3df021c7e8a_52c52b028babbc0c9888c@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 50f030d2330280abc31824075660a9d5d0aaa808
      https://github.com/pytest-dev/pytest/commit/50f030d2330280abc31824075660a9d5d0aaa808
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/example/markers.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst

  Log Message:
  -----------
  Correct code blocks in docs


  Commit: 7e8f7bfa1626e9a06b5a9d9ac0580c1f7577a209
      https://github.com/pytest-dev/pytest/commit/7e8f7bfa1626e9a06b5a9d9ac0580c1f7577a209
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/example/markers.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst

  Log Message:
  -----------
  Merge pull request #3660 from asottile/code_highlight_fix

Correct code blocks in docs


Compare: https://github.com/pytest-dev/pytest/compare/b64c26674d10...7e8f7bfa1626
      **NOTE:** This service 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 Jul  6 19:57:48 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 06 Jul 2018 16:57:48 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 18b2fc: Dummy change
Message-ID: <5b4001fc78bcd_58b2ac0c8811c0445814@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 18b2fc11adf4b79d860ba91b73678a22c0c53083
      https://github.com/pytest-dev/pytest/commit/18b2fc11adf4b79d860ba91b73678a22c0c53083
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Dummy change



      **NOTE:** This service 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 Jul  6 20:04:17 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 06 Jul 2018 17:04:17 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f359b5: Adjust copyright in
 README
Message-ID: <5b400381f0f2e_67702afec5907c04630fb@hookshot-fe-b0febf1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: f359b50fe5e8c232c34d7400b00d4763ce2f43a4
      https://github.com/pytest-dev/pytest/commit/f359b50fe5e8c232c34d7400b00d4763ce2f43a4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Adjust copyright in README



      **NOTE:** This service 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 Jul  7 09:05:36 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 07 Jul 2018 06:05:36 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 54d3cd: Adding the --trace
 option.
Message-ID: <5b40baa03325f_d272b0c3c4cbc1047138@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 54d3cd587d17534b9d969855c7019567d48aa528
      https://github.com/pytest-dev/pytest/commit/54d3cd587d17534b9d969855c7019567d48aa528
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Adding the --trace option.


  Commit: 952bbefaac3836e4c4a8ae6e0919dabcb90a448a
      https://github.com/pytest-dev/pytest/commit/952bbefaac3836e4c4a8ae6e0919dabcb90a448a
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Add initial test.


  Commit: a46b94950c7574f94315a29b661f38e4176e72b9
      https://github.com/pytest-dev/pytest/commit/a46b94950c7574f94315a29b661f38e4176e72b9
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Properly set immediately_break value


  Commit: 533f4cc10cf95933c532bac78e60bed38001ee52
      https://github.com/pytest-dev/pytest/commit/533f4cc10cf95933c532bac78e60bed38001ee52
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fix test to pass


  Commit: 57198d477b5f8f6299c8c56fd075603194063868
      https://github.com/pytest-dev/pytest/commit/57198d477b5f8f6299c8c56fd075603194063868
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    A changelog/3610.feature.rst

  Log Message:
  -----------
  Adding changelog entry for the --trace option.


  Commit: 713d32c4da34abaaea77fec3e1211f28206e154f
      https://github.com/pytest-dev/pytest/commit/713d32c4da34abaaea77fec3e1211f28206e154f
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Adding documentation for the --trace option.


  Commit: 66fa6bb42ed511fb7e3628a61233f050597fb913
      https://github.com/pytest-dev/pytest/commit/66fa6bb42ed511fb7e3628a61233f050597fb913
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Fix flake8 issues.


  Commit: a604a71185f8a63e21a32e2619c5fc3fc93159f6
      https://github.com/pytest-dev/pytest/commit/a604a71185f8a63e21a32e2619c5fc3fc93159f6
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Fixing usage.rst title.


  Commit: 88011622751fd6280d8aad02ca924aae066b6df8
      https://github.com/pytest-dev/pytest/commit/88011622751fd6280d8aad02ca924aae066b6df8
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Fixing tabbing in usage.rst.


  Commit: 0b704779309332de3937bfa94eb3eb0b43b055c3
      https://github.com/pytest-dev/pytest/commit/0b704779309332de3937bfa94eb3eb0b43b055c3
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M changelog/3610.feature.rst
    M doc/en/usage.rst
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Fix linting issues.


  Commit: bc268a58d13ab398fac9c3c7d651296426d2fbb2
      https://github.com/pytest-dev/pytest/commit/bc268a58d13ab398fac9c3c7d651296426d2fbb2
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Adding needed newline


  Commit: b75320ba95e2033f7c12b400c0d587e989667d08
      https://github.com/pytest-dev/pytest/commit/b75320ba95e2033f7c12b400c0d587e989667d08
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Fix --trace option with yield tests.


  Commit: 10a8691ecade7ee3ebbf7223a9873bf83935f473
      https://github.com/pytest-dev/pytest/commit/10a8691ecade7ee3ebbf7223a9873bf83935f473
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Add support for yielded functions.


  Commit: 6cc4fe2412047dcea25bf2735db5896684680284
      https://github.com/pytest-dev/pytest/commit/6cc4fe2412047dcea25bf2735db5896684680284
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fixing bad indentation


  Commit: 2f1a2cf07f521abb6a226d01205a124ae516a334
      https://github.com/pytest-dev/pytest/commit/2f1a2cf07f521abb6a226d01205a124ae516a334
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fixing --trace test.


  Commit: 4afb8c428b2541afae9a80983191a351e0edc3dd
      https://github.com/pytest-dev/pytest/commit/4afb8c428b2541afae9a80983191a351e0edc3dd
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Fix python 2 issues


  Commit: 4a925ef5e9334c12ac6ad8b8146dec6d664b9945
      https://github.com/pytest-dev/pytest/commit/4a925ef5e9334c12ac6ad8b8146dec6d664b9945
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fixing bug in test.


  Commit: 067de257e140ec4ec716368c69c80f9278743fb7
      https://github.com/pytest-dev/pytest/commit/067de257e140ec4ec716368c69c80f9278743fb7
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fix test_pdb.py with pexpect


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

  Changed paths:
    A changelog/3610.feature.rst
    M doc/en/usage.rst
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #3647 from jeffreyrack/3610-add-trace-option

3610 add trace option


Compare: https://github.com/pytest-dev/pytest/compare/1e94ac784f1f...303133f013ea
      **NOTE:** This service 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 Jul  7 11:12:32 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 07 Jul 2018 08:12:32 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d7b722: Add reference docs for
 pytest.mark.usefixtures
Message-ID: <5b40d86096281_260c2b0fabc4fc089692d@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d7b722e2ae6dbf4b10bbba14c3a2dc5c4f2738b4
      https://github.com/pytest-dev/pytest/commit/d7b722e2ae6dbf4b10bbba14c3a2dc5c4f2738b4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add reference docs for pytest.mark.usefixtures


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

  Changed paths:
    M doc/en/fixture.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Add a warning about usefixtures mark not working in fixtures

Fix #1014


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

  Changed paths:
    M doc/en/fixture.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Merge pull request #3663 from nicoddemus/usefixtures-reference

Add reference docs for pytest.mark.usefixtures


Compare: https://github.com/pytest-dev/pytest/compare/f359b50fe5e8...aa9d1ad2ebea
      **NOTE:** This service 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 Jul  7 19:40:16 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 07 Jul 2018 16:40:16 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 49e82a: Skip deploy stage
 entirely unless we have a tag
Message-ID: <5b414f60df34b_4c782ac3f25a7c0c107135@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 49e82a4be8efe8a38b9208724e3681db413f22be
      https://github.com/pytest-dev/pytest/commit/49e82a4be8efe8a38b9208724e3681db413f22be
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Skip deploy stage entirely unless we have a tag

Borrowed from https://github.com/tox-dev/tox/pull/877


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge pull request #3666 from nicoddemus/deploy-on-tags

Skip deploy stage entirely unless we have a tag


Compare: https://github.com/pytest-dev/pytest/compare/aa9d1ad2ebea...12c5b6104c8b
      **NOTE:** This service 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 Jul  8 10:51:19 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 08 Jul 2018 07:51:19 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 42bbb4: Use -mpytest when
 invoking pytest in pytester
Message-ID: <5b4224e74321b_4e202b1591d33c1410656e@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 42bbb4fa8a43b913ce267454f417605f9744a95b
      https://github.com/pytest-dev/pytest/commit/42bbb4fa8a43b913ce267454f417605f9744a95b
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    A changelog/742.bugfix.rst
    M src/_pytest/pytester.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Use -mpytest when invoking pytest in pytester


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

  Changed paths:
    A changelog/742.bugfix.rst
    M src/_pytest/pytester.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Merge pull request #3667 from asottile/avoid_sys_path_pollution_742

Use -mpytest when invoking pytest in pytester


Compare: https://github.com/pytest-dev/pytest/compare/12c5b6104c8b...d4faa4056b4d
      **NOTE:** This service 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 Jul  8 12:42:00 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 08 Jul 2018 09:42:00 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 4ae93a: Remove obsolete
 __future__ imports
Message-ID: <5b423ed8ee175_139e2afb198a1c1079776@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 4ae93a7a078fc92d910b632a46a86cb779b3e2b7
      https://github.com/pytest-dev/pytest/commit/4ae93a7a078fc92d910b632a46a86cb779b3e2b7
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-08 (Sun, 08 Jul 2018)

  Changed paths:
    A changelog/2319.trivial.rst
    M src/_pytest/_code/source.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py

  Log Message:
  -----------
  Remove obsolete __future__ imports


  Commit: 9ef7878cbca555000d88a0ae3abb8cf809e69557
      https://github.com/pytest-dev/pytest/commit/9ef7878cbca555000d88a0ae3abb8cf809e69557
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-08 (Sun, 08 Jul 2018)

  Changed paths:
    A changelog/2319.trivial.rst
    M src/_pytest/_code/source.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #3668 from asottile/remove_obsolete_future_imports

Remove obsolete __future__ imports


Compare: https://github.com/pytest-dev/pytest/compare/d4faa4056b4d...9ef7878cbca5
      **NOTE:** This service 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 Jul 10 18:08:33 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 10 Jul 2018 15:08:33 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] af0059: Remove unused fix-lint
 tox environment
Message-ID: <5b452e612a7ed_78ce2abef79a3c0c1055b2@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: af0059079cb35372fe9fceeeb6bb183795ce3b7e
      https://github.com/pytest-dev/pytest/commit/af0059079cb35372fe9fceeeb6bb183795ce3b7e
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-08 (Sun, 08 Jul 2018)

  Changed paths:
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M tox.ini

  Log Message:
  -----------
  Remove unused fix-lint tox environment


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

  Changed paths:
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3670 from asottile/remove_unused_fix_lint

Remove unused fix-lint tox environment


Compare: https://github.com/pytest-dev/pytest/compare/898544e14713...593b451373ec
      **NOTE:** This service 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 Jul 10 20:12:52 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 10 Jul 2018 17:12:52 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a522fc: Small tweaks to the
 changelog entries
Message-ID: <5b454b84ea3cf_7a9f2b0c014e5c048905@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: a522fc745af6c8a62de613c621cf0bda402d8df0
      https://github.com/pytest-dev/pytest/commit/a522fc745af6c8a62de613c621cf0bda402d8df0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M changelog/2220.bugfix.rst
    M changelog/3576.feature.rst
    M changelog/3610.feature.rst
    M changelog/3623.feature.rst

  Log Message:
  -----------
  Small tweaks to the changelog entries


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

  Changed paths:
    M changelog/_template.rst

  Log Message:
  -----------
  Update CHANGELOG template to put issue links at the start of entries

This allows us to use the new multi-line entries available with
towncrier 18.6.0


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

  Changed paths:
    M changelog/README.rst

  Log Message:
  -----------
  Update README for CHANGELOG about using multiple paragraphs


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

  Changed paths:
    M changelog/2220.bugfix.rst

  Log Message:
  -----------
  Fix end-of-line in 2220.bugfix.rst


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

  Changed paths:
    M changelog/2220.bugfix.rst
    M changelog/3576.feature.rst
    M changelog/3610.feature.rst
    M changelog/3623.feature.rst
    M changelog/README.rst
    M changelog/_template.rst

  Log Message:
  -----------
  Merge pull request #3665 from nicoddemus/changelog-tweaks

Small tweaks to the changelog entries


Compare: https://github.com/pytest-dev/pytest/compare/303133f013ea...5226c7fac3ae
      **NOTE:** This service 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 Jul 11 22:29:35 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 11 Jul 2018 19:29:35 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7845ab: remove test file
 formatting from TestContextManage...
Message-ID: <5b46bd0f3cb90_32282ab903051c0c64470@hookshot-fe-265448d.cp1-iad.github.net.mail>

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

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  remove test file formatting from TestContextManagerFixtureFuncs


  Commit: 982b6140107c52c54e78df99293aa0e70a7d1619
      https://github.com/pytest-dev/pytest/commit/982b6140107c52c54e78df99293aa0e70a7d1619
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  remove format calls for most fixture tests


  Commit: 5582ad0445029672daf0f18fb12a3d940dbc6bb7
      https://github.com/pytest-dev/pytest/commit/5582ad0445029672daf0f18fb12a3d940dbc6bb7
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  remove use of formatting in test_func_closure_module_auto

this makes it apparent that pytester should supply some kind of variable support


  Commit: 4ae7e9788c67cb723ccfa7f1a5987d6db451b27b
      https://github.com/pytest-dev/pytest/commit/4ae7e9788c67cb723ccfa7f1a5987d6db451b27b
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  fix quotes in scope order test


  Commit: 0fd86ec8a815dc84522d4407c8b6aa912153663b
      https://github.com/pytest-dev/pytest/commit/0fd86ec8a815dc84522d4407c8b6aa912153663b
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M src/_pytest/pytester.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py
    M testing/python/fixture.py

  Log Message:
  -----------
  move some fill fixture acceptance tests contents to the examples script folder


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

  Changed paths:
    M src/_pytest/pytester.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3636 from RonnyPfannschmidt/fixturetest-examples

[RFC] Fixturetest examples - move test contents to use example scripts for contents


Compare: https://github.com/pytest-dev/pytest/compare/5226c7fac3ae...f6ceedd15b03
      **NOTE:** This service 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 Jul 11 22:31:52 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 11 Jul 2018 19:31:52 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b48f1d: Clarify examples in
 fixtures' documentation
Message-ID: <5b46bd98cb69a_3cda2add03d35bfc78537@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: b48f1d378b4a9f96425aac848eacf3ef1ee1cce5
      https://github.com/pytest-dev/pytest/commit/b48f1d378b4a9f96425aac848eacf3ef1ee1cce5
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    A changelog/3592.doc.rst
    M doc/en/fixture.rst

  Log Message:
  -----------
  Clarify examples in fixtures' documentation


  Commit: f7c929c932c4a73934ee1ea3cb3fc2a5e2e3e852
      https://github.com/pytest-dev/pytest/commit/f7c929c932c4a73934ee1ea3cb3fc2a5e2e3e852
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M changelog/3592.doc.rst
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix linting errors in docs/fixtures.rst


  Commit: f52a5d3be2b9c7f3145ec28f0650df33d1eb11b6
      https://github.com/pytest-dev/pytest/commit/f52a5d3be2b9c7f3145ec28f0650df33d1eb11b6
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    A changelog/3630.bugfix.rst
    A changelog/3631.bugfix.rst
    M src/_pytest/logging.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M testing/logging/test_reporting.py
    M testing/test_mark.py

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


  Commit: 8232fd1a2d1534b7a99479f12c37ad23a00e0716
      https://github.com/pytest-dev/pytest/commit/8232fd1a2d1534b7a99479f12c37ad23a00e0716
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix remaining "smtp" references


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

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Run pre-commit fixers


  Commit: 4dfe2eee945db025aad942fef71b98b4f789c349
      https://github.com/pytest-dev/pytest/commit/4dfe2eee945db025aad942fef71b98b4f789c349
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix finalize call


  Commit: 2c4759ce5761b3fbc32f1d98a808b655ae964f2d
      https://github.com/pytest-dev/pytest/commit/2c4759ce5761b3fbc32f1d98a808b655ae964f2d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M doc/en/builtin.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst

  Log Message:
  -----------
  Run regendocs


  Commit: 251adbf6444667cda2c5ce24596001ca29a4776e
      https://github.com/pytest-dev/pytest/commit/251adbf6444667cda2c5ce24596001ca29a4776e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M README.rst
    A changelog/2319.trivial.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    R changelog/3630.bugfix.rst
    R changelog/3631.bugfix.rst
    A changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.9.0.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/example/markers.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M src/_pytest/_code/source.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/mark/structures.py
    M src/_pytest/pytester.py
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_pytester.py
    M tox.ini

  Log Message:
  -----------
  Merge with upstream/master


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

  Changed paths:
    M changelog/3592.doc.rst

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


  Commit: 6c3713226c1c619196ddc0fe870ea4fa4f5253c3
      https://github.com/pytest-dev/pytest/commit/6c3713226c1c619196ddc0fe870ea4fa4f5253c3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    A changelog/3592.doc.rst
    M doc/en/fixture.rst

  Log Message:
  -----------
  Merge pull request #3642 from caramelomartins/master

Fixes # 3592 - Clarify Fixtures' Documentation


Compare: https://github.com/pytest-dev/pytest/compare/593b451373ec...6c3713226c1c
      **NOTE:** This service 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 Jul 12 20:31:08 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 12 Jul 2018 17:31:08 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 54fbc6: Refactor parametrize()
 code for readability
Message-ID: <5b47f2cc66406_17022ad466591c0c104041@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 54fbc6f6e1404dcd133f8e01d0fd09518664c3ad
      https://github.com/pytest-dev/pytest/commit/54fbc6f6e1404dcd133f8e01d0fd09518664c3ad
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M src/_pytest/python.py

  Log Message:
  -----------
  Refactor parametrize() code for readability

Extract the parametrize() block of code into methods for better
readability


  Commit: 3e599dc1493fdc38819e96f0176ddde5e46b9622
      https://github.com/pytest-dev/pytest/commit/3e599dc1493fdc38819e96f0176ddde5e46b9622
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

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

  Log Message:
  -----------
  Check that param sets match number of args during _for_parametrize

It makes sense to validate them during creation of the parameter set


  Commit: 0565a7a4e13bb6d2bdded30c09d023322948c45c
      https://github.com/pytest-dev/pytest/commit/0565a7a4e13bb6d2bdded30c09d023322948c45c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

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

  Log Message:
  -----------
  Merge pull request #3679 from nicoddemus/parametrized-internal-refactor

Refactor parametrize() code for readability


Compare: https://github.com/pytest-dev/pytest/compare/6c3713226c1c...0565a7a4e13b
      **NOTE:** This service 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 Jul 15 10:32:21 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 15 Jul 2018 07:32:21 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a0b0c3: Revamp the release
 script: drop invoke and use tox...
Message-ID: <5b4b5af5cbd8b_4c4f2af66670bc1494195@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: a0b0c37febd8752cdf1cb74fe80cd1e180056ba8
      https://github.com/pytest-dev/pytest/commit/a0b0c37febd8752cdf1cb74fe80cd1e180056ba8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-14 (Sat, 14 Jul 2018)

  Changed paths:
    M HOWTORELEASE.rst
    A scripts/release.minor.rst
    A scripts/release.patch.rst
    A scripts/release.py
    R tasks/__init__.py
    R tasks/generate.py
    R tasks/release.minor.rst
    R tasks/release.patch.rst
    R tasks/requirements.txt
    M tox.ini

  Log Message:
  -----------
  Revamp the release script: drop invoke and use tox directly

Following the lead from tox, use a simple Python script instead of depending
on ``invoke``.

Other changes:

* Some colors using ``colorama``.
* Run ``pre-commit`` before the final commit to ensure everything is neatly
  formatted.
* Drop generating local tag: legacy from the time we used ``devpi`` as staging
  area, currently we no longer use it, and we should push a
  tag from the last HEAD of the PR always to ensure it is correct.


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

  Changed paths:
    M HOWTORELEASE.rst
    A scripts/release.minor.rst
    A scripts/release.patch.rst
    A scripts/release.py
    R tasks/__init__.py
    R tasks/generate.py
    R tasks/release.minor.rst
    R tasks/release.patch.rst
    R tasks/requirements.txt
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3682 from nicoddemus/tox-release

Revamp the release script: drop invoke and use tox directly


Compare: https://github.com/pytest-dev/pytest/compare/0565a7a4e13b...a821af6b1c9d
      **NOTE:** This service 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 Jul 15 10:33:08 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 15 Jul 2018 07:33:08 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a8464a: Add CITATION
Message-ID: <5b4b5b24a49e4_25992ac89b39dc10503f3@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: a8464a95cef6c8648c3c05e1e18601e3348f21f5
      https://github.com/pytest-dev/pytest/commit/a8464a95cef6c8648c3c05e1e18601e3348f21f5
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-14 (Sat, 14 Jul 2018)

  Changed paths:
    A CITATION

  Log Message:
  -----------
  Add CITATION

Relates to #3402


  Commit: e9fd038aaeb4951460b94aaa96f1ece174875d66
      https://github.com/pytest-dev/pytest/commit/e9fd038aaeb4951460b94aaa96f1ece174875d66
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-14 (Sat, 14 Jul 2018)

  Changed paths:
    M CITATION

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


  Commit: 5be03bff61f6e84929db10b76271eca1d4278018
      https://github.com/pytest-dev/pytest/commit/5be03bff61f6e84929db10b76271eca1d4278018
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-14 (Sat, 14 Jul 2018)

  Changed paths:
    A changelog/3402.trivial.rst

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


  Commit: 6a4fa4f4859741550ac7469b18f490ab25e30ca3
      https://github.com/pytest-dev/pytest/commit/6a4fa4f4859741550ac7469b18f490ab25e30ca3
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-14 (Sat, 14 Jul 2018)

  Changed paths:
    M changelog/3402.trivial.rst

  Log Message:
  -----------
  Fix more linting issues


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

  Changed paths:
    A CITATION
    A changelog/3402.trivial.rst

  Log Message:
  -----------
  Merge pull request #3683 from caramelomartins/master

[#3402] CITATION


Compare: https://github.com/pytest-dev/pytest/compare/a821af6b1c9d...a1c3df1889d5
      **NOTE:** This service 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 Jul 15 10:34:22 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 15 Jul 2018 07:34:22 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 35ffd2: Manage GH labels using
 the new 'labels' tool
Message-ID: <5b4b5b6e2851a_66252ac9ff541c14778c7@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 35ffd2940427f875f03d6325bb0caf3d8c988461
      https://github.com/pytest-dev/pytest/commit/35ffd2940427f875f03d6325bb0caf3d8c988461
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-14 (Sat, 14 Jul 2018)

  Changed paths:
    A .github/labels.toml
    M doc/en/development_guide.rst

  Log Message:
  -----------
  Manage GH labels using the new 'labels' tool


  Commit: 82a11e62077ae82f1f454e9ef8067fe0f6b0eb6a
      https://github.com/pytest-dev/pytest/commit/82a11e62077ae82f1f454e9ef8067fe0f6b0eb6a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    A .github/labels.toml
    M doc/en/development_guide.rst

  Log Message:
  -----------
  Merge pull request #3680 from nicoddemus/labels

Manage GH labels using the new 'labels' tool


Compare: https://github.com/pytest-dev/pytest/compare/a1c3df1889d5...82a11e62077a
      **NOTE:** This service 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 Jul 15 10:52:13 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 15 Jul 2018 07:52:13 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 58e77f: Replace broken type
 annotations with type comments
Message-ID: <5b4b5f9dc8a1e_5e7c2afd03b19c0435242@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 58e77f58bd5bfea593daeaacc3f934b3c1dfbeb6
      https://github.com/pytest-dev/pytest/commit/58e77f58bd5bfea593daeaacc3f934b3c1dfbeb6
  Author: Vlad Shcherbina <vlad.shcherbina at gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    A changelog/3635.trivial.rst
    M src/_pytest/mark/structures.py

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

Fixes #3635.


  Commit: 771d3e8f4fd1e51c7c8829f1530672d931b12455
      https://github.com/pytest-dev/pytest/commit/771d3e8f4fd1e51c7c8829f1530672d931b12455
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    A changelog/3635.trivial.rst
    M src/_pytest/mark/structures.py

  Log Message:
  -----------
  Merge pull request #3684 from Vlad-Shcherbina/type_comments

Replace broken type annotations with type comments


Compare: https://github.com/pytest-dev/pytest/compare/82a11e62077a...771d3e8f4fd1
      **NOTE:** This service 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 Jul 15 13:43:16 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 15 Jul 2018 10:43:16 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d2fe61: Fix truncated locals in
 verbose mode
Message-ID: <5b4b87b4979cc_da792ad2b2919c04385c6@hookshot-fe-dfcc362.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: d2fe6191201139570501bdd8d213b05b6aeba732
      https://github.com/pytest-dev/pytest/commit/d2fe6191201139570501bdd8d213b05b6aeba732
  Author: Tadek Tele?y?ski <tadekte at gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

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

  Log Message:
  -----------
  Fix truncated locals in verbose mode


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

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

  Log Message:
  -----------
  Merge pull request #3681 from tadeoos/980-fix-truncated-locals-in-verbose

Fix truncated locals in verbose mode


Compare: https://github.com/pytest-dev/pytest/compare/f6ceedd15b03...db33f03c15ff
      **NOTE:** This service 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 Jul 15 15:53:41 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 15 Jul 2018 12:53:41 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b48f1d: Clarify examples in
 fixtures' documentation
Message-ID: <5b4ba64570db4_2f5e2b1f0f3b5c14400ef@hookshot-fe-b0febf1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: b48f1d378b4a9f96425aac848eacf3ef1ee1cce5
      https://github.com/pytest-dev/pytest/commit/b48f1d378b4a9f96425aac848eacf3ef1ee1cce5
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    A changelog/3592.doc.rst
    M doc/en/fixture.rst

  Log Message:
  -----------
  Clarify examples in fixtures' documentation


  Commit: f7c929c932c4a73934ee1ea3cb3fc2a5e2e3e852
      https://github.com/pytest-dev/pytest/commit/f7c929c932c4a73934ee1ea3cb3fc2a5e2e3e852
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M changelog/3592.doc.rst
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix linting errors in docs/fixtures.rst


  Commit: f52a5d3be2b9c7f3145ec28f0650df33d1eb11b6
      https://github.com/pytest-dev/pytest/commit/f52a5d3be2b9c7f3145ec28f0650df33d1eb11b6
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    A changelog/3630.bugfix.rst
    A changelog/3631.bugfix.rst
    M src/_pytest/logging.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M testing/logging/test_reporting.py
    M testing/test_mark.py

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


  Commit: 8232fd1a2d1534b7a99479f12c37ad23a00e0716
      https://github.com/pytest-dev/pytest/commit/8232fd1a2d1534b7a99479f12c37ad23a00e0716
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix remaining "smtp" references


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

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Run pre-commit fixers


  Commit: 50f030d2330280abc31824075660a9d5d0aaa808
      https://github.com/pytest-dev/pytest/commit/50f030d2330280abc31824075660a9d5d0aaa808
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/example/markers.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst

  Log Message:
  -----------
  Correct code blocks in docs


  Commit: 7e8f7bfa1626e9a06b5a9d9ac0580c1f7577a209
      https://github.com/pytest-dev/pytest/commit/7e8f7bfa1626e9a06b5a9d9ac0580c1f7577a209
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/example/markers.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst

  Log Message:
  -----------
  Merge pull request #3660 from asottile/code_highlight_fix

Correct code blocks in docs


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add reference docs for pytest.mark.usefixtures


  Commit: 18b2fc11adf4b79d860ba91b73678a22c0c53083
      https://github.com/pytest-dev/pytest/commit/18b2fc11adf4b79d860ba91b73678a22c0c53083
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Dummy change


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

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Adjust copyright in README


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

  Changed paths:
    M doc/en/fixture.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Add a warning about usefixtures mark not working in fixtures

Fix #1014


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Skip deploy stage entirely unless we have a tag

Borrowed from https://github.com/tox-dev/tox/pull/877


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

  Changed paths:
    M doc/en/fixture.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Merge pull request #3663 from nicoddemus/usefixtures-reference

Add reference docs for pytest.mark.usefixtures


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge pull request #3666 from nicoddemus/deploy-on-tags

Skip deploy stage entirely unless we have a tag


  Commit: 42bbb4fa8a43b913ce267454f417605f9744a95b
      https://github.com/pytest-dev/pytest/commit/42bbb4fa8a43b913ce267454f417605f9744a95b
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    A changelog/742.bugfix.rst
    M src/_pytest/pytester.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Use -mpytest when invoking pytest in pytester


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

  Changed paths:
    A changelog/742.bugfix.rst
    M src/_pytest/pytester.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Merge pull request #3667 from asottile/avoid_sys_path_pollution_742

Use -mpytest when invoking pytest in pytester


  Commit: 4ae93a7a078fc92d910b632a46a86cb779b3e2b7
      https://github.com/pytest-dev/pytest/commit/4ae93a7a078fc92d910b632a46a86cb779b3e2b7
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-08 (Sun, 08 Jul 2018)

  Changed paths:
    A changelog/2319.trivial.rst
    M src/_pytest/_code/source.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py

  Log Message:
  -----------
  Remove obsolete __future__ imports


  Commit: 9ef7878cbca555000d88a0ae3abb8cf809e69557
      https://github.com/pytest-dev/pytest/commit/9ef7878cbca555000d88a0ae3abb8cf809e69557
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-08 (Sun, 08 Jul 2018)

  Changed paths:
    A changelog/2319.trivial.rst
    M src/_pytest/_code/source.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #3668 from asottile/remove_obsolete_future_imports

Remove obsolete __future__ imports


  Commit: af0059079cb35372fe9fceeeb6bb183795ce3b7e
      https://github.com/pytest-dev/pytest/commit/af0059079cb35372fe9fceeeb6bb183795ce3b7e
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-08 (Sun, 08 Jul 2018)

  Changed paths:
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M tox.ini

  Log Message:
  -----------
  Remove unused fix-lint tox environment


  Commit: 61301d934e5e08620c5f7be82384bc07d3d51ea9
      https://github.com/pytest-dev/pytest/commit/61301d934e5e08620c5f7be82384bc07d3d51ea9
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-08 (Sun, 08 Jul 2018)

  Changed paths:
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M testing/test_assertrewrite.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Remove some extraneous `# noqa` comments

This was partially automated with https://github.com/asottile/yesqa

_with a few caveats_:
- it was run under python2 (chosen arbitrarily, when run under python3 other
  things were changed)
- I used `git checkout -p` to revert the removal of `noqa` comments from
  `cmp()` lines.


  Commit: 898544e147135873ddc7e984eb83defa304dd886
      https://github.com/pytest-dev/pytest/commit/898544e147135873ddc7e984eb83defa304dd886
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M testing/test_assertrewrite.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Merge pull request #3669 from asottile/yesqa

Remove some extraneous `# noqa` comments


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

  Changed paths:
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3670 from asottile/remove_unused_fix_lint

Remove unused fix-lint tox environment


  Commit: 4dfe2eee945db025aad942fef71b98b4f789c349
      https://github.com/pytest-dev/pytest/commit/4dfe2eee945db025aad942fef71b98b4f789c349
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix finalize call


  Commit: 2c4759ce5761b3fbc32f1d98a808b655ae964f2d
      https://github.com/pytest-dev/pytest/commit/2c4759ce5761b3fbc32f1d98a808b655ae964f2d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M doc/en/builtin.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst

  Log Message:
  -----------
  Run regendocs


  Commit: 251adbf6444667cda2c5ce24596001ca29a4776e
      https://github.com/pytest-dev/pytest/commit/251adbf6444667cda2c5ce24596001ca29a4776e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M README.rst
    A changelog/2319.trivial.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    R changelog/3630.bugfix.rst
    R changelog/3631.bugfix.rst
    A changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.9.0.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/example/markers.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M src/_pytest/_code/source.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/mark/structures.py
    M src/_pytest/pytester.py
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_pytester.py
    M tox.ini

  Log Message:
  -----------
  Merge with upstream/master


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

  Changed paths:
    M changelog/3592.doc.rst

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


  Commit: 54fbc6f6e1404dcd133f8e01d0fd09518664c3ad
      https://github.com/pytest-dev/pytest/commit/54fbc6f6e1404dcd133f8e01d0fd09518664c3ad
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M src/_pytest/python.py

  Log Message:
  -----------
  Refactor parametrize() code for readability

Extract the parametrize() block of code into methods for better
readability


  Commit: 3e599dc1493fdc38819e96f0176ddde5e46b9622
      https://github.com/pytest-dev/pytest/commit/3e599dc1493fdc38819e96f0176ddde5e46b9622
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

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

  Log Message:
  -----------
  Check that param sets match number of args during _for_parametrize

It makes sense to validate them during creation of the parameter set


  Commit: 6c3713226c1c619196ddc0fe870ea4fa4f5253c3
      https://github.com/pytest-dev/pytest/commit/6c3713226c1c619196ddc0fe870ea4fa4f5253c3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    A changelog/3592.doc.rst
    M doc/en/fixture.rst

  Log Message:
  -----------
  Merge pull request #3642 from caramelomartins/master

Fixes # 3592 - Clarify Fixtures' Documentation


  Commit: 0565a7a4e13bb6d2bdded30c09d023322948c45c
      https://github.com/pytest-dev/pytest/commit/0565a7a4e13bb6d2bdded30c09d023322948c45c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

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

  Log Message:
  -----------
  Merge pull request #3679 from nicoddemus/parametrized-internal-refactor

Refactor parametrize() code for readability


  Commit: 35ffd2940427f875f03d6325bb0caf3d8c988461
      https://github.com/pytest-dev/pytest/commit/35ffd2940427f875f03d6325bb0caf3d8c988461
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-14 (Sat, 14 Jul 2018)

  Changed paths:
    A .github/labels.toml
    M doc/en/development_guide.rst

  Log Message:
  -----------
  Manage GH labels using the new 'labels' tool


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

  Changed paths:
    M HOWTORELEASE.rst
    A scripts/release.minor.rst
    A scripts/release.patch.rst
    A scripts/release.py
    R tasks/__init__.py
    R tasks/generate.py
    R tasks/release.minor.rst
    R tasks/release.patch.rst
    R tasks/requirements.txt
    M tox.ini

  Log Message:
  -----------
  Revamp the release script: drop invoke and use tox directly

Following the lead from tox, use a simple Python script instead of depending
on ``invoke``.

Other changes:

* Some colors using ``colorama``.
* Run ``pre-commit`` before the final commit to ensure everything is neatly
  formatted.
* Drop generating local tag: legacy from the time we used ``devpi`` as staging
  area, currently we no longer use it, and we should push a
  tag from the last HEAD of the PR always to ensure it is correct.


  Commit: a8464a95cef6c8648c3c05e1e18601e3348f21f5
      https://github.com/pytest-dev/pytest/commit/a8464a95cef6c8648c3c05e1e18601e3348f21f5
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-14 (Sat, 14 Jul 2018)

  Changed paths:
    A CITATION

  Log Message:
  -----------
  Add CITATION

Relates to #3402


  Commit: e9fd038aaeb4951460b94aaa96f1ece174875d66
      https://github.com/pytest-dev/pytest/commit/e9fd038aaeb4951460b94aaa96f1ece174875d66
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-14 (Sat, 14 Jul 2018)

  Changed paths:
    M CITATION

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


  Commit: 5be03bff61f6e84929db10b76271eca1d4278018
      https://github.com/pytest-dev/pytest/commit/5be03bff61f6e84929db10b76271eca1d4278018
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-14 (Sat, 14 Jul 2018)

  Changed paths:
    A changelog/3402.trivial.rst

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


  Commit: 6a4fa4f4859741550ac7469b18f490ab25e30ca3
      https://github.com/pytest-dev/pytest/commit/6a4fa4f4859741550ac7469b18f490ab25e30ca3
  Author: Hugo Martins <caramelo.martins at gmail.com>
  Date:   2018-07-14 (Sat, 14 Jul 2018)

  Changed paths:
    M changelog/3402.trivial.rst

  Log Message:
  -----------
  Fix more linting issues


  Commit: 58e77f58bd5bfea593daeaacc3f934b3c1dfbeb6
      https://github.com/pytest-dev/pytest/commit/58e77f58bd5bfea593daeaacc3f934b3c1dfbeb6
  Author: Vlad Shcherbina <vlad.shcherbina at gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    A changelog/3635.trivial.rst
    M src/_pytest/mark/structures.py

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

Fixes #3635.


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

  Changed paths:
    M HOWTORELEASE.rst
    A scripts/release.minor.rst
    A scripts/release.patch.rst
    A scripts/release.py
    R tasks/__init__.py
    R tasks/generate.py
    R tasks/release.minor.rst
    R tasks/release.patch.rst
    R tasks/requirements.txt
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3682 from nicoddemus/tox-release

Revamp the release script: drop invoke and use tox directly


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

  Changed paths:
    A CITATION
    A changelog/3402.trivial.rst

  Log Message:
  -----------
  Merge pull request #3683 from caramelomartins/master

[#3402] CITATION


  Commit: 82a11e62077ae82f1f454e9ef8067fe0f6b0eb6a
      https://github.com/pytest-dev/pytest/commit/82a11e62077ae82f1f454e9ef8067fe0f6b0eb6a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    A .github/labels.toml
    M doc/en/development_guide.rst

  Log Message:
  -----------
  Merge pull request #3680 from nicoddemus/labels

Manage GH labels using the new 'labels' tool


  Commit: 771d3e8f4fd1e51c7c8829f1530672d931b12455
      https://github.com/pytest-dev/pytest/commit/771d3e8f4fd1e51c7c8829f1530672d931b12455
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    A changelog/3635.trivial.rst
    M src/_pytest/mark/structures.py

  Log Message:
  -----------
  Merge pull request #3684 from Vlad-Shcherbina/type_comments

Replace broken type annotations with type comments


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

  Changed paths:
    A .github/labels.toml
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    A CITATION
    M HOWTORELEASE.rst
    M README.rst
    A changelog/2319.trivial.rst
    A changelog/3402.trivial.rst
    A changelog/3592.doc.rst
    A changelog/3635.trivial.rst
    A changelog/742.bugfix.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/development_guide.rst
    M doc/en/example/markers.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    A scripts/release.minor.rst
    A scripts/release.patch.rst
    A scripts/release.py
    M src/_pytest/_code/source.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/mark/structures.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    R tasks/__init__.py
    R tasks/generate.py
    R tasks/release.minor.rst
    R tasks/release.patch.rst
    R tasks/requirements.txt
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_pytester.py
    M tox.ini

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


  Commit: 0bb29d56492258a751a964e4ba729da1f7f52802
      https://github.com/pytest-dev/pytest/commit/0bb29d56492258a751a964e4ba729da1f7f52802
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    A .github/labels.toml
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    A CITATION
    M HOWTORELEASE.rst
    M README.rst
    A changelog/2319.trivial.rst
    A changelog/3402.trivial.rst
    A changelog/3592.doc.rst
    A changelog/3635.trivial.rst
    A changelog/742.bugfix.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/development_guide.rst
    M doc/en/example/markers.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    A scripts/release.minor.rst
    A scripts/release.patch.rst
    A scripts/release.py
    M src/_pytest/_code/source.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/mark/structures.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    R tasks/__init__.py
    R tasks/generate.py
    R tasks/release.minor.rst
    R tasks/release.patch.rst
    R tasks/requirements.txt
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_pytester.py
    M tox.ini

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

Merge master into features


Compare: https://github.com/pytest-dev/pytest/compare/db33f03c15ff...0bb29d564922
      **NOTE:** This service 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 Jul 23 10:14:41 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 23 Jul 2018 07:14:41 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 2e344d: Do not claim copyright
 for future years
Message-ID: <5b55e2d12d8bc_18ee2aae95536f8895765@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 2e344d4d63aaf32a759d602aee4e3f69a24e90dd
      https://github.com/pytest-dev/pytest/commit/2e344d4d63aaf32a759d602aee4e3f69a24e90dd
  Author: Bernhard M. Wiedemann <bwiedemann at suse.de>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M doc/en/conf.py

  Log Message:
  -----------
  Do not claim copyright for future years

When building today's python-pytest-doc openSUSE package
in the year 2033, the documentation .html files state
Copyright 2015-2033 , holger krekel and pytest-dev team.

That cannot be correct, because nobody did anything copyright-worthy
for this file in 2033.

See also https://stackoverflow.com/questions/2390230/do-copyright-dates-need-to-be-updated

Additionally, this change makes the package build reproducible.
See https://reproducible-builds.org/ for why this is good.


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

  Changed paths:
    M doc/en/conf.py

  Log Message:
  -----------
  Merge pull request #3710 from bmwiedemann/date

Do not claim copyright for future years


Compare: https://github.com/pytest-dev/pytest/compare/f76142508f2b...b7419bd9bb2a
      **NOTE:** This service 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 Jul 27 08:21:20 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 27 Jul 2018 05:21:20 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 79b4ca: Use "pytest" on the
 CHANGELOG
Message-ID: <5b5b0e40a72e6_2bbc2ac3cb814f70317e@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/nicoddemus-patch-1
  Home:   https://github.com/pytest-dev/pytest
  Commit: 79b4ca92d8bd294b600882a281ec4519bd746680
      https://github.com/pytest-dev/pytest/commit/79b4ca92d8bd294b600882a281ec4519bd746680
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-27 (Fri, 27 Jul 2018)

  Changed paths:
    M pyproject.toml

  Log Message:
  -----------
  Use "pytest" on the CHANGELOG



      **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 Jul 27 09:23:13 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 27 Jul 2018 06:23:13 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 79b4ca: Use "pytest" on the
 CHANGELOG
Message-ID: <5b5b1cc1981cb_6d82ac9c0b3ef84958a@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 79b4ca92d8bd294b600882a281ec4519bd746680
      https://github.com/pytest-dev/pytest/commit/79b4ca92d8bd294b600882a281ec4519bd746680
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-27 (Fri, 27 Jul 2018)

  Changed paths:
    M pyproject.toml

  Log Message:
  -----------
  Use "pytest" on the CHANGELOG


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

  Changed paths:
    M pyproject.toml

  Log Message:
  -----------
  Merge pull request #3723 from pytest-dev/nicoddemus-patch-1

Use "pytest" on the CHANGELOG


Compare: https://github.com/pytest-dev/pytest/compare/b7419bd9bb2a...fe06be85905e
      **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 Jul 27 09:23:15 2018
From: nicoddemus at gmail.com (nicoddemus)
Date: Fri, 27 Jul 2018 06:23:15 -0700
Subject: [Pytest-commit] [pytest-dev/pytest]
Message-ID: <5b5b1cc31f37c_16b2b13e93def8c8636f@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/nicoddemus-patch-1
  Home:   https://github.com/pytest-dev/pytest

      **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 Jul 27 14:09:10 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 27 Jul 2018 11:09:10 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 011f88: Deprecate calling
 fixture functions directly
Message-ID: <5b5b5fc6d1a21_70152acfd9aeef8876356@hookshot-fe-cace476.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 011f88f7e77b8b2e6de01d2c5588dda47c77093b
      https://github.com/pytest-dev/pytest/commit/011f88f7e77b8b2e6de01d2c5588dda47c77093b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    A changelog/3661.removal.rst
    M src/_pytest/compat.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/pytester.py
    M testing/deprecated_test.py
    A testing/example_scripts/tmpdir/tmpdir_fixture.py
    M testing/python/fixture.py
    M testing/test_assertion.py
    M testing/test_conftest.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Deprecate calling fixture functions directly

This will now issue a RemovedInPytest4Warning when the user calls
a fixture function directly, instead of requesting it from test
functions as is expected

Fix #3661


  Commit: 6e57d123bb240e4b3668fc4e422a6e0f01d08f17
      https://github.com/pytest-dev/pytest/commit/6e57d123bb240e4b3668fc4e422a6e0f01d08f17
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M testing/python/metafunc.py

  Log Message:
  -----------
  Mark test_idval_hypothesis as flaky on Windows (#3707)


  Commit: 57b0c60cb4a083592cce04e8b383b55bf14a59dc
      https://github.com/pytest-dev/pytest/commit/57b0c60cb4a083592cce04e8b383b55bf14a59dc
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Remove Testdir.run_example as recommended


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

  Changed paths:
    A changelog/3661.removal.rst
    M src/_pytest/compat.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    A testing/example_scripts/tmpdir/tmpdir_fixture.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_conftest.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Merge pull request #3705 from nicoddemus/deprecate-call-fixture-func

 Deprecate calling fixture functions directly


Compare: https://github.com/pytest-dev/pytest/compare/f8749eeb5c56...fe16f81da14b
      **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 Jul 28 11:15:21 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 28 Jul 2018 08:15:21 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7f2751: Pin pluggy to <0.8
Message-ID: <5b5c88892afe7_461a2b0bfcda4f709938b@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/tags/3.6.4
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7f27512a48de0c80c10b876e7d5282fe1c3bcd8a
      https://github.com/pytest-dev/pytest/commit/7f27512a48de0c80c10b876e7d5282fe1c3bcd8a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-28 (Sat, 28 Jul 2018)

  Changed paths:
    A changelog/3727.trivial.rst
    M setup.py

  Log Message:
  -----------
  Pin pluggy to <0.8


  Commit: 317cd41215cc4e6e829f86afdacf0dc15bb43e36
      https://github.com/pytest-dev/pytest/commit/317cd41215cc4e6e829f86afdacf0dc15bb43e36
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-28 (Sat, 28 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/3727.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Preparing release version 3.6.4


Compare: https://github.com/pytest-dev/pytest/compare/7f27512a48de^...317cd41215cc
      **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 Jul 28 11:53:51 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 28 Jul 2018 08:53:51 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7f2751: Pin pluggy to <0.8
Message-ID: <5b5c918fc4c3b_16b2b13e93def8c915cc@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7f27512a48de0c80c10b876e7d5282fe1c3bcd8a
      https://github.com/pytest-dev/pytest/commit/7f27512a48de0c80c10b876e7d5282fe1c3bcd8a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-28 (Sat, 28 Jul 2018)

  Changed paths:
    A changelog/3727.trivial.rst
    M setup.py

  Log Message:
  -----------
  Pin pluggy to <0.8


  Commit: 317cd41215cc4e6e829f86afdacf0dc15bb43e36
      https://github.com/pytest-dev/pytest/commit/317cd41215cc4e6e829f86afdacf0dc15bb43e36
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-28 (Sat, 28 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/3727.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Preparing release version 3.6.4


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3728 from nicoddemus/release-3.6.4

Release 3.6.4


Compare: https://github.com/pytest-dev/pytest/compare/fe06be85905e...eaeeedc9c305
      **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 Jul 29 18:42:26 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 29 Jul 2018 15:42:26 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b6da5c: Fix "Pytest" to
 "pytest" in the CHANGELOG
Message-ID: <5b5e42d2a2fc3_40bc2af43f61cf84423bd@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: b6da5cc54c04e5ee8c1987ae3ec647711ebc625d
      https://github.com/pytest-dev/pytest/commit/b6da5cc54c04e5ee8c1987ae3ec647711ebc625d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-28 (Sat, 28 Jul 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix "Pytest" to "pytest" in the CHANGELOG

Now that we have fixed towncrier to render the proper title, seems fitting
to update the others


  Commit: 3f3f6f1be433d45826ae95db7ddbe8c900d3ec62
      https://github.com/pytest-dev/pytest/commit/3f3f6f1be433d45826ae95db7ddbe8c900d3ec62
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Merge pull request #3729 from nicoddemus/fix-changelog-titles

Fix "Pytest" to "pytest" in the CHANGELOG


Compare: https://github.com/pytest-dev/pytest/compare/eaeeedc9c305...3f3f6f1be433
      **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 Jul 29 19:52:29 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 29 Jul 2018 16:52:29 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 8d401c: Use upstream
 rst-backticks hook
Message-ID: <5b5e533dae8f3_285c2ae31777cf84691f7@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 8d401cdb9df6fe4b349ff246ef3ec93f87254fc7
      https://github.com/pytest-dev/pytest/commit/8d401cdb9df6fe4b349ff246ef3ec93f87254fc7
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

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

  Log Message:
  -----------
  Use upstream rst-backticks hook


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

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

  Log Message:
  -----------
  Merge pull request #3731 from asottile/pygrep_hooks

Use upstream rst-backticks hook


Compare: https://github.com/pytest-dev/pytest/compare/3f3f6f1be433...d900a6c8bdaf
      **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 Jul 29 20:14:11 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 29 Jul 2018 17:14:11 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] fe46fb: Fix reference to
 _Result in docs
Message-ID: <5b5e58532a0e8_17ba2b0622582f8457718@hookshot-fe-da92815.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: fe46fbb71954a8d81e7d5441429f9d7464669186
      https://github.com/pytest-dev/pytest/commit/fe46fbb71954a8d81e7d5441429f9d7464669186
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Fix reference to _Result in docs


  Commit: 0b522d40a7108e9d0be07c984884f3b0491f44d8
      https://github.com/pytest-dev/pytest/commit/0b522d40a7108e9d0be07c984884f3b0491f44d8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Merge pull request #3734 from nicoddemus/fix-docs

Fix reference to _Result in docs


Compare: https://github.com/pytest-dev/pytest/compare/d900a6c8bdaf...0b522d40a710
      **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 Jul 29 20:26:04 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 29 Jul 2018 17:26:04 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f99da9: Issue #3295: Correct
 the usage of --last-failed-no...
Message-ID: <5b5e5b1c83ed8_466d2ac4c4f8ef7c9728@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: f99da9058f8569f8186515ba8d550fc7f019f5c1
      https://github.com/pytest-dev/pytest/commit/f99da9058f8569f8186515ba8d550fc7f019f5c1
  Author: Ammar Najjar <najjarammar at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M doc/en/cache.rst

  Log Message:
  -----------
  Issue #3295: Correct the usage of --last-failed-no-failures documentation

- add the missing --last-failed argument in the presented examples, for they are missleading and lead to think that the missing argument is not needed.


  Commit: 9ddd5737743150d07b51fd354f441ec441409b68
      https://github.com/pytest-dev/pytest/commit/9ddd5737743150d07b51fd354f441ec441409b68
  Author: Ammar Najjar <najjarammar at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    A changelog/3295.doc.rst

  Log Message:
  -----------
  Issue #3295: add changelog doc entry for adding a missing argument in
the examples


  Commit: 6f9a12a8a35b34f0ae426c059ce77d53e4daa2c2
      https://github.com/pytest-dev/pytest/commit/6f9a12a8a35b34f0ae426c059ce77d53e4daa2c2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    A changelog/3295.doc.rst
    M doc/en/cache.rst

  Log Message:
  -----------
  Merge pull request #3486 from ammarnajjar/last-failed-no-failures_docs_correction

--last-failed-no-failures docs correction


Compare: https://github.com/pytest-dev/pytest/compare/0b522d40a710...6f9a12a8a35b
      **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 Jul 30 06:26:21 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 30 Jul 2018 03:26:21 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 21f522: Fix fixture.rst
 spelling & grammar
Message-ID: <5b5ee7cd434c8_70dc2ade4eb44f9010601a@hookshot-fe-cace476.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 21f522278403362908805ea015a39a6acabf2a01
      https://github.com/pytest-dev/pytest/commit/21f522278403362908805ea015a39a6acabf2a01
  Author: Drew <drewrisinger at users.noreply.github.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix fixture.rst spelling & grammar

Fix a few typos.


  Commit: 254689ff8369adc465f1cc78a38a1e06ed63488c
      https://github.com/pytest-dev/pytest/commit/254689ff8369adc465f1cc78a38a1e06ed63488c
  Author: Drew <drewrisinger at users.noreply.github.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  Fix mark.rst typos & grammar

Fix minor typos


  Commit: 9720c3301aa3296f941c71a0f45bcd7054c0c9fc
      https://github.com/pytest-dev/pytest/commit/9720c3301aa3296f941c71a0f45bcd7054c0c9fc
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Merge pull request #3690 from drewrisinger/patch-1

Fix fixture.rst typos & grammar


  Commit: 19de1b7f291d21b4b6e38c8627a79231a2f21cc7
      https://github.com/pytest-dev/pytest/commit/19de1b7f291d21b4b6e38c8627a79231a2f21cc7
  Author: E Hershey <github at ernie.org>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  typo - PYTEST_ADDOTPS -> PYTEST_ADDOPTS


  Commit: be2afb950ac2e7df8866b66edeaa9294c88e5714
      https://github.com/pytest-dev/pytest/commit/be2afb950ac2e7df8866b66edeaa9294c88e5714
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  Merge pull request #3706 from ehershey/patch-1

typo - $PYTEST_ADDOTPS -> $PYTEST_ADDOPTS


  Commit: f76142508f2b24cdee93453088c6999dc54f99bb
      https://github.com/pytest-dev/pytest/commit/f76142508f2b24cdee93453088c6999dc54f99bb
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  Merge pull request #3694 from drewrisinger/patch-2

Fix mark.rst typos & grammar


  Commit: 2e344d4d63aaf32a759d602aee4e3f69a24e90dd
      https://github.com/pytest-dev/pytest/commit/2e344d4d63aaf32a759d602aee4e3f69a24e90dd
  Author: Bernhard M. Wiedemann <bwiedemann at suse.de>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M doc/en/conf.py

  Log Message:
  -----------
  Do not claim copyright for future years

When building today's python-pytest-doc openSUSE package
in the year 2033, the documentation .html files state
Copyright 2015-2033 , holger krekel and pytest-dev team.

That cannot be correct, because nobody did anything copyright-worthy
for this file in 2033.

See also https://stackoverflow.com/questions/2390230/do-copyright-dates-need-to-be-updated

Additionally, this change makes the package build reproducible.
See https://reproducible-builds.org/ for why this is good.


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

  Changed paths:
    M doc/en/conf.py

  Log Message:
  -----------
  Merge pull request #3710 from bmwiedemann/date

Do not claim copyright for future years


  Commit: 79b4ca92d8bd294b600882a281ec4519bd746680
      https://github.com/pytest-dev/pytest/commit/79b4ca92d8bd294b600882a281ec4519bd746680
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-27 (Fri, 27 Jul 2018)

  Changed paths:
    M pyproject.toml

  Log Message:
  -----------
  Use "pytest" on the CHANGELOG


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

  Changed paths:
    M pyproject.toml

  Log Message:
  -----------
  Merge pull request #3723 from pytest-dev/nicoddemus-patch-1

Use "pytest" on the CHANGELOG


  Commit: 7f27512a48de0c80c10b876e7d5282fe1c3bcd8a
      https://github.com/pytest-dev/pytest/commit/7f27512a48de0c80c10b876e7d5282fe1c3bcd8a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-28 (Sat, 28 Jul 2018)

  Changed paths:
    A changelog/3727.trivial.rst
    M setup.py

  Log Message:
  -----------
  Pin pluggy to <0.8


  Commit: 317cd41215cc4e6e829f86afdacf0dc15bb43e36
      https://github.com/pytest-dev/pytest/commit/317cd41215cc4e6e829f86afdacf0dc15bb43e36
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-28 (Sat, 28 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/3727.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Preparing release version 3.6.4


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3728 from nicoddemus/release-3.6.4

Release 3.6.4


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix "Pytest" to "pytest" in the CHANGELOG

Now that we have fixed towncrier to render the proper title, seems fitting
to update the others


  Commit: 3f3f6f1be433d45826ae95db7ddbe8c900d3ec62
      https://github.com/pytest-dev/pytest/commit/3f3f6f1be433d45826ae95db7ddbe8c900d3ec62
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Merge pull request #3729 from nicoddemus/fix-changelog-titles

Fix "Pytest" to "pytest" in the CHANGELOG


  Commit: 8d401cdb9df6fe4b349ff246ef3ec93f87254fc7
      https://github.com/pytest-dev/pytest/commit/8d401cdb9df6fe4b349ff246ef3ec93f87254fc7
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

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

  Log Message:
  -----------
  Use upstream rst-backticks hook


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Fix reference to _Result in docs


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

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

  Log Message:
  -----------
  Merge pull request #3731 from asottile/pygrep_hooks

Use upstream rst-backticks hook


  Commit: 0b522d40a7108e9d0be07c984884f3b0491f44d8
      https://github.com/pytest-dev/pytest/commit/0b522d40a7108e9d0be07c984884f3b0491f44d8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Merge pull request #3734 from nicoddemus/fix-docs

Fix reference to _Result in docs


  Commit: 0e475995720b846db91d02384b61ad8a54e9229d
      https://github.com/pytest-dev/pytest/commit/0e475995720b846db91d02384b61ad8a54e9229d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/conf.py
    M doc/en/customize.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M pyproject.toml
    M setup.py

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


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

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/conf.py
    M doc/en/customize.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M pyproject.toml
    M setup.py

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

Merge master into features


Compare: https://github.com/pytest-dev/pytest/compare/fe16f81da14b...8af78f417f19
      **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 Jul 30 16:09:20 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 30 Jul 2018 13:09:20 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7bff58: bugfix in ApproxNumpy
 initialisation, use keywords...
Message-ID: <5b5f70709e86_95d2ac6ecd40f70669df@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7bff5866b1dd7992d9bdcdce1bac41fe043760c1
      https://github.com/pytest-dev/pytest/commit/7bff5866b1dd7992d9bdcdce1bac41fe043760c1
  Author: Alan <alan at climacell.co>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  bugfix in ApproxNumpy initialisation, use keywords for arguments now


  Commit: 75db6084792c3b33c56b57c1a5c5e7ea612f84da
      https://github.com/pytest-dev/pytest/commit/75db6084792c3b33c56b57c1a5c5e7ea612f84da
  Author: Alan Brammer <a1brammer at gmail.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    A changelog/3695.bugfix.rst

  Log Message:
  -----------
  update changelog


  Commit: 514ca6f4adcfe24efd0f221d7d00220275446f76
      https://github.com/pytest-dev/pytest/commit/514ca6f4adcfe24efd0f221d7d00220275446f76
  Author: abrammer <abrammer at albany.edu>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M testing/python/approx.py

  Log Message:
  -----------
  add test wrt #3695 checking numpy array tolerance args


  Commit: f0db64ac2e1ba54281c62049f191f1bb2c3565e7
      https://github.com/pytest-dev/pytest/commit/f0db64ac2e1ba54281c62049f191f1bb2c3565e7
  Author: abrammer <abrammer at albany.edu>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

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

  Log Message:
  -----------
  drop the duplicate approx call
update test to include both np.array(actual) and np.array(expected)


  Commit: 2eb9301ad553961bd4a4a48519df867879a03f35
      https://github.com/pytest-dev/pytest/commit/2eb9301ad553961bd4a4a48519df867879a03f35
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-25 (Wed, 25 Jul 2018)

  Changed paths:
    M changelog/3695.bugfix.rst

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


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

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Implement change suggested by @kalekundert in PR


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

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Need to iterate over the flattened array.


  Commit: 330640eb96bb70d9c7ce01841b22a87904cdc703
      https://github.com/pytest-dev/pytest/commit/330640eb96bb70d9c7ce01841b22a87904cdc703
  Author: abrammer <abrammer at albany.edu>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M testing/python/approx.py

  Log Message:
  -----------
  update tests to check tolerance args and expecing nan in numpy arrays


  Commit: 762eaf443a72b4345bfd08cc423d3cf5c0a90224
      https://github.com/pytest-dev/pytest/commit/762eaf443a72b4345bfd08cc423d3cf5c0a90224
  Author: abrammer <abrammer at albany.edu>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M changelog/3695.bugfix.rst

  Log Message:
  -----------
  update changelog to include the addition of tests


  Commit: 535fd1f3117e0f7d72abc80bfe1faef7033146b5
      https://github.com/pytest-dev/pytest/commit/535fd1f3117e0f7d72abc80bfe1faef7033146b5
  Author: abrammer <abrammer at albany.edu>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M testing/python/approx.py

  Log Message:
  -----------
  may as well include inf test while we're at it


  Commit: 150535b6c11b16ad38299ea93246b5ad55ce013c
      https://github.com/pytest-dev/pytest/commit/150535b6c11b16ad38299ea93246b5ad55ce013c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

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

  Log Message:
  -----------
  Merge pull request #3696 from abrammer/approx_numpy_tolerance_bugfix

bugfix in ApproxNumpy initialisation, use keywords for arguments to fix


Compare: https://github.com/pytest-dev/pytest/compare/f1ec02cdcd6a...150535b6c11b
      **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 Jul 30 19:04:26 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 30 Jul 2018 16:04:26 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] eada0b: Merge remote-tracking
 branch 'upstream/master' int...
Message-ID: <5b5f997a8f3f2_34af2ac3eca30f7c8954f@hookshot-fe-cace476.cp1-iad.github.net.mail>

  Branch: refs/tags/3.7.0
  Home:   https://github.com/pytest-dev/pytest
  Commit: eada0b1fd7a892be9c8e32cac7b3af26b919056d
      https://github.com/pytest-dev/pytest/commit/eada0b1fd7a892be9c8e32cac7b3af26b919056d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    A changelog/3295.doc.rst
    A changelog/3695.bugfix.rst
    M doc/en/cache.rst
    M src/_pytest/python_api.py
    M testing/python/approx.py

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


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

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Use python 3.6 for regendoc


  Commit: 2c09930b6d701d91a0284c6d44086488ffbcb419
      https://github.com/pytest-dev/pytest/commit/2c09930b6d701d91a0284c6d44086488ffbcb419
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Use proper quotes for python 3.7 on travis.yml


  Commit: 60b1913ba21094da5eb91d8c68642c38f20f6a26
      https://github.com/pytest-dev/pytest/commit/60b1913ba21094da5eb91d8c68642c38f20f6a26
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2220.bugfix.rst
    R changelog/2283.feature
    R changelog/2639.removal.rst
    R changelog/3295.doc.rst
    R changelog/3519.trivial.rst
    R changelog/3576.feature.rst
    R changelog/3579.feature.rst
    R changelog/3610.feature.rst
    R changelog/3623.feature.rst
    R changelog/3661.removal.rst
    R changelog/3695.bugfix.rst
    R changelog/980.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.0.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst

  Log Message:
  -----------
  Preparing release version 3.7.0


  Commit: 997ef593068a36c283cbb83d938272b9770caa36
      https://github.com/pytest-dev/pytest/commit/997ef593068a36c283cbb83d938272b9770caa36
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M CHANGELOG.rst

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


Compare: https://github.com/pytest-dev/pytest/compare/eada0b1fd7a8^...997ef593068a
      **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 Jul 30 19:38:24 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 30 Jul 2018 16:38:24 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f99da9: Issue #3295: Correct
 the usage of --last-failed-no...
Message-ID: <5b5fa1701f0b0_3e372b225aefaf9068142@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: f99da9058f8569f8186515ba8d550fc7f019f5c1
      https://github.com/pytest-dev/pytest/commit/f99da9058f8569f8186515ba8d550fc7f019f5c1
  Author: Ammar Najjar <najjarammar at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M doc/en/cache.rst

  Log Message:
  -----------
  Issue #3295: Correct the usage of --last-failed-no-failures documentation

- add the missing --last-failed argument in the presented examples, for they are missleading and lead to think that the missing argument is not needed.


  Commit: 9ddd5737743150d07b51fd354f441ec441409b68
      https://github.com/pytest-dev/pytest/commit/9ddd5737743150d07b51fd354f441ec441409b68
  Author: Ammar Najjar <najjarammar at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    A changelog/3295.doc.rst

  Log Message:
  -----------
  Issue #3295: add changelog doc entry for adding a missing argument in
the examples


  Commit: 7bff5866b1dd7992d9bdcdce1bac41fe043760c1
      https://github.com/pytest-dev/pytest/commit/7bff5866b1dd7992d9bdcdce1bac41fe043760c1
  Author: Alan <alan at climacell.co>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  bugfix in ApproxNumpy initialisation, use keywords for arguments now


  Commit: 75db6084792c3b33c56b57c1a5c5e7ea612f84da
      https://github.com/pytest-dev/pytest/commit/75db6084792c3b33c56b57c1a5c5e7ea612f84da
  Author: Alan Brammer <a1brammer at gmail.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    A changelog/3695.bugfix.rst

  Log Message:
  -----------
  update changelog


  Commit: 514ca6f4adcfe24efd0f221d7d00220275446f76
      https://github.com/pytest-dev/pytest/commit/514ca6f4adcfe24efd0f221d7d00220275446f76
  Author: abrammer <abrammer at albany.edu>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M testing/python/approx.py

  Log Message:
  -----------
  add test wrt #3695 checking numpy array tolerance args


  Commit: f0db64ac2e1ba54281c62049f191f1bb2c3565e7
      https://github.com/pytest-dev/pytest/commit/f0db64ac2e1ba54281c62049f191f1bb2c3565e7
  Author: abrammer <abrammer at albany.edu>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

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

  Log Message:
  -----------
  drop the duplicate approx call
update test to include both np.array(actual) and np.array(expected)


  Commit: 2eb9301ad553961bd4a4a48519df867879a03f35
      https://github.com/pytest-dev/pytest/commit/2eb9301ad553961bd4a4a48519df867879a03f35
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-25 (Wed, 25 Jul 2018)

  Changed paths:
    M changelog/3695.bugfix.rst

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


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

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Implement change suggested by @kalekundert in PR


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

  Changed paths:
    M src/_pytest/python_api.py

  Log Message:
  -----------
  Need to iterate over the flattened array.


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

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

  Log Message:
  -----------
  Test with Python 3.7 on Travis and AppVeyor


  Commit: 6f9a12a8a35b34f0ae426c059ce77d53e4daa2c2
      https://github.com/pytest-dev/pytest/commit/6f9a12a8a35b34f0ae426c059ce77d53e4daa2c2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    A changelog/3295.doc.rst
    M doc/en/cache.rst

  Log Message:
  -----------
  Merge pull request #3486 from ammarnajjar/last-failed-no-failures_docs_correction

--last-failed-no-failures docs correction


  Commit: 330640eb96bb70d9c7ce01841b22a87904cdc703
      https://github.com/pytest-dev/pytest/commit/330640eb96bb70d9c7ce01841b22a87904cdc703
  Author: abrammer <abrammer at albany.edu>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M testing/python/approx.py

  Log Message:
  -----------
  update tests to check tolerance args and expecing nan in numpy arrays


  Commit: 762eaf443a72b4345bfd08cc423d3cf5c0a90224
      https://github.com/pytest-dev/pytest/commit/762eaf443a72b4345bfd08cc423d3cf5c0a90224
  Author: abrammer <abrammer at albany.edu>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M changelog/3695.bugfix.rst

  Log Message:
  -----------
  update changelog to include the addition of tests


  Commit: 535fd1f3117e0f7d72abc80bfe1faef7033146b5
      https://github.com/pytest-dev/pytest/commit/535fd1f3117e0f7d72abc80bfe1faef7033146b5
  Author: abrammer <abrammer at albany.edu>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M testing/python/approx.py

  Log Message:
  -----------
  may as well include inf test while we're at it


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

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

  Log Message:
  -----------
  Merge pull request #3733 from nicoddemus/py37

Test with Python 3.7 on Travis and AppVeyor


  Commit: 150535b6c11b16ad38299ea93246b5ad55ce013c
      https://github.com/pytest-dev/pytest/commit/150535b6c11b16ad38299ea93246b5ad55ce013c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

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

  Log Message:
  -----------
  Merge pull request #3696 from abrammer/approx_numpy_tolerance_bugfix

bugfix in ApproxNumpy initialisation, use keywords for arguments to fix


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

  Changed paths:
    M .travis.yml
    M appveyor.yml
    A changelog/3295.doc.rst
    A changelog/3695.bugfix.rst
    M doc/en/cache.rst
    M src/_pytest/python_api.py
    M testing/python/approx.py

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


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

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Use python 3.6 for regendoc


  Commit: 2c09930b6d701d91a0284c6d44086488ffbcb419
      https://github.com/pytest-dev/pytest/commit/2c09930b6d701d91a0284c6d44086488ffbcb419
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Use proper quotes for python 3.7 on travis.yml


  Commit: 60b1913ba21094da5eb91d8c68642c38f20f6a26
      https://github.com/pytest-dev/pytest/commit/60b1913ba21094da5eb91d8c68642c38f20f6a26
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2220.bugfix.rst
    R changelog/2283.feature
    R changelog/2639.removal.rst
    R changelog/3295.doc.rst
    R changelog/3519.trivial.rst
    R changelog/3576.feature.rst
    R changelog/3579.feature.rst
    R changelog/3610.feature.rst
    R changelog/3623.feature.rst
    R changelog/3661.removal.rst
    R changelog/3695.bugfix.rst
    R changelog/980.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.0.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst

  Log Message:
  -----------
  Preparing release version 3.7.0


  Commit: 997ef593068a36c283cbb83d938272b9770caa36
      https://github.com/pytest-dev/pytest/commit/997ef593068a36c283cbb83d938272b9770caa36
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M CHANGELOG.rst

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


  Commit: 253419316ce09b952862811db229a9e9383a332b
      https://github.com/pytest-dev/pytest/commit/253419316ce09b952862811db229a9e9383a332b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M appveyor.yml
    R changelog/2220.bugfix.rst
    R changelog/2283.feature
    R changelog/2639.removal.rst
    R changelog/3519.trivial.rst
    R changelog/3576.feature.rst
    R changelog/3579.feature.rst
    R changelog/3610.feature.rst
    R changelog/3623.feature.rst
    R changelog/3661.removal.rst
    R changelog/980.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.0.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M src/_pytest/python_api.py
    M testing/python/approx.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3738 from nicoddemus/release-3.7.0

Release 3.7.0


Compare: https://github.com/pytest-dev/pytest/compare/9f5d73d44afc...253419316ce0
      **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 Jul 30 19:39:33 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 30 Jul 2018 16:39:33 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 2b1410: Add package scoped
 fixtures #2283
Message-ID: <5b5fa1b5997b2_55e32afb3d5c4f789771e@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 2b1410895e9ac30c4f08e9a701017cce65a9717b
      https://github.com/pytest-dev/pytest/commit/2b1410895e9ac30c4f08e9a701017cce65a9717b
  Author: turturica <Ionut Turturica>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M AUTHORS
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/python.py
    A changelog/2283.feature
    M testing/python/fixture.py
    M testing/test_collection.py
    M testing/test_session.py

  Log Message:
  -----------
  Add package scoped fixtures #2283


  Commit: 35df2cdbee3e626abbecfc14e394f4c8b6e252f3
      https://github.com/pytest-dev/pytest/commit/35df2cdbee3e626abbecfc14e394f4c8b6e252f3
  Author: turturica <Ionut Turturica>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  Fix linting error.


  Commit: c02e8d8b0d4a50cb802b901f78412448612d03ed
      https://github.com/pytest-dev/pytest/commit/c02e8d8b0d4a50cb802b901f78412448612d03ed
  Author: turturica <Ionut Turturica>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M _pytest/main.py
    M testing/python/collect.py
    M testing/test_collection.py

  Log Message:
  -----------
  Fix test collection when tests are passed as IDs at the command line. Note this is still broken due to #3358.


  Commit: 7d923c389e554ffd073bb23a208b79fea043fb04
      https://github.com/pytest-dev/pytest/commit/7d923c389e554ffd073bb23a208b79fea043fb04
  Author: turturica <Ionut Turturica>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/compat.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/mark/__init__.py
    M _pytest/mark/structures.py
    M _pytest/python_api.py
    R changelog/1478.feature
    R changelog/1642.feature.rst
    R changelog/1713.doc.rst
    R changelog/2370.bugfix.rst
    R changelog/2405.feature.rst
    R changelog/2770.feature
    R changelog/2770.removal.rst
    A changelog/3008.bugfix.rst
    A changelog/3008.trivial.rst
    R changelog/3034.feature
    R changelog/3084.removal
    R changelog/3139.feature
    R changelog/3149.feature
    R changelog/3156.feature
    R changelog/3189.feature
    R changelog/3190.feature
    R changelog/3198.feature.rst
    R changelog/3204.feature
    R changelog/3213.feature
    R changelog/3228.trivial.rst
    R changelog/3236.feature.rst
    R changelog/3245.trivial.rst
    R changelog/3246.trival.rst
    R changelog/3250.trivial.rst
    R changelog/3255.feature.rst
    R changelog/3265.trivial.rst
    R changelog/3268.trivial
    R changelog/3291.trivial.rst
    R changelog/3292.trivial.rst
    R changelog/3296.feature
    R changelog/3296.trivial
    R changelog/3297.bugfix.rst
    R changelog/3304.trivial
    R changelog/3308.trivial.rst
    R changelog/3312.feature
    R changelog/3314.bugfix.rst
    A changelog/3339.trivial
    A changelog/3348.bugfix.rst
    A changelog/3360.trivial
    A changelog/3372.bugfix.rst
    M doc/en/development_guide.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/fixture.rst
    M doc/en/reference.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_junitxml.py
    M testing/test_recwarn.py
    M tox.ini

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


  Commit: c416b1d9358e457cbd0d8323ffa3ceeb08d27516
      https://github.com/pytest-dev/pytest/commit/c416b1d9358e457cbd0d8323ffa3ceeb08d27516
  Author: turturica <Ionut Turturica>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/nodes.py
    M _pytest/python.py

  Log Message:
  -----------
  Don't stop at the first package when looking up package-scoped fixtures.
Example:
package1.subpackage1
package1.subpackage2

package1's setup/teardown were executed again when exiting subpackage1 and entering subpackage2.


  Commit: e44d4e6508b1ba7b960ec5728000a221315af79b
      https://github.com/pytest-dev/pytest/commit/e44d4e6508b1ba7b960ec5728000a221315af79b
  Author: turturica <Ionut Turturica>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M _pytest/monkeypatch.py
    A changelog/3290.feature
    M doc/en/monkeypatch.rst
    M testing/test_monkeypatch.py

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


  Commit: 69031d00337dc61ed1bd41465dd80d5cc2cb793f
      https://github.com/pytest-dev/pytest/commit/69031d00337dc61ed1bd41465dd80d5cc2cb793f
  Author: turturica <Ionut Turturica>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M pytest.py

  Log Message:
  -----------
  Forgot one file from previous commit.


  Commit: dc90c9108fd8cc65bc76da7a6d71b6ed66c40256
      https://github.com/pytest-dev/pytest/commit/dc90c9108fd8cc65bc76da7a6d71b6ed66c40256
  Author: turturica <Ionut Turturica>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Collapse all parent nested package fixtures when pointing to a sub-node.
Example:
Given this hierarchy: p1.s1.s2.s3
I want to run pytest p1/s1/s2/s3/foo.py

If there are any package fixtures defined at p1..s2 levels, they should also be executed.


  Commit: b0474398ec13057675cbf9ceace3826bf4e32db9
      https://github.com/pytest-dev/pytest/commit/b0474398ec13057675cbf9ceace3826bf4e32db9
  Author: turturica <Ionut Turturica>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Fix a formatting error.


  Commit: fedc78522bd43e82d8b6c4f89df2b3a6c8e898ea
      https://github.com/pytest-dev/pytest/commit/fedc78522bd43e82d8b6c4f89df2b3a6c8e898ea
  Author: turturica <Ionut Turturica>
  Date:   2018-04-21 (Sat, 21 Apr 2018)

  Changed paths:
    M _pytest/main.py
    M testing/test_session.py

  Log Message:
  -----------
  Build a stack of all previous packages instead of just the one closest to the initial argument(s).
Address #3358 by caching nodes in a session dict.


  Commit: f8350c63041c8ba042c105fcbf78c9207d3b7dc5
      https://github.com/pytest-dev/pytest/commit/f8350c63041c8ba042c105fcbf78c9207d3b7dc5
  Author: turturica <Ionut Turturica>
  Date:   2018-04-21 (Sat, 21 Apr 2018)

  Changed paths:
    M _pytest/nodes.py

  Log Message:
  -----------
  Fix an issue that popped up only on Windows.


  Commit: acacf75f49ad79ea8fa5af0852976fa1a406b325
      https://github.com/pytest-dev/pytest/commit/acacf75f49ad79ea8fa5af0852976fa1a406b325
  Author: turturica <Ionut Turturica>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Added another package-scoped fixture test.
Changed existing complex tests to use package fixtures.


  Commit: d483b401ee7f59b8ed433dd31cda482a5822bc8b
      https://github.com/pytest-dev/pytest/commit/d483b401ee7f59b8ed433dd31cda482a5822bc8b
  Author: turturica <Ionut Turturica>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2334.feature
    M testing/python/fixture.py

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


  Commit: 229c8e551d09ae7ed894a2d7d106fefa1307c5a2
      https://github.com/pytest-dev/pytest/commit/229c8e551d09ae7ed894a2d7d106fefa1307c5a2
  Author: turturica <Ionut Turturica>
  Date:   2018-04-25 (Wed, 25 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Fix parametrized fixtures reordering.


  Commit: 05b5b64379c81d19757241d98054130f4f61fa47
      https://github.com/pytest-dev/pytest/commit/05b5b64379c81d19757241d98054130f4f61fa47
  Author: turturica <Ionut Turturica>
  Date:   2018-04-25 (Wed, 25 Apr 2018)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M _pytest/compat.py
    M _pytest/helpconfig.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/python.py
    M _pytest/runner.py
    R changelog/3330.trivial.rst
    R changelog/3339.trivial
    R changelog/3348.bugfix.rst
    R changelog/3360.trivial
    R changelog/3372.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.1.rst
    M doc/en/builtin.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/test/plugin/terminal.rst
    M setup.py
    M testing/acceptance_test.py
    M testing/python/metafunc.py
    M testing/test_runner.py
    M tox.ini

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


  Commit: 6fc7f07a8058d579cae73cc3ae792cd216f90304
      https://github.com/pytest-dev/pytest/commit/6fc7f07a8058d579cae73cc3ae792cd216f90304
  Author: turturica <Ionut Turturica>
  Date:   2018-04-26 (Thu, 26 Apr 2018)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  Workaround for py36-xdist failure.


  Commit: 7d0dba18de7dc63468ce09d198e7c53970b37de6
      https://github.com/pytest-dev/pytest/commit/7d0dba18de7dc63468ce09d198e7c53970b37de6
  Author: turturica <Ionut Turturica>
  Date:   2018-04-27 (Fri, 27 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/nodes.py

  Log Message:
  -----------
  Removed _CompatProperty("Package")


  Commit: eb0c6a82875a986d9bf4cf0efdcee5641fe84fef
      https://github.com/pytest-dev/pytest/commit/eb0c6a82875a986d9bf4cf0efdcee5641fe84fef
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M src/_pytest/nodes.py
    M testing/test_mark.py

  Log Message:
  -----------
  fix addmarker - extract mark from markdecorator


  Commit: 791bb3502cc6c0539e9428f49f0082038d46619f
      https://github.com/pytest-dev/pytest/commit/791bb3502cc6c0539e9428f49f0082038d46619f
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    A changelog/3576.feature.rst

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


  Commit: b5102d03a62ef5cd7704cadc5e704df3cd812e21
      https://github.com/pytest-dev/pytest/commit/b5102d03a62ef5cd7704cadc5e704df3cd812e21
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M src/_pytest/nodes.py

  Log Message:
  -----------
  Fix add_marker docs


  Commit: 8d072205e9119ec3c8b95ca66876b9a1a50b6e3e
      https://github.com/pytest-dev/pytest/commit/8d072205e9119ec3c8b95ca66876b9a1a50b6e3e
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M src/_pytest/nodes.py

  Log Message:
  -----------
  fix whitespace


  Commit: 94c41bec64d77f816e7598cc74527377e6bb8536
      https://github.com/pytest-dev/pytest/commit/94c41bec64d77f816e7598cc74527377e6bb8536
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M CONTRIBUTING.rst
    A changelog/3555.bugfix.rst
    A changelog/3576.feature.rst
    M doc/en/assert.rst
    R doc/en/check_sphinx.py
    R doc/en/genapi.py
    R doc/en/test/attic.rst
    R doc/en/test/config.html
    R doc/en/test/dist.html
    R doc/en/test/extend.html
    R doc/en/test/index.rst
    R doc/en/test/mission.rst
    R doc/en/test/plugin/cov.rst
    R doc/en/test/plugin/coverage.rst
    R doc/en/test/plugin/django.rst
    R doc/en/test/plugin/figleaf.rst
    R doc/en/test/plugin/helpconfig.rst
    R doc/en/test/plugin/index.rst
    R doc/en/test/plugin/links.rst
    R doc/en/test/plugin/nose.rst
    R doc/en/test/plugin/oejskit.rst
    R doc/en/test/plugin/terminal.rst
    R doc/en/test/plugin/xdist.rst
    R doc/en/test/test.html
    M src/_pytest/mark/structures.py
    M src/_pytest/nodes.py
    M testing/python/integration.py
    M testing/test_mark.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3576 from RonnyPfannschmidt/addmarker-api

fix addmarker - extract mark from markdecorator


  Commit: 36159776088c8d9697e09c0c696ed78810a0226e
      https://github.com/pytest-dev/pytest/commit/36159776088c8d9697e09c0c696ed78810a0226e
  Author: Wil Cooley <wcooley at nakedape.cc>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M AUTHORS
    A changelog/3579.feature.rst
    M src/_pytest/logging.py
    M testing/logging/test_fixture.py

  Log Message:
  -----------
  Add `messages` property to `caplog` fixture.


  Commit: 3dcdaab1038ca5df64d54b3e2474431f7a0bdc9f
      https://github.com/pytest-dev/pytest/commit/3dcdaab1038ca5df64d54b3e2474431f7a0bdc9f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M AUTHORS
    A changelog/3579.feature.rst
    M src/_pytest/logging.py
    M testing/logging/test_fixture.py

  Log Message:
  -----------
  Merge pull request #3585 from wcooley/feature/3579-caplog-messages

Add `messages` property to `caplog` fixture.


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

  Changed paths:
    A testing/example_scripts/issue_519.py
    M tox.ini

  Log Message:
  -----------
  add example scripts for issue #519


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

  Changed paths:
    M testing/example_scripts/issue_519.py

  Log Message:
  -----------
  add the actually expected fixtureorder for #519


  Commit: 3ac2ae3c8caab9c7338878e9825ea2f383ca9265
      https://github.com/pytest-dev/pytest/commit/3ac2ae3c8caab9c7338878e9825ea2f383ca9265
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M testing/example_scripts/issue_519.py

  Log Message:
  -----------
  black


  Commit: 99402cf1c05720ee2ab8465262c7da8e412b6c5e
      https://github.com/pytest-dev/pytest/commit/99402cf1c05720ee2ab8465262c7da8e412b6c5e
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    A testing/example_scripts/README.rst

  Log Message:
  -----------
  add a readme to the example scripts


  Commit: 9e32b6ae4874530acf93aab547e4e30b75f65e97
      https://github.com/pytest-dev/pytest/commit/9e32b6ae4874530acf93aab547e4e30b75f65e97
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M testing/example_scripts/README.rst

  Log Message:
  -----------
  Small typo and grammar fix


  Commit: 9d60cf25c0cb43a78ca8249108e509382e17f1c4
      https://github.com/pytest-dev/pytest/commit/9d60cf25c0cb43a78ca8249108e509382e17f1c4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    A testing/example_scripts/README.rst
    A testing/example_scripts/issue_519.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2207 from RonnyPfannschmidt/fix/519

add example scripts for issue #519


  Commit: 31f089db6ade6e345f4cab23fe4fa0a838c34f47
      https://github.com/pytest-dev/pytest/commit/31f089db6ade6e345f4cab23fe4fa0a838c34f47
  Author: avirlrma <aviral1701 at gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  add reamde for .pytest_cache
method - `ensure_readme()`


  Commit: 53d4710c6287fc3e78c2bc1704bd702d05a8b6de
      https://github.com/pytest-dev/pytest/commit/53d4710c6287fc3e78c2bc1704bd702d05a8b6de
  Author: avirlrma <aviral1701 at gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py
    A testing/test_cacheREADME.py

  Log Message:
  -----------
  added tests for .pytest_cache README
 Helper class to check if readme exists in .pytest_cache directory
 Tests to check for readme when tests pass and when they fail


  Commit: 8f1d8ac970efb1fb5c00af4a0c5575922577afda
      https://github.com/pytest-dev/pytest/commit/8f1d8ac970efb1fb5c00af4a0c5575922577afda
  Author: avirlrma <aviral1701 at gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py
    M testing/test_cacheREADME.py

  Log Message:
  -----------
  fixed linting errors
ran black
removed unused imports and variables


  Commit: c672bfa32ea9e3602225eb45b0ffdc4cdb1ce47a
      https://github.com/pytest-dev/pytest/commit/c672bfa32ea9e3602225eb45b0ffdc4cdb1ce47a
  Author: avirlrma <aviral1701 at gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    A changelog/3519.feature.rst
    M src/_pytest/cacheprovider.py
    R testing/test_cacheREADME.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  added changelog entry
moved cache readme tests to test_cacheprovider.py


  Commit: 998d540b73df9a12975b1d3cacb13b540500c6d4
      https://github.com/pytest-dev/pytest/commit/998d540b73df9a12975b1d3cacb13b540500c6d4
  Author: avirlrma <aviral1701 at gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M changelog/3519.feature.rst

  Log Message:
  -----------
  fixed changelog entry


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

  Changed paths:
    M changelog/3519.feature.rst

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


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

  Changed paths:
    R changelog/3519.feature.rst
    A changelog/3519.trivial.rst

  Log Message:
  -----------
  Change 3519 to trivial


  Commit: 0d3914b62691ef4dbb38a897b7b4a8513b2912e9
      https://github.com/pytest-dev/pytest/commit/0d3914b62691ef4dbb38a897b7b4a8513b2912e9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  Remove extra '\' left at the end of a line in cache's readme contents


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

  Changed paths:
    A changelog/3519.trivial.rst
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #3608 from avirlrma/features

add reamde for .pytest_cache


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

  Changed paths:
    M setup.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/compat.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  port cache plugin internals to pathlib

warning logging got broken by detanglement from config


  Commit: 23581d44bd94a54eeb10f43a5a317420db02b269
      https://github.com/pytest-dev/pytest/commit/23581d44bd94a54eeb10f43a5a317420db02b269
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    A src/_pytest/paths.py

  Log Message:
  -----------
  add missed file


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

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  reorder attr.ib specs


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

  Changed paths:
    M src/_pytest/compat.py

  Log Message:
  -----------
  sort compat flake8 mess correctly


  Commit: 1226cdab47335bb823b2fee092b94b1c37b0a62a
      https://github.com/pytest-dev/pytest/commit/1226cdab47335bb823b2fee092b94b1c37b0a62a
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  fix warnings and json dumping of cacheprovider


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

  Changed paths:
    M setup.py
    M src/_pytest/compat.py

  Log Message:
  -----------
  use pathlib2 up to python3.4 - damn the stdlib


  Commit: 603df1ea1c638c0b704b5d135c03b00384cce0f9
      https://github.com/pytest-dev/pytest/commit/603df1ea1c638c0b704b5d135c03b00384cce0f9
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M setup.py
    M src/_pytest/compat.py

  Log Message:
  -----------
  whops, its supported starting with python 3.6, not python 3.5


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

  Changed paths:
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  rebase onto readme addition


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

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  use Pathlib instead of path splitting


  Commit: 95f00de0df0447cf39af2b90aa1ec34e4e1ec163
      https://github.com/pytest-dev/pytest/commit/95f00de0df0447cf39af2b90aa1ec34e4e1ec163
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-23 (Sat, 23 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  use paths for config.cache.get key


  Commit: 5a156b364519658daf0230b446d97967c3d0e4b9
      https://github.com/pytest-dev/pytest/commit/5a156b364519658daf0230b446d97967c3d0e4b9
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-24 (Sun, 24 Jun 2018)

  Changed paths:
    M appveyor.yml

  Log Message:
  -----------
  disable pypy on windows until scandir works for it


  Commit: 5b186cd609ae651a5a7e4f0cf1bbef466b51345d
      https://github.com/pytest-dev/pytest/commit/5b186cd609ae651a5a7e4f0cf1bbef466b51345d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M appveyor.yml
    M setup.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/compat.py
    A src/_pytest/paths.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #3594 from pytest-dev/interal-pathlib

[WIP] port cache plugin internals to pathlib


  Commit: 89e0a3ec27309e0f2c27887c2eaee8fde612d460
      https://github.com/pytest-dev/pytest/commit/89e0a3ec27309e0f2c27887c2eaee8fde612d460
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M appveyor.yml
    A changelog/3061.bugfix.rst
    R changelog/3545.trivial.rst
    R changelog/3549.doc.rst
    R changelog/3552.trivial.rst
    R changelog/3555.bugfix.rst
    R changelog/3563.bugfix.rst
    R changelog/3567.trivial.rst
    R changelog/3569.bugfix.rst
    A changelog/3593.bugfix.rst
    A changelog/3598.trivial.rst
    A changelog/3609.trivial.rst
    A changelog/3611.doc.rst
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.4.0.rst
    A doc/en/announce/release-3.6.2.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/multipython.py
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/reportingdemo.rst
    M doc/en/fixture.rst
    M doc/en/reference.rst
    M doc/en/skipping.rst
    M pyproject.toml
    M setup.py
    M src/_pytest/_code/code.py
    M src/_pytest/_code/source.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    R src/_pytest/config.py
    A src/_pytest/config/__init__.py
    A src/_pytest/config/argparsing.py
    A src/_pytest/config/exceptions.py
    A src/_pytest/config/findpaths.py
    M src/_pytest/debugging.py
    M src/_pytest/deprecated.py
    M src/_pytest/doctest.py
    M src/_pytest/fixtures.py
    M src/_pytest/helpconfig.py
    M src/_pytest/junitxml.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/mark/evaluate.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/nodes.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/resultlog.py
    M src/_pytest/runner.py
    M src/_pytest/skipping.py
    M src/_pytest/terminal.py
    M src/_pytest/unittest.py
    M src/_pytest/warnings.py
    M tasks/generate.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/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/example_scripts/issue_519.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/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_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  merge from master to features


  Commit: 6b239263da3c8a2d1e659584a0c16a77875a9f00
      https://github.com/pytest-dev/pytest/commit/6b239263da3c8a2d1e659584a0c16a77875a9f00
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M appveyor.yml
    A changelog/3061.bugfix.rst
    R changelog/3545.trivial.rst
    R changelog/3549.doc.rst
    R changelog/3552.trivial.rst
    R changelog/3555.bugfix.rst
    R changelog/3563.bugfix.rst
    R changelog/3567.trivial.rst
    R changelog/3569.bugfix.rst
    A changelog/3593.bugfix.rst
    A changelog/3598.trivial.rst
    A changelog/3609.trivial.rst
    A changelog/3611.doc.rst
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.4.0.rst
    A doc/en/announce/release-3.6.2.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/multipython.py
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/reportingdemo.rst
    M doc/en/fixture.rst
    M doc/en/reference.rst
    M doc/en/skipping.rst
    M pyproject.toml
    M setup.py
    M src/_pytest/_code/code.py
    M src/_pytest/_code/source.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    R src/_pytest/config.py
    A src/_pytest/config/__init__.py
    A src/_pytest/config/argparsing.py
    A src/_pytest/config/exceptions.py
    A src/_pytest/config/findpaths.py
    M src/_pytest/debugging.py
    M src/_pytest/deprecated.py
    M src/_pytest/doctest.py
    M src/_pytest/fixtures.py
    M src/_pytest/helpconfig.py
    M src/_pytest/junitxml.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/mark/evaluate.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/nodes.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/resultlog.py
    M src/_pytest/runner.py
    M src/_pytest/skipping.py
    M src/_pytest/terminal.py
    M src/_pytest/unittest.py
    M src/_pytest/warnings.py
    M tasks/generate.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/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/example_scripts/issue_519.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/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_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3620 from RonnyPfannschmidt/merge-from-master

Merge from master


  Commit: cc6eb9f83c9a12cc4416ef03c022c3eb4bc2ee22
      https://github.com/pytest-dev/pytest/commit/cc6eb9f83c9a12cc4416ef03c022c3eb4bc2ee22
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    A src/_pytest/reports.py
    M src/_pytest/runner.py
    M testing/test_junitxml.py
    M testing/test_runner.py

  Log Message:
  -----------
  move test reports to own file


  Commit: 2dfb52f7e069f128964ccd9b5af0ddd9b021648b
      https://github.com/pytest-dev/pytest/commit/2dfb52f7e069f128964ccd9b5af0ddd9b021648b
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M src/_pytest/reports.py
    M src/_pytest/runner.py

  Log Message:
  -----------
  fix rebase artifacts


  Commit: 0672bc633ff64d33a529824686ae8402f419708d
      https://github.com/pytest-dev/pytest/commit/0672bc633ff64d33a529824686ae8402f419708d
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M tox.ini

  Log Message:
  -----------
  enable pytester to run examples copied from the cwd


  Commit: e860ff7299fa3618db73cffbadeb95b135754a08
      https://github.com/pytest-dev/pytest/commit/e860ff7299fa3618db73cffbadeb95b135754a08
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M testing/acceptance_test.py
    A testing/example_scripts/conftest_usageerror/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/test_hello.py
    A testing/examples/test_issue519.py

  Log Message:
  -----------
  port some acceptance tests over to copy_example


  Commit: 581d49635e29c91084227f2263435a15606981b4
      https://github.com/pytest-dev/pytest/commit/581d49635e29c91084227f2263435a15606981b4
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    A changelog/3623.feature.rst
    A src/_pytest/experiments.py
    M src/_pytest/pytester.py
    M tox.ini

  Log Message:
  -----------
  add docs and changelog


  Commit: 8a6345515b9e1f9d8d54a46bc913b15a09c6e1f7
      https://github.com/pytest-dev/pytest/commit/8a6345515b9e1f9d8d54a46bc913b15a09c6e1f7
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M doc/en/example/reportingdemo.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  regendoc


  Commit: 17e01993d9a751a0d04b72991faddebad38183a4
      https://github.com/pytest-dev/pytest/commit/17e01993d9a751a0d04b72991faddebad38183a4
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

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

  Log Message:
  -----------
  regendoc and invocation fixes


  Commit: ea379ba10f03767b8c51fa80206e8a71e1b1cc0a
      https://github.com/pytest-dev/pytest/commit/ea379ba10f03767b8c51fa80206e8a71e1b1cc0a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    A changelog/3623.feature.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/writing_plugins.rst
    A src/_pytest/experiments.py
    M src/_pytest/pytester.py
    M testing/acceptance_test.py
    A testing/example_scripts/conftest_usageerror/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/test_hello.py
    A testing/examples/test_issue519.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3623 from RonnyPfannschmidt/pytester-runexamples

Pytester runexamples


  Commit: e9371a58a0d1562f9d187778e67a7fae3708261f
      https://github.com/pytest-dev/pytest/commit/e9371a58a0d1562f9d187778e67a7fae3708261f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    A src/_pytest/reports.py
    M src/_pytest/runner.py
    M testing/test_junitxml.py
    M testing/test_runner.py

  Log Message:
  -----------
  Merge pull request #3622 from RonnyPfannschmidt/builtin-serialize

move report classes to own file to prepare for serialisazion


  Commit: 1dc5e97ac255b3a50b80b2a5400d7d467e952532
      https://github.com/pytest-dev/pytest/commit/1dc5e97ac255b3a50b80b2a5400d7d467e952532
  Author: Serhii Mozghovyi <egnartsms at gmail.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

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

  Log Message:
  -----------
  Make test parametrization override indirect fixtures


  Commit: c220fb235a08d1e5ae892c10566a350a8a08a89b
      https://github.com/pytest-dev/pytest/commit/c220fb235a08d1e5ae892c10566a350a8a08a89b
  Author: Serhii Mozghovyi <egnartsms at gmail.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Minor fix (code improvement)


  Commit: 3c73d6298a53733d6fea4d7fd12be64c77e8e1f3
      https://github.com/pytest-dev/pytest/commit/3c73d6298a53733d6fea4d7fd12be64c77e8e1f3
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    A changelog/3605.bugfix.rst
    M src/_pytest/mark/structures.py
    M src/_pytest/python.py
    M testing/test_mark.py

  Log Message:
  -----------
  merge from master to features


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

  Changed paths:
    A changelog/3605.bugfix.rst
    M src/_pytest/mark/structures.py
    M src/_pytest/python.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #3634 from RonnyPfannschmidt/merge-from-master

Merge from master


  Commit: 76ac670f7d6a249bf2fba0a151cc4e742c1fc2e0
      https://github.com/pytest-dev/pytest/commit/76ac670f7d6a249bf2fba0a151cc4e742c1fc2e0
  Author: Serhii Mozghovyi <egnartsms at gmail.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

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

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


  Commit: 8680dfc939648768ebff3600757dbfda11099f5f
      https://github.com/pytest-dev/pytest/commit/8680dfc939648768ebff3600757dbfda11099f5f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M AUTHORS
    M appveyor.yml
    A changelog/2220.bugfix.rst
    M src/_pytest/fixtures.py
    M src/_pytest/python.py
    M testing/python/collect.py

  Log Message:
  -----------
  Merge pull request #3629 from egnartsms/issue-2220-param-breaks-dep

Make test parametrization override indirect fixtures


  Commit: 7845ab4bc3e689a9e2e9c17a763da69d299adc47
      https://github.com/pytest-dev/pytest/commit/7845ab4bc3e689a9e2e9c17a763da69d299adc47
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  remove test file formatting from TestContextManagerFixtureFuncs


  Commit: 982b6140107c52c54e78df99293aa0e70a7d1619
      https://github.com/pytest-dev/pytest/commit/982b6140107c52c54e78df99293aa0e70a7d1619
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  remove format calls for most fixture tests


  Commit: 5582ad0445029672daf0f18fb12a3d940dbc6bb7
      https://github.com/pytest-dev/pytest/commit/5582ad0445029672daf0f18fb12a3d940dbc6bb7
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  remove use of formatting in test_func_closure_module_auto

this makes it apparent that pytester should supply some kind of variable support


  Commit: 4ae7e9788c67cb723ccfa7f1a5987d6db451b27b
      https://github.com/pytest-dev/pytest/commit/4ae7e9788c67cb723ccfa7f1a5987d6db451b27b
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  fix quotes in scope order test


  Commit: 0fd86ec8a815dc84522d4407c8b6aa912153663b
      https://github.com/pytest-dev/pytest/commit/0fd86ec8a815dc84522d4407c8b6aa912153663b
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M src/_pytest/pytester.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py
    M testing/python/fixture.py

  Log Message:
  -----------
  move some fill fixture acceptance tests contents to the examples script folder


  Commit: 54d3cd587d17534b9d969855c7019567d48aa528
      https://github.com/pytest-dev/pytest/commit/54d3cd587d17534b9d969855c7019567d48aa528
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Adding the --trace option.


  Commit: 952bbefaac3836e4c4a8ae6e0919dabcb90a448a
      https://github.com/pytest-dev/pytest/commit/952bbefaac3836e4c4a8ae6e0919dabcb90a448a
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Add initial test.


  Commit: a46b94950c7574f94315a29b661f38e4176e72b9
      https://github.com/pytest-dev/pytest/commit/a46b94950c7574f94315a29b661f38e4176e72b9
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Properly set immediately_break value


  Commit: 533f4cc10cf95933c532bac78e60bed38001ee52
      https://github.com/pytest-dev/pytest/commit/533f4cc10cf95933c532bac78e60bed38001ee52
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fix test to pass


  Commit: 57198d477b5f8f6299c8c56fd075603194063868
      https://github.com/pytest-dev/pytest/commit/57198d477b5f8f6299c8c56fd075603194063868
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    A changelog/3610.feature.rst

  Log Message:
  -----------
  Adding changelog entry for the --trace option.


  Commit: 713d32c4da34abaaea77fec3e1211f28206e154f
      https://github.com/pytest-dev/pytest/commit/713d32c4da34abaaea77fec3e1211f28206e154f
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Adding documentation for the --trace option.


  Commit: 66fa6bb42ed511fb7e3628a61233f050597fb913
      https://github.com/pytest-dev/pytest/commit/66fa6bb42ed511fb7e3628a61233f050597fb913
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Fix flake8 issues.


  Commit: a604a71185f8a63e21a32e2619c5fc3fc93159f6
      https://github.com/pytest-dev/pytest/commit/a604a71185f8a63e21a32e2619c5fc3fc93159f6
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Fixing usage.rst title.


  Commit: 88011622751fd6280d8aad02ca924aae066b6df8
      https://github.com/pytest-dev/pytest/commit/88011622751fd6280d8aad02ca924aae066b6df8
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Fixing tabbing in usage.rst.


  Commit: 0b704779309332de3937bfa94eb3eb0b43b055c3
      https://github.com/pytest-dev/pytest/commit/0b704779309332de3937bfa94eb3eb0b43b055c3
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M changelog/3610.feature.rst
    M doc/en/usage.rst
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Fix linting issues.


  Commit: bc268a58d13ab398fac9c3c7d651296426d2fbb2
      https://github.com/pytest-dev/pytest/commit/bc268a58d13ab398fac9c3c7d651296426d2fbb2
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Adding needed newline


  Commit: b75320ba95e2033f7c12b400c0d587e989667d08
      https://github.com/pytest-dev/pytest/commit/b75320ba95e2033f7c12b400c0d587e989667d08
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Fix --trace option with yield tests.


  Commit: 10a8691ecade7ee3ebbf7223a9873bf83935f473
      https://github.com/pytest-dev/pytest/commit/10a8691ecade7ee3ebbf7223a9873bf83935f473
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Add support for yielded functions.


  Commit: 6cc4fe2412047dcea25bf2735db5896684680284
      https://github.com/pytest-dev/pytest/commit/6cc4fe2412047dcea25bf2735db5896684680284
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fixing bad indentation


  Commit: 2f1a2cf07f521abb6a226d01205a124ae516a334
      https://github.com/pytest-dev/pytest/commit/2f1a2cf07f521abb6a226d01205a124ae516a334
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fixing --trace test.


  Commit: 4afb8c428b2541afae9a80983191a351e0edc3dd
      https://github.com/pytest-dev/pytest/commit/4afb8c428b2541afae9a80983191a351e0edc3dd
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Fix python 2 issues


  Commit: 4a925ef5e9334c12ac6ad8b8146dec6d664b9945
      https://github.com/pytest-dev/pytest/commit/4a925ef5e9334c12ac6ad8b8146dec6d664b9945
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fixing bug in test.


  Commit: 067de257e140ec4ec716368c69c80f9278743fb7
      https://github.com/pytest-dev/pytest/commit/067de257e140ec4ec716368c69c80f9278743fb7
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fix test_pdb.py with pexpect


  Commit: 7696d5371a85147f24b22cf6786b6331827bcc1b
      https://github.com/pytest-dev/pytest/commit/7696d5371a85147f24b22cf6786b6331827bcc1b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/builtin.rst
    M doc/en/example/simple.rst
    M src/_pytest/logging.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M testing/logging/test_reporting.py
    M testing/test_mark.py

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


  Commit: 3f5e06ecc465b1befb5e6ad062a264b47bab9f45
      https://github.com/pytest-dev/pytest/commit/3f5e06ecc465b1befb5e6ad062a264b47bab9f45
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/builtin.rst
    M doc/en/example/simple.rst
    M src/_pytest/logging.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M testing/logging/test_reporting.py
    M testing/test_mark.py

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

Merge master into features


  Commit: 3c19370cec606217e36ac136ee19d97185f3a43e
      https://github.com/pytest-dev/pytest/commit/3c19370cec606217e36ac136ee19d97185f3a43e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M .gitignore
    A .pre-commit-config.yaml
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M HOWTORELEASE.rst
    M README.rst
    R _pytest/__init__.py
    R _pytest/_argcomplete.py
    R _pytest/_code/__init__.py
    R _pytest/_code/_py2traceback.py
    R _pytest/_code/code.py
    R _pytest/_code/source.py
    R _pytest/assertion/__init__.py
    R _pytest/assertion/rewrite.py
    R _pytest/assertion/truncate.py
    R _pytest/assertion/util.py
    R _pytest/cacheprovider.py
    R _pytest/capture.py
    R _pytest/compat.py
    R _pytest/config.py
    R _pytest/debugging.py
    R _pytest/deprecated.py
    R _pytest/doctest.py
    R _pytest/fixtures.py
    R _pytest/freeze_support.py
    R _pytest/helpconfig.py
    R _pytest/hookspec.py
    R _pytest/junitxml.py
    R _pytest/logging.py
    R _pytest/main.py
    R _pytest/mark/__init__.py
    R _pytest/mark/evaluate.py
    R _pytest/mark/legacy.py
    R _pytest/mark/structures.py
    R _pytest/monkeypatch.py
    R _pytest/nodes.py
    R _pytest/nose.py
    R _pytest/outcomes.py
    R _pytest/pastebin.py
    R _pytest/pytester.py
    R _pytest/python.py
    R _pytest/python_api.py
    R _pytest/recwarn.py
    R _pytest/resultlog.py
    R _pytest/runner.py
    R _pytest/setuponly.py
    R _pytest/setupplan.py
    R _pytest/skipping.py
    R _pytest/terminal.py
    R _pytest/tmpdir.py
    R _pytest/unittest.py
    R _pytest/warnings.py
    M appveyor.yml
    M bench/bench.py
    M bench/bench_argcomplete.py
    M bench/empty.py
    M bench/manyparam.py
    M bench/skip.py
    A changelog/2220.bugfix.rst
    R changelog/2334.feature
    R changelog/3008.bugfix.rst
    R changelog/3008.trivial.rst
    R changelog/3180.feature.rst
    R changelog/3290.feature
    R changelog/3307.feature.rst
    R changelog/3317.feature
    A changelog/3519.trivial.rst
    A changelog/3576.feature.rst
    A changelog/3579.feature.rst
    A changelog/3623.feature.rst
    M changelog/README.rst
    M doc/en/_templates/links.html
    M doc/en/_themes/flask/theme.conf
    M doc/en/_themes/flask_theme_support.py
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.1.1.rst
    M doc/en/announce/release-2.1.2.rst
    M doc/en/announce/release-2.1.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.2.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.1.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.4.1.rst
    M doc/en/announce/release-2.4.2.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.1.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/announce/release-2.6.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.0.rst
    M doc/en/announce/release-2.7.2.rst
    M doc/en/announce/release-2.8.3.rst
    M doc/en/announce/release-2.8.7.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/announce/release-2.9.1.rst
    M doc/en/announce/release-3.0.0.rst
    M doc/en/announce/release-3.0.1.rst
    M doc/en/announce/release-3.0.2.rst
    M doc/en/announce/release-3.0.3.rst
    M doc/en/announce/release-3.0.4.rst
    M doc/en/announce/release-3.0.5.rst
    M doc/en/announce/release-3.0.6.rst
    M doc/en/announce/release-3.0.7.rst
    M doc/en/announce/release-3.1.1.rst
    M doc/en/announce/release-3.1.2.rst
    M doc/en/announce/release-3.1.3.rst
    M doc/en/announce/release-3.2.1.rst
    M doc/en/announce/release-3.2.2.rst
    M doc/en/announce/release-3.2.3.rst
    M doc/en/announce/release-3.2.4.rst
    M doc/en/announce/release-3.2.5.rst
    M doc/en/announce/release-3.3.1.rst
    M doc/en/announce/release-3.3.2.rst
    M doc/en/announce/release-3.4.1.rst
    M doc/en/announce/release-3.4.2.rst
    M doc/en/announce/release-3.5.1.rst
    A doc/en/announce/release-3.6.0.rst
    A doc/en/announce/release-3.6.1.rst
    A doc/en/announce/release-3.6.2.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/assert.rst
    M doc/en/bash-completion.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    R doc/en/check_sphinx.py
    M doc/en/conf.py
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/development_guide.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/attic.rst
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/costlysetup/sub_a/test_quick.py
    M doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/parametrize.rst
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/py2py3/test_py2.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/xfail_demo.py
    M doc/en/faq.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/funcargs.rst
    R doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/links.inc
    M doc/en/logging.rst
    M doc/en/mark.rst
    M doc/en/monkeypatch.rst
    M doc/en/nose.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    M doc/en/projects.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    M doc/en/reference.rst
    M doc/en/skipping.rst
    M doc/en/talks.rst
    R doc/en/test/attic.rst
    R doc/en/test/config.html
    R doc/en/test/dist.html
    R doc/en/test/extend.html
    R doc/en/test/index.rst
    R doc/en/test/mission.rst
    R doc/en/test/plugin/cov.rst
    R doc/en/test/plugin/coverage.rst
    R doc/en/test/plugin/django.rst
    R doc/en/test/plugin/figleaf.rst
    R doc/en/test/plugin/helpconfig.rst
    R doc/en/test/plugin/index.rst
    R doc/en/test/plugin/links.rst
    R doc/en/test/plugin/nose.rst
    R doc/en/test/plugin/oejskit.rst
    R doc/en/test/plugin/terminal.rst
    R doc/en/test/plugin/xdist.rst
    R doc/en/test/test.html
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M doc/en/xunit_setup.rst
    M extra/get_issues.py
    M pyproject.toml
    R pytest.py
    R scripts/check-rst.py
    M setup.py
    A src/_pytest/__init__.py
    A src/_pytest/_argcomplete.py
    A src/_pytest/_code/__init__.py
    A src/_pytest/_code/_py2traceback.py
    A src/_pytest/_code/code.py
    A src/_pytest/_code/source.py
    A src/_pytest/assertion/__init__.py
    A src/_pytest/assertion/rewrite.py
    A src/_pytest/assertion/truncate.py
    A src/_pytest/assertion/util.py
    A src/_pytest/cacheprovider.py
    A src/_pytest/capture.py
    A src/_pytest/compat.py
    A src/_pytest/config/__init__.py
    A src/_pytest/config/argparsing.py
    A src/_pytest/config/exceptions.py
    A src/_pytest/config/findpaths.py
    A src/_pytest/debugging.py
    A src/_pytest/deprecated.py
    A src/_pytest/doctest.py
    A src/_pytest/experiments.py
    A src/_pytest/fixtures.py
    A src/_pytest/freeze_support.py
    A src/_pytest/helpconfig.py
    A src/_pytest/hookspec.py
    A src/_pytest/junitxml.py
    A src/_pytest/logging.py
    A src/_pytest/main.py
    A src/_pytest/mark/__init__.py
    A src/_pytest/mark/evaluate.py
    A src/_pytest/mark/legacy.py
    A src/_pytest/mark/structures.py
    A src/_pytest/monkeypatch.py
    A src/_pytest/nodes.py
    A src/_pytest/nose.py
    A src/_pytest/outcomes.py
    A src/_pytest/pastebin.py
    A src/_pytest/paths.py
    A src/_pytest/pytester.py
    A src/_pytest/python.py
    A src/_pytest/python_api.py
    A src/_pytest/recwarn.py
    A src/_pytest/reports.py
    A src/_pytest/resultlog.py
    A src/_pytest/runner.py
    A src/_pytest/setuponly.py
    A src/_pytest/setupplan.py
    A src/_pytest/skipping.py
    A src/_pytest/terminal.py
    A src/_pytest/tmpdir.py
    A src/_pytest/unittest.py
    A src/_pytest/warnings.py
    A src/pytest.py
    M tasks/__init__.py
    M tasks/generate.py
    M tasks/release.minor.rst
    M tasks/release.patch.rst
    M tasks/requirements.txt
    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/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    A testing/example_scripts/README.rst
    A testing/example_scripts/conftest_usageerror/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/test_hello.py
    A testing/example_scripts/issue_519.py
    A testing/examples/test_issue519.py
    M testing/freeze/.gitignore
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/logging/test_fixture.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/python/setup_only.py
    M testing/python/setup_plan.py
    M testing/python/show_fixtures_per_test.py
    M testing/python/test_deprecations.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_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

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


  Commit: 027d2336b8d6de145e14a0eaaedacd04dca21c08
      https://github.com/pytest-dev/pytest/commit/027d2336b8d6de145e14a0eaaedacd04dca21c08
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M changelog/2283.feature
    M doc/en/fixture.rst
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Add minimal docs for package-scoped fixtures (experimental)


  Commit: 1e94ac784f1fb5e439d8796ec86f7a95a03df364
      https://github.com/pytest-dev/pytest/commit/1e94ac784f1fb5e439d8796ec86f7a95a03df364
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M AUTHORS
    A changelog/2283.feature
    M doc/en/fixture.rst
    M src/_pytest/fixtures.py
    M src/_pytest/main.py
    M src/_pytest/nodes.py
    M src/_pytest/python.py
    M src/pytest.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #3389 from jonozzz/features

Add package scoped fixtures #2283


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

  Changed paths:
    A changelog/3610.feature.rst
    M doc/en/usage.rst
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #3647 from jeffreyrack/3610-add-trace-option

3610 add trace option


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

  Changed paths:
    M changelog/2220.bugfix.rst
    M changelog/3576.feature.rst
    M changelog/3610.feature.rst
    M changelog/3623.feature.rst

  Log Message:
  -----------
  Small tweaks to the changelog entries


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

  Changed paths:
    M changelog/_template.rst

  Log Message:
  -----------
  Update CHANGELOG template to put issue links at the start of entries

This allows us to use the new multi-line entries available with
towncrier 18.6.0


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

  Changed paths:
    M changelog/README.rst

  Log Message:
  -----------
  Update README for CHANGELOG about using multiple paragraphs


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

  Changed paths:
    M changelog/2220.bugfix.rst

  Log Message:
  -----------
  Fix end-of-line in 2220.bugfix.rst


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

  Changed paths:
    M changelog/2220.bugfix.rst
    M changelog/3576.feature.rst
    M changelog/3610.feature.rst
    M changelog/3623.feature.rst
    M changelog/README.rst
    M changelog/_template.rst

  Log Message:
  -----------
  Merge pull request #3665 from nicoddemus/changelog-tweaks

Small tweaks to the changelog entries


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

  Changed paths:
    M src/_pytest/pytester.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py
    A testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3636 from RonnyPfannschmidt/fixturetest-examples

[RFC] Fixturetest examples - move test contents to use example scripts for contents


  Commit: d2fe6191201139570501bdd8d213b05b6aeba732
      https://github.com/pytest-dev/pytest/commit/d2fe6191201139570501bdd8d213b05b6aeba732
  Author: Tadek Tele?y?ski <tadekte at gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

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

  Log Message:
  -----------
  Fix truncated locals in verbose mode


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

  Changed paths:
    A .github/labels.toml
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    A CITATION
    M HOWTORELEASE.rst
    M README.rst
    A changelog/2319.trivial.rst
    A changelog/3402.trivial.rst
    A changelog/3592.doc.rst
    A changelog/3635.trivial.rst
    A changelog/742.bugfix.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/development_guide.rst
    M doc/en/example/markers.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    A scripts/release.minor.rst
    A scripts/release.patch.rst
    A scripts/release.py
    M src/_pytest/_code/source.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/mark/structures.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    R tasks/__init__.py
    R tasks/generate.py
    R tasks/release.minor.rst
    R tasks/release.patch.rst
    R tasks/requirements.txt
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_pytester.py
    M tox.ini

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


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

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

  Log Message:
  -----------
  Merge pull request #3681 from tadeoos/980-fix-truncated-locals-in-verbose

Fix truncated locals in verbose mode


  Commit: 0bb29d56492258a751a964e4ba729da1f7f52802
      https://github.com/pytest-dev/pytest/commit/0bb29d56492258a751a964e4ba729da1f7f52802
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    A .github/labels.toml
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    A CITATION
    M HOWTORELEASE.rst
    M README.rst
    A changelog/2319.trivial.rst
    A changelog/3402.trivial.rst
    A changelog/3592.doc.rst
    A changelog/3635.trivial.rst
    A changelog/742.bugfix.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/development_guide.rst
    M doc/en/example/markers.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    A scripts/release.minor.rst
    A scripts/release.patch.rst
    A scripts/release.py
    M src/_pytest/_code/source.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/mark/structures.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    R tasks/__init__.py
    R tasks/generate.py
    R tasks/release.minor.rst
    R tasks/release.patch.rst
    R tasks/requirements.txt
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_pytester.py
    M tox.ini

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

Merge master into features


  Commit: 516793339589b9278eb99da68dd21f4d9b2ab2c8
      https://github.com/pytest-dev/pytest/commit/516793339589b9278eb99da68dd21f4d9b2ab2c8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Move teardown code of yield fixtures to a partial to avoid leaks

As it were before, it was keeping a reference to fixturefunc and it
alive when an error occurred


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

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Isolate the code that resolves the fixturefunc to a separate function

pytest_fixture_setup was somewhat convoluted because it was trying
to do too many things.


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

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Make yield_fixture just call fixture to do its work

Since fixture and yield_fixture are identical, they should call
the same code; as it was, the code inside them was already starting
to deviate.


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

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Merge pull request #3708 from nicoddemus/small-refactors

Small refactorings


  Commit: 011f88f7e77b8b2e6de01d2c5588dda47c77093b
      https://github.com/pytest-dev/pytest/commit/011f88f7e77b8b2e6de01d2c5588dda47c77093b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    A changelog/3661.removal.rst
    M src/_pytest/compat.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/pytester.py
    M testing/deprecated_test.py
    A testing/example_scripts/tmpdir/tmpdir_fixture.py
    M testing/python/fixture.py
    M testing/test_assertion.py
    M testing/test_conftest.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Deprecate calling fixture functions directly

This will now issue a RemovedInPytest4Warning when the user calls
a fixture function directly, instead of requesting it from test
functions as is expected

Fix #3661


  Commit: 6e57d123bb240e4b3668fc4e422a6e0f01d08f17
      https://github.com/pytest-dev/pytest/commit/6e57d123bb240e4b3668fc4e422a6e0f01d08f17
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M testing/python/metafunc.py

  Log Message:
  -----------
  Mark test_idval_hypothesis as flaky on Windows (#3707)


  Commit: 57b0c60cb4a083592cce04e8b383b55bf14a59dc
      https://github.com/pytest-dev/pytest/commit/57b0c60cb4a083592cce04e8b383b55bf14a59dc
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Remove Testdir.run_example as recommended


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

  Changed paths:
    A changelog/3661.removal.rst
    M src/_pytest/compat.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    A testing/example_scripts/tmpdir/tmpdir_fixture.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_conftest.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Merge pull request #3705 from nicoddemus/deprecate-call-fixture-func

 Deprecate calling fixture functions directly


  Commit: 0e475995720b846db91d02384b61ad8a54e9229d
      https://github.com/pytest-dev/pytest/commit/0e475995720b846db91d02384b61ad8a54e9229d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/conf.py
    M doc/en/customize.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M pyproject.toml
    M setup.py

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


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

  Changed paths:
    A changelog/2639.removal.rst
    M setup.py
    M src/_pytest/hookspec.py

  Log Message:
  -----------
  Warn when implementations exist for pytest_namespace hook

This hook has been deprecated and will be removed in the future.

Fix #2639


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

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/conf.py
    M doc/en/customize.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M pyproject.toml
    M setup.py

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

Merge master into features


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

  Changed paths:
    M src/_pytest/hookspec.py
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Fix test and update warning in pytest_namespace docs


  Commit: 953a618102782daceb229af3b8788b71560b1f0d
      https://github.com/pytest-dev/pytest/commit/953a618102782daceb229af3b8788b71560b1f0d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M changelog/2639.removal.rst

  Log Message:
  -----------
  Update CHANGELOG entry about pytest_namespace deprecation


  Commit: 8609f8d25a1f9a59df835bf51bdf86953c127f00
      https://github.com/pytest-dev/pytest/commit/8609f8d25a1f9a59df835bf51bdf86953c127f00
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M src/_pytest/deprecated.py
    M src/_pytest/hookspec.py

  Log Message:
  -----------
  Move warning definition to deprecated module


  Commit: 9f5d73d44afc165a0c0803913615f3ddd119d2b3
      https://github.com/pytest-dev/pytest/commit/9f5d73d44afc165a0c0803913615f3ddd119d2b3
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    A changelog/2639.removal.rst
    M setup.py
    M src/_pytest/deprecated.py
    M src/_pytest/hookspec.py
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Merge pull request #3735 from nicoddemus/deprecate-pytest-namespace

Deprecate pytest namespace


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

  Changed paths:
    M .travis.yml
    M appveyor.yml
    A changelog/3295.doc.rst
    A changelog/3695.bugfix.rst
    M doc/en/cache.rst
    M src/_pytest/python_api.py
    M testing/python/approx.py

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


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

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Use python 3.6 for regendoc


  Commit: 2c09930b6d701d91a0284c6d44086488ffbcb419
      https://github.com/pytest-dev/pytest/commit/2c09930b6d701d91a0284c6d44086488ffbcb419
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Use proper quotes for python 3.7 on travis.yml


  Commit: 60b1913ba21094da5eb91d8c68642c38f20f6a26
      https://github.com/pytest-dev/pytest/commit/60b1913ba21094da5eb91d8c68642c38f20f6a26
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2220.bugfix.rst
    R changelog/2283.feature
    R changelog/2639.removal.rst
    R changelog/3295.doc.rst
    R changelog/3519.trivial.rst
    R changelog/3576.feature.rst
    R changelog/3579.feature.rst
    R changelog/3610.feature.rst
    R changelog/3623.feature.rst
    R changelog/3661.removal.rst
    R changelog/3695.bugfix.rst
    R changelog/980.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.0.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst

  Log Message:
  -----------
  Preparing release version 3.7.0


  Commit: 997ef593068a36c283cbb83d938272b9770caa36
      https://github.com/pytest-dev/pytest/commit/997ef593068a36c283cbb83d938272b9770caa36
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M CHANGELOG.rst

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


  Commit: 253419316ce09b952862811db229a9e9383a332b
      https://github.com/pytest-dev/pytest/commit/253419316ce09b952862811db229a9e9383a332b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M appveyor.yml
    R changelog/2220.bugfix.rst
    R changelog/2283.feature
    R changelog/2639.removal.rst
    R changelog/3519.trivial.rst
    R changelog/3576.feature.rst
    R changelog/3579.feature.rst
    R changelog/3610.feature.rst
    R changelog/3623.feature.rst
    R changelog/3661.removal.rst
    R changelog/980.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.0.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M src/_pytest/python_api.py
    M testing/python/approx.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3738 from nicoddemus/release-3.7.0

Release 3.7.0


Compare: https://github.com/pytest-dev/pytest/compare/150535b6c11b...253419316ce0
      **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.