From nicoddemus at gmail.com  Mon Jul  3 17:57:19 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 03 Jul 2017 14:57:19 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 16df4d: Fix exclude_path check
Message-ID: <595abdbfa69c5_3063f80eac0fc3810118b@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 16df4da1f7af6e2a4b06e46b9b3263feee2821a5
      https://github.com/pytest-dev/pytest/commit/16df4da1f7af6e2a4b06e46b9b3263feee2821a5
  Author: Antoine Legrand <2t.antoine at gmail.com>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  Fix exclude_path check


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

  Changed paths:
    A changelog/2475.bugfix

  Log Message:
  -----------
  Add changelog for triple leading '/' problem.


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

  Changed paths:
    M _pytest/main.py
    A changelog/2475.bugfix

  Log Message:
  -----------
  Merge pull request #2475 from ant31/master

[wip] Fix ignore_path condition


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

From nicoddemus at gmail.com  Tue Jul  4 11:32:00 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 04 Jul 2017 08:32:00 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7277fb: Fix SMTP port in
 fixture docs
Message-ID: <595bb4f087457_10a83fd1dbdb3c2815895f@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/tags/3.1.3
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7277fbdb2048655ff1d52d9ca046a14aa05e5f90
      https://github.com/pytest-dev/pytest/commit/7277fbdb2048655ff1d52d9ca046a14aa05e5f90
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix SMTP port in fixture docs

Also add timeout to avoid regen getting stuck due
to connection problems

Fix #2509


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

  Changed paths:
    M tasks/requirements.txt

  Log Message:
  -----------
  Add wheel to tasks/requirements.txt: required for package creation


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/2434.bugfix
    R changelog/2440.bugfix
    R changelog/2464.bugfix
    R changelog/2469.bugfix
    R changelog/2474.trivial
    R changelog/2475.bugfix
    R changelog/2486.bugfix
    R changelog/2493.doc
    R changelog/2499.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.3.rst
    M doc/en/assert.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/tmpdir.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.1.3


Compare: https://github.com/pytest-dev/pytest/compare/7277fbdb2048^...b63f6770a17a

From nicoddemus at gmail.com  Tue Jul  4 11:34:24 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 04 Jul 2017 08:34:24 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7277fb: Fix SMTP port in
 fixture docs
Message-ID: <595bb5804db61_69a53ff6037cdc4017691@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7277fbdb2048655ff1d52d9ca046a14aa05e5f90
      https://github.com/pytest-dev/pytest/commit/7277fbdb2048655ff1d52d9ca046a14aa05e5f90
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix SMTP port in fixture docs

Also add timeout to avoid regen getting stuck due
to connection problems

Fix #2509


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

  Changed paths:
    M tasks/requirements.txt

  Log Message:
  -----------
  Add wheel to tasks/requirements.txt: required for package creation


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/2434.bugfix
    R changelog/2440.bugfix
    R changelog/2464.bugfix
    R changelog/2469.bugfix
    R changelog/2474.trivial
    R changelog/2475.bugfix
    R changelog/2486.bugfix
    R changelog/2493.doc
    R changelog/2499.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.3.rst
    M doc/en/assert.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/tmpdir.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.1.3


Compare: https://github.com/pytest-dev/pytest/compare/6908d93ba1c4...b63f6770a17a

From nicoddemus at gmail.com  Tue Jul  4 16:11:59 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 04 Jul 2017 13:11:59 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 16df4d: Fix exclude_path check
Message-ID: <595bf68feb110_58423fd7636d3c2c11709b@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 16df4da1f7af6e2a4b06e46b9b3263feee2821a5
      https://github.com/pytest-dev/pytest/commit/16df4da1f7af6e2a4b06e46b9b3263feee2821a5
  Author: Antoine Legrand <2t.antoine at gmail.com>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  Fix exclude_path check


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

  Changed paths:
    A changelog/2475.bugfix

  Log Message:
  -----------
  Add changelog for triple leading '/' problem.


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

  Changed paths:
    M _pytest/main.py
    A changelog/2475.bugfix

  Log Message:
  -----------
  Merge pull request #2475 from ant31/master

[wip] Fix ignore_path condition


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

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix SMTP port in fixture docs

Also add timeout to avoid regen getting stuck due
to connection problems

Fix #2509


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

  Changed paths:
    M tasks/requirements.txt

  Log Message:
  -----------
  Add wheel to tasks/requirements.txt: required for package creation


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/2434.bugfix
    R changelog/2440.bugfix
    R changelog/2464.bugfix
    R changelog/2469.bugfix
    R changelog/2474.trivial
    R changelog/2475.bugfix
    R changelog/2486.bugfix
    R changelog/2493.doc
    R changelog/2499.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.3.rst
    M doc/en/assert.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/tmpdir.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.1.3


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

  Changed paths:
    M CHANGELOG.rst
    M _pytest/main.py
    R changelog/2434.bugfix
    R changelog/2440.bugfix
    R changelog/2464.bugfix
    R changelog/2469.bugfix
    R changelog/2474.trivial
    R changelog/2486.bugfix
    R changelog/2493.doc
    R changelog/2499.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.3.rst
    M doc/en/assert.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/tmpdir.rst
    M doc/en/warnings.rst
    M tasks/requirements.txt

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


Compare: https://github.com/pytest-dev/pytest/compare/0303d95a53ee...b62aef3372cf

From nicoddemus at gmail.com  Tue Jul  4 19:57:46 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 04 Jul 2017 16:57:46 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 19f36a: Clarify
 pytest_configure hook call order
Message-ID: <595c2b7a13889_97b3fa9f8147c381710db@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/pytest-configure-order
  Home:   https://github.com/pytest-dev/pytest
  Commit: 19f36a855383e53d1750c30c6d42c0c2237b8de4
      https://github.com/pytest-dev/pytest/commit/19f36a855383e53d1750c30c6d42c0c2237b8de4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M _pytest/hookspec.py
    A changelog/2539.doc

  Log Message:
  -----------
  Clarify pytest_configure hook call order

Fix #2539



From nicoddemus at gmail.com  Tue Jul  4 20:12:41 2017
From: nicoddemus at gmail.com (nicoddemus)
Date: Tue, 04 Jul 2017 17:12:41 -0700
Subject: [Pytest-commit] [pytest-dev/pytest]
Message-ID: <595c2ef94ab50_18d03fcad6d99c30213012@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/pytest-configure-order
  Home:   https://github.com/pytest-dev/pytest

From nicoddemus at gmail.com  Mon Jul 10 16:49:07 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 10 Jul 2017 13:49:07 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f471ee: ini option cache_dir
Message-ID: <5963e8438e033_25233fb47b56bc2875965@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: f471eef6613d7408faa3e57964c043342a4330a9
      https://github.com/pytest-dev/pytest/commit/f471eef6613d7408faa3e57964c043342a4330a9
  Author: V.Kuznetsov <v.kuznetsov at voskhod.ru>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M _pytest/cacheprovider.py

  Log Message:
  -----------
  ini option cache_dir


  Commit: 7a9fc694358f3d6958de0c7785bcbf67c6784076
      https://github.com/pytest-dev/pytest/commit/7a9fc694358f3d6958de0c7785bcbf67c6784076
  Author: V.Kuznetsov <v.kuznetsov at voskhod.ru>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M testing/test_cache.py

  Log Message:
  -----------
  tests for ini option cache_dir


  Commit: 91418eda3b47504c930d8f46a5f96309a7e6909f
      https://github.com/pytest-dev/pytest/commit/91418eda3b47504c930d8f46a5f96309a7e6909f
  Author: V.Kuznetsov <v.kuznetsov at voskhod.ru>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M doc/en/cache.rst
    M doc/en/customize.rst

  Log Message:
  -----------
  docs for ini option cache_dir


  Commit: bd52eebab4fb840992fc3f2ca99a40920421b221
      https://github.com/pytest-dev/pytest/commit/bd52eebab4fb840992fc3f2ca99a40920421b221
  Author: V.Kuznetsov <v.kuznetsov at voskhod.ru>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    A changelog/2543.feature

  Log Message:
  -----------
  changelog for ini option cache_dir


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

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/2543.feature
    M doc/en/cache.rst
    M doc/en/customize.rst
    M testing/test_cache.py

  Log Message:
  -----------
  Merge pull request #2559 from RockBomber/features

cache_dir ini option for setting cache directory


Compare: https://github.com/pytest-dev/pytest/compare/ef62b86335dc...a87f6f84cc04

From nicoddemus at gmail.com  Mon Jul 10 16:49:46 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 10 Jul 2017 13:49:46 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 805951: replace all
 _escape_strings to _ascii_escaped
Message-ID: <5963e86a16aa1_3db43ffa316b9c3c100542@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 80595115b0fe21092170a070f65afd5c50169645
      https://github.com/pytest-dev/pytest/commit/80595115b0fe21092170a070f65afd5c50169645
  Author: John Still <john at jmsdvl.com>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

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

  Log Message:
  -----------
  replace all _escape_strings to _ascii_escaped


  Commit: cdd788085d37225fdb7e8fe344f9a5d937211052
      https://github.com/pytest-dev/pytest/commit/cdd788085d37225fdb7e8fe344f9a5d937211052
  Author: John Still <john at jmsdvl.com>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    A changelog/2533.trivial

  Log Message:
  -----------
  add news fragment to changelog folder


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

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

  Log Message:
  -----------
  Merge pull request #2561 from jmsdvl/iss2533

Rename _escape_strings to _ascii_escaped


Compare: https://github.com/pytest-dev/pytest/compare/7cd03d761181...9e0b19cce28a

From nicoddemus at gmail.com  Mon Jul 10 17:31:08 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 10 Jul 2017 14:31:08 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 221f42: Change --strict help
 message to clarify it deals w...
Message-ID: <5963f21c25bf0_7ccd3fd68c085c4475950@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 221f42c5cea1e8a3b4603db1f82d3c4f8b852892
      https://github.com/pytest-dev/pytest/commit/221f42c5cea1e8a3b4603db1f82d3c4f8b852892
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M _pytest/main.py
    A changelog/2444.trivial
    M doc/en/example/markers.rst
    M testing/test_skipping.py

  Log Message:
  -----------
  Change --strict help message to clarify it deals with unregistered markers

Fix #2444


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

  Changed paths:
    M _pytest/main.py
    A changelog/2444.trivial
    M doc/en/example/markers.rst
    M testing/test_skipping.py

  Log Message:
  -----------
  Merge pull request #2552 from nicoddemus/strict-help-message

Change --strict help message to clarify it deals with unregistered markers


  Commit: 3667086acc46f410ffe93a774107fb773833505a
      https://github.com/pytest-dev/pytest/commit/3667086acc46f410ffe93a774107fb773833505a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    M _pytest/hookspec.py
    A changelog/2539.doc

  Log Message:
  -----------
  Clarify pytest_configure hook call order

Fix #2539


  Commit: 7cd03d761181d1f667636c1a1d6a15b04ff61ac7
      https://github.com/pytest-dev/pytest/commit/7cd03d761181d1f667636c1a1d6a15b04ff61ac7
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    M _pytest/hookspec.py
    A changelog/2539.doc

  Log Message:
  -----------
  Merge pull request #2554 from nicoddemus/pytest-configure-order

Clarify pytest_configure hook call order


  Commit: 80595115b0fe21092170a070f65afd5c50169645
      https://github.com/pytest-dev/pytest/commit/80595115b0fe21092170a070f65afd5c50169645
  Author: John Still <john at jmsdvl.com>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

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

  Log Message:
  -----------
  replace all _escape_strings to _ascii_escaped


  Commit: cdd788085d37225fdb7e8fe344f9a5d937211052
      https://github.com/pytest-dev/pytest/commit/cdd788085d37225fdb7e8fe344f9a5d937211052
  Author: John Still <john at jmsdvl.com>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    A changelog/2533.trivial

  Log Message:
  -----------
  add news fragment to changelog folder


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

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

  Log Message:
  -----------
  Merge pull request #2561 from jmsdvl/iss2533

Rename _escape_strings to _ascii_escaped


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

  Changed paths:
    M _pytest/compat.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/python.py
    A changelog/2444.trivial
    A changelog/2533.trivial
    A changelog/2539.doc
    M doc/en/example/markers.rst
    M testing/test_skipping.py

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


Compare: https://github.com/pytest-dev/pytest/compare/a87f6f84cc04...d9aaab7ab277

From nicoddemus at gmail.com  Mon Jul 17 17:06:58 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 17 Jul 2017 14:06:58 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] e5169a: #2574: --fixtures,
 --fixtures-per-test keep indent...
Message-ID: <596d26f288e94_75e43fef4b467c2c932c9@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: e5169a026a0da6a23c4068157824fd7b82b2337e
      https://github.com/pytest-dev/pytest/commit/e5169a026a0da6a23c4068157824fd7b82b2337e
  Author: Martin Altmayer <altmayer at posteo.de>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

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

  Log Message:
  -----------
  #2574: --fixtures, --fixtures-per-test keep indentation of docstring


  Commit: 2a979797ef637583a22d1e794da8de79f942732a
      https://github.com/pytest-dev/pytest/commit/2a979797ef637583a22d1e794da8de79f942732a
  Author: Martin Altmayer <altmayer at posteo.de>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    A changelog/2574.bugfix

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


  Commit: cc39f41c535e9206986b9e93e6b0880f0d5cdbe4
      https://github.com/pytest-dev/pytest/commit/cc39f41c535e9206986b9e93e6b0880f0d5cdbe4
  Author: Martin Altmayer <altmayer at posteo.de>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add myself to AUTHORS as required by the PR help text.


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

  Changed paths:
    M AUTHORS
    M _pytest/python.py
    A changelog/2574.bugfix
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #2575 from MartinAltmayer/master

#2574 Options --fixtures and --fixtures-per-test keep indentation of docstrings


Compare: https://github.com/pytest-dev/pytest/compare/3578f4e40522...ac3f2207bb5f

From nicoddemus at gmail.com  Wed Jul 19 06:46:40 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 19 Jul 2017 03:46:40 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 62556b: remove the
 MARK_INFO_ATTRIBUTE warning until we ca...
Message-ID: <596f38904c7f5_79c63f97d8489c34671df@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 62556bada660ca209e7e83bc775559d9039f31b1
      https://github.com/pytest-dev/pytest/commit/62556bada660ca209e7e83bc775559d9039f31b1
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M _pytest/mark.py

  Log Message:
  -----------
  remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage

fixes #2573


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

  Changed paths:
    M _pytest/mark.py

  Log Message:
  -----------
  Merge pull request #2585 from RonnyPfannschmidt/fix-2573

remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage


Compare: https://github.com/pytest-dev/pytest/compare/1485a3a902bd...2c03000b9642

From nicoddemus at gmail.com  Wed Jul 19 15:40:03 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 19 Jul 2017 12:40:03 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 284063: Fix typo and improve
 comment about cookiecutter-te...
Message-ID: <596fb5931b721_3d813f9693a9bc301569ea@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 2840634c2c918fb5ff74536999a2f7de495a6ea4
      https://github.com/pytest-dev/pytest/commit/2840634c2c918fb5ff74536999a2f7de495a6ea4
  Author: Raphael Pierzina <raphael at hackebrot.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Fix typo and improve comment about cookiecutter-template


  Commit: 91b4b229aa82711c3ee4eaa8159fe5face1bbcfb
      https://github.com/pytest-dev/pytest/commit/91b4b229aa82711c3ee4eaa8159fe5face1bbcfb
  Author: Raphael Pierzina <raphael at hackebrot.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Update documentation for testing plugin code


  Commit: e73a2f7ad98e35ec6ee972d2003a417731c1eb86
      https://github.com/pytest-dev/pytest/commit/e73a2f7ad98e35ec6ee972d2003a417731c1eb86
  Author: Raphael Pierzina <raphael at hackebrot.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    A changelog/971.doc

  Log Message:
  -----------
  Add changelog entry changelog/971.doc


  Commit: d06d97a7ac6b9f6c723eadaa2fc3fd59e2f91b4f
      https://github.com/pytest-dev/pytest/commit/d06d97a7ac6b9f6c723eadaa2fc3fd59e2f91b4f
  Author: Raphael Pierzina <raphael at hackebrot.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Remove unnecessary comma from docs


  Commit: 1ac02b8a3bb41864ffe2c2aa028ef385adb559b8
      https://github.com/pytest-dev/pytest/commit/1ac02b8a3bb41864ffe2c2aa028ef385adb559b8
  Author: Raphael Pierzina <raphael at hackebrot.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Add plugin code


  Commit: 61d4345ea4fd9517ab7deb3b33c93ed1615cf7f1
      https://github.com/pytest-dev/pytest/commit/61d4345ea4fd9517ab7deb3b33c93ed1615cf7f1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    A changelog/971.doc
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #2593 from hackebrot/extend-pytester-docs-for-testing-plugin-code

Extend pytester docs for testing plugin code


Compare: https://github.com/pytest-dev/pytest/compare/0e559c978fa6...61d4345ea4fd

From nicoddemus at gmail.com  Wed Jul 19 16:10:15 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 19 Jul 2017 13:10:15 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 796ffa: reformatted tox.ini
Message-ID: <596fbca75a108_2bc53f8ed9f87c241514c0@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 796ffa51230c82899f99fc3723ea6c6620f983a6
      https://github.com/pytest-dev/pytest/commit/796ffa51230c82899f99fc3723ea6c6620f983a6
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  reformatted tox.ini


  Commit: 6af2abdb53ed5277d7c43bfec0ec646b2a35a814
      https://github.com/pytest-dev/pytest/commit/6af2abdb53ed5277d7c43bfec0ec646b2a35a814
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/fixtures.py
    M testing/code/test_source.py
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_pastebin.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M tox.ini

  Log Message:
  -----------
  Fixed flake8 warnings

W191 indentation contains tabs
W292 no newline at end of file
W293 blank line contains whitespace
W391 blank line at end of file


  Commit: 6146ac97d9f79bb9ee5f8a26cbe4298f6fe06987
      https://github.com/pytest-dev/pytest/commit/6146ac97d9f79bb9ee5f8a26cbe4298f6fe06987
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/doctest.py
    M _pytest/pytester.py
    M _pytest/python.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_monkeypatch.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Fixed E101 flake8 errors

indentation contains mixed spaces and tabs


  Commit: 8de49e8742f08f17a46c64674b34e772f685a9e4
      https://github.com/pytest-dev/pytest/commit/8de49e8742f08f17a46c64674b34e772f685a9e4
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Fixed E111 flake8 errors

indentation is not a multiple of four


  Commit: 64a4b9058c4d27b47992f3d816e7969fcdddd102
      https://github.com/pytest-dev/pytest/commit/64a4b9058c4d27b47992f3d816e7969fcdddd102
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Fixed E113 flake8 errors

unexpected indentation


  Commit: 0be97624b745581af68bb9a0e2c1d04a249c55bf
      https://github.com/pytest-dev/pytest/commit/0be97624b745581af68bb9a0e2c1d04a249c55bf
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E121 flake8 errors

continuation line under-indented for hanging indent


  Commit: 425665cf25dd9a3f20982287338ca8e770531872
      https://github.com/pytest-dev/pytest/commit/425665cf25dd9a3f20982287338ca8e770531872
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/helpconfig.py
    M testing/python/fixture.py
    M testing/test_assertrewrite.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E122 flake8 errors

continuation line missing indentation or outdented


  Commit: 4b20b9d8d9fe4a027c425c6feeb8d7ed39c86ee3
      https://github.com/pytest-dev/pytest/commit/4b20b9d8d9fe4a027c425c6feeb8d7ed39c86ee3
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M testing/python/fixture.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E123 flake8 errors

closing bracket does not match indentation of opening bracket?s line


  Commit: 051d76a63f6b220e38cc53a54efe4bf800a3dcf3
      https://github.com/pytest-dev/pytest/commit/051d76a63f6b220e38cc53a54efe4bf800a3dcf3
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/python.py
    M _pytest/skipping.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/python/metafunc.py
    M testing/test_assertrewrite.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E124 flake8 errors

closing bracket does not match visual indentation


  Commit: 92e2cd9c68d7fbbdf479ba065254dd50724a8d5c
      https://github.com/pytest-dev/pytest/commit/92e2cd9c68d7fbbdf479ba065254dd50724a8d5c
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/unittest.py
    M tox.ini

  Log Message:
  -----------
  Fixed E125 flake8 errors

continuation line with same indent as next logical line


  Commit: e855a79dd4d3976c3432f08c4b5f57333dcb3917
      https://github.com/pytest-dev/pytest/commit/e855a79dd4d3976c3432f08c4b5f57333dcb3917
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M testing/code/test_source.py
    M testing/python/approx.py
    M testing/test_assertion.py
    M testing/test_mark.py
    M testing/test_pluginmanager.py
    M testing/test_resultlog.py
    M tox.ini

  Log Message:
  -----------
  Fixed E126 flake8 errors

continuation line over-indented for hanging indent


  Commit: 57438f3efe487106a5bc779237c5e4e84bd3f4f0
      https://github.com/pytest-dev/pytest/commit/57438f3efe487106a5bc779237c5e4e84bd3f4f0
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/junitxml.py
    M _pytest/pytester.py
    M _pytest/python.py
    M testing/code/test_excinfo.py
    M testing/python/integration.py
    M testing/test_collection.py
    M testing/test_parseopt.py
    M tox.ini

  Log Message:
  -----------
  Fixed E127 flake8 errors

continuation line over-indented for visual indent


  Commit: cf97159009723be555aaa724df18f6f38a417bd2
      https://github.com/pytest-dev/pytest/commit/cf97159009723be555aaa724df18f6f38a417bd2
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/cacheprovider.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/main.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M testing/code/test_excinfo.py
    M testing/python/collect.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_parseopt.py
    M testing/test_pluginmanager.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E128 flake8 errors

continuation line under-indented for visual indent


  Commit: 1c935db571b8e5e763360d682d236a0ee5b29dda
      https://github.com/pytest-dev/pytest/commit/1c935db571b8e5e763360d682d236a0ee5b29dda
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/unittest.py
    M tox.ini

  Log Message:
  -----------
  Fixed E129 flake8 errors

visually indented line with same indent as next logical line


  Commit: df54bf0db524a9c8e5b6c2847c56d1589f533087
      https://github.com/pytest-dev/pytest/commit/df54bf0db524a9c8e5b6c2847c56d1589f533087
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M testing/code/test_excinfo.py
    M testing/python/approx.py
    M testing/test_assertion.py
    M testing/test_mark.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E131 flake8 errors

continuation line unaligned for hanging indent


  Commit: 1ff54ba205925521faf12a9d1838c8893be5dcf0
      https://github.com/pytest-dev/pytest/commit/1ff54ba205925521faf12a9d1838c8893be5dcf0
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/source.py
    M testing/python/approx.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M tox.ini

  Log Message:
  -----------
  Fixed E201 flake8 errors

whitespace after ?(?


  Commit: ba0a4d0b2e385a5bc65345a3dda81588825c0566
      https://github.com/pytest-dev/pytest/commit/ba0a4d0b2e385a5bc65345a3dda81588825c0566
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M testing/code/test_excinfo.py
    M testing/test_assertion.py
    M tox.ini

  Log Message:
  -----------
  Fixed E202 flake8 errors

whitespace before ?)?


  Commit: ebb6d0650b6722cefba0a640b1f7e5486a6b8ea6
      https://github.com/pytest-dev/pytest/commit/ebb6d0650b6722cefba0a640b1f7e5486a6b8ea6
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M testing/test_assertrewrite.py
    M tox.ini

  Log Message:
  -----------
  Fixed E203 flake8 errors

whitespace before ?:?


  Commit: f640e0cb0481b239d1e3c705d0dbadb2a618ef17
      https://github.com/pytest-dev/pytest/commit/f640e0cb0481b239d1e3c705d0dbadb2a618ef17
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/warnings.py
    M testing/code/test_excinfo.py
    M tox.ini

  Log Message:
  -----------
  Fixed E221 flake8 errors

multiple spaces before operator


  Commit: 3fabc4d21918a0927a1717e2616862400bde5440
      https://github.com/pytest-dev/pytest/commit/3fabc4d21918a0927a1717e2616862400bde5440
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M testing/test_collection.py
    M tox.ini

  Log Message:
  -----------
  Fixed E222 flake8 errors

multiple spaces after operator


  Commit: 2e8caefcab33942a754ee7ddf7697fe487a4367a
      https://github.com/pytest-dev/pytest/commit/2e8caefcab33942a754ee7ddf7697fe487a4367a
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/main.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M testing/acceptance_test.py
    M testing/code/test_source.py
    M testing/python/fixture.py
    M testing/test_assertion.py
    M testing/test_conftest.py
    M testing/test_parseopt.py
    M testing/test_pdb.py
    M testing/test_skipping.py
    M tox.ini

  Log Message:
  -----------
  Fixed E225 flake8 errors

missing whitespace around operator


  Commit: 4b22f270a3583c97034ab63a343defbee146666a
      https://github.com/pytest-dev/pytest/commit/4b22f270a3583c97034ab63a343defbee146666a
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/util.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/test_assertion.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_skipping.py
    M tox.ini

  Log Message:
  -----------
  Fixed E226 flake8 errors

missing whitespace around arithmetic operator


  Commit: 617e510b6e4fb2e95a1486c8f30dd1e7583be248
      https://github.com/pytest-dev/pytest/commit/617e510b6e4fb2e95a1486c8f30dd1e7583be248
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E231 flake8 errors

missing whitespace after ?,?, ?;?, or ?:?


  Commit: 4c24947785f9dd758038742d66376db5942cf76e
      https://github.com/pytest-dev/pytest/commit/4c24947785f9dd758038742d66376db5942cf76e
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/pytester.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M tox.ini

  Log Message:
  -----------
  Fixed E241 flake8 errors

multiple spaces after ?,?


  Commit: b226454582f8fbf083e31cc54e67c52e36176e53
      https://github.com/pytest-dev/pytest/commit/b226454582f8fbf083e31cc54e67c52e36176e53
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/source.py
    M _pytest/helpconfig.py
    M _pytest/pytester.py
    M _pytest/python.py
    M testing/test_config.py
    M testing/test_parseopt.py
    M testing/test_resultlog.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E251 flake8 errors

unexpected spaces around keyword / parameter equals


  Commit: 8f3eb6dfc7d5e9ceca694ccf2c4906bbea969faf
      https://github.com/pytest-dev/pytest/commit/8f3eb6dfc7d5e9ceca694ccf2c4906bbea969faf
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_argcomplete.py
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_pdb.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E261 flake8 errors

at least two spaces before inline comment


  Commit: eae8b41b07013744774909beeb7bcf7ef40c6961
      https://github.com/pytest-dev/pytest/commit/eae8b41b07013744774909beeb7bcf7ef40c6961
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Fixed E262 flake8 errors

inline comment should start with ?# ?


  Commit: 195a81652239142f715d8d765b83429240e19c70
      https://github.com/pytest-dev/pytest/commit/195a81652239142f715d8d765b83429240e19c70
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/main.py
    M _pytest/nose.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/fixture.py
    M testing/test_assertion.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_helpconfig.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E265 flake8 errors

block comment should start with ?# ?


  Commit: c9a081d1a3344787bb30f9526036922fd7fcad1d
      https://github.com/pytest-dev/pytest/commit/c9a081d1a3344787bb30f9526036922fd7fcad1d
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/compat.py
    M testing/test_conftest.py
    M testing/test_parseopt.py
    M tox.ini

  Log Message:
  -----------
  Fixed E271 flake8 errors

multiple spaces after keyword


  Commit: 4730c6d99d017dacd4a0788c3f2cd2d041bc4968
      https://github.com/pytest-dev/pytest/commit/4730c6d99d017dacd4a0788c3f2cd2d041bc4968
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M testing/test_config.py
    M tox.ini

  Log Message:
  -----------
  Fixed E272 flake8 errors

multiple spaces before keyword


  Commit: 9bad9b53d8a7399cb2f72f9e5cf399488a065a3d
      https://github.com/pytest-dev/pytest/commit/9bad9b53d8a7399cb2f72f9e5cf399488a065a3d
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Fixed E293 flake8 errors


  Commit: 17a21d540bb7d5e8fc2da115b29e6f5c0c966b43
      https://github.com/pytest-dev/pytest/commit/17a21d540bb7d5e8fc2da115b29e6f5c0c966b43
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_pytester.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E301 flake8 errors

expected 1 blank line, found 0


  Commit: b840622819ee9867e92b094a07b371be68a1a43b
      https://github.com/pytest-dev/pytest/commit/b840622819ee9867e92b094a07b371be68a1a43b
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_argcomplete.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/nose.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/freeze/tests/test_trivial.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_helpconfig.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_pluginmanager.py
    M testing/test_pytester.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:
  -----------
  Fixed E302 flake8 errors

expected 2 blank lines, found 0


  Commit: 7248b759e88ff282cab5bf289d4d7047ef0bfaad
      https://github.com/pytest-dev/pytest/commit/7248b759e88ff282cab5bf289d4d7047ef0bfaad
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/cacheprovider.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_mark.py
    M testing/test_pdb.py
    M testing/test_recwarn.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Fixed E303 flake8 errors

too many blank lines (3)


  Commit: 45ac863069a45d4874370c2028aa7f2aae2cff91
      https://github.com/pytest-dev/pytest/commit/45ac863069a45d4874370c2028aa7f2aae2cff91
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/source.py
    M _pytest/helpconfig.py
    M testing/test_argcomplete.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_parseopt.py
    M tox.ini

  Log Message:
  -----------
  Fixed E401 flake8 errors

multiple imports on one line


  Commit: b9e318866eab409ae6487a5790a87610d6933258
      https://github.com/pytest-dev/pytest/commit/b9e318866eab409ae6487a5790a87610d6933258
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M testing/code/test_excinfo.py
    M testing/test_assertrewrite.py
    M tox.ini

  Log Message:
  -----------
  Fixed E402 flake8 errors

module level import not at top of file


  Commit: 7d2ceb7872c653019cd07fc0a405410072860e1e
      https://github.com/pytest-dev/pytest/commit/7d2ceb7872c653019cd07fc0a405410072860e1e
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/main.py
    M testing/python/approx.py
    M testing/python/metafunc.py
    M tox.ini

  Log Message:
  -----------
  Fixed E501 flake8 errors

line too long (> 120 characters)


  Commit: 85141a419f7c8ca314ff682ad58b18f1485da993
      https://github.com/pytest-dev/pytest/commit/85141a419f7c8ca314ff682ad58b18f1485da993
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/python/metafunc.py
    M testing/test_recwarn.py
    M tox.ini

  Log Message:
  -----------
  Fixed E701 flake8 errors

multiple statements on one line (colon)


  Commit: bf259d3c93427cb09c6ff40741a62e81678ee369
      https://github.com/pytest-dev/pytest/commit/bf259d3c93427cb09c6ff40741a62e81678ee369
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Fixed E702 flake8 errors

multiple statements on one line (semicolon)


  Commit: 5ae59279f48b500625b8cffb8ca3e6f8386aa291
      https://github.com/pytest-dev/pytest/commit/5ae59279f48b500625b8cffb8ca3e6f8386aa291
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_argcomplete.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_runner.py
    M tox.ini

  Log Message:
  -----------
  Fixed E704 flake8 errors

multiple statements on one line (def)


  Commit: 15610289ac720bbdd90c5b69b6a5ef6405a2c4ab
      https://github.com/pytest-dev/pytest/commit/15610289ac720bbdd90c5b69b6a5ef6405a2c4ab
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/fixtures.py
    M testing/test_parseopt.py
    M tox.ini

  Log Message:
  -----------
  Fixed E712 flake8 errors

comparison to True should be ?if cond is True:? or ?if cond:?


  Commit: b49e8baab3759d70d4af138d76cf28321f3e7807
      https://github.com/pytest-dev/pytest/commit/b49e8baab3759d70d4af138d76cf28321f3e7807
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/python.py
    M testing/test_session.py
    M tox.ini

  Log Message:
  -----------
  Fixed E731 flake8 errors

do not assign a lambda expression, use a def


  Commit: b2a5ec3b9457734488dac9dd402876739985af40
      https://github.com/pytest-dev/pytest/commit/b2a5ec3b9457734488dac9dd402876739985af40
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M AUTHORS
    A changelog/2581.trivial

  Log Message:
  -----------
  updated meta


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

  Changed paths:
    M AUTHORS
    M _pytest/_argcomplete.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    A changelog/2581.trivial
    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/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_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_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 branch 'fix-flake8-issues'


Compare: https://github.com/pytest-dev/pytest/compare/61d4345ea4fd...c92760dca863

From flub at devork.be  Thu Jul 20 17:14:16 2017
From: flub at devork.be (Floris Bruynooghe)
Date: Thu, 20 Jul 2017 14:14:16 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] ba9a76: Provides encoding
 attribute on CaptureIO
Message-ID: <59711d2877da5_31bf3f940689bc44193d6@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: ba9a76fdb33de948113b0e1908c9a8f95fde1627
      https://github.com/pytest-dev/pytest/commit/ba9a76fdb33de948113b0e1908c9a8f95fde1627
  Author: Llandy Riveron Del Risco <llandy3d at gmail.com>
  Date:   2017-07-16 (Sun, 16 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    A changelog/2375.trivial
    M testing/test_capture.py

  Log Message:
  -----------
  Provides encoding attribute on CaptureIO

Fix #2375


  Commit: 56e6b4b501258393e5ee8921df2f2a55141b7712
      https://github.com/pytest-dev/pytest/commit/56e6b4b501258393e5ee8921df2f2a55141b7712
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    A changelog/2375.trivial
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2578 from Llandy3d/2375

Provides encoding attribute on CaptureIO


Compare: https://github.com/pytest-dev/pytest/compare/c92760dca863...56e6b4b50125

From flub at devork.be  Thu Jul 20 17:20:58 2017
From: flub at devork.be (Floris Bruynooghe)
Date: Thu, 20 Jul 2017 14:20:58 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 8a7d98: Make YIELD_TEST warning
 less spammy
Message-ID: <59711eba3b233_6a3c3f91b3187c3c6531d@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 8a7d98fed9a9bf14576066dae15c63d6320661b2
      https://github.com/pytest-dev/pytest/commit/8a7d98fed9a9bf14576066dae15c63d6320661b2
  Author: Pauli Virtanen <pav at iki.fi>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M _pytest/python.py
    A changelog/2562.trivial
    M testing/deprecated_test.py

  Log Message:
  -----------
  Make YIELD_TEST warning less spammy

Emit it only once per each generator, rather than for each generated
function. Also add information about which test caused it to be emitted.


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

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  Add docs for Item.add_report_section in the docs

Fix #2381


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

  Changed paths:
    M doc/en/_templates/globaltoc.html

  Log Message:
  -----------
  Add a link to our backwards compatibility policy to our side-bar

It is important enough that it should be easier to find


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

  Changed paths:
    M doc/en/_templates/globaltoc.html

  Log Message:
  -----------
  Merge pull request #2569 from nicoddemus/backwards-sidebar

Add a link to our backwards compatibility policy to our side-bar


  Commit: 81cec9f5e3416e151939e65174dd64163d7a7b1d
      https://github.com/pytest-dev/pytest/commit/81cec9f5e3416e151939e65174dd64163d7a7b1d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M _pytest/python.py
    A changelog/2562.trivial
    M testing/deprecated_test.py

  Log Message:
  -----------
  Merge pull request #2563 from pv/yield-warn-spam

Make YIELD_TEST warning less spammy


  Commit: 771cedd3da95849221c77e5f17f1d14b69c68c99
      https://github.com/pytest-dev/pytest/commit/771cedd3da95849221c77e5f17f1d14b69c68c99
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  Merge pull request #2567 from nicoddemus/add-report-section-docs

Add docs for Item.add_report_section in the docs


  Commit: 97fdc9a7fef504fc90756a00c1316f02a8ce0bc9
      https://github.com/pytest-dev/pytest/commit/97fdc9a7fef504fc90756a00c1316f02a8ce0bc9
  Author: Alex Hartoto <ahartoto.dev at gmail.com>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M _pytest/terminal.py
    A changelog/2571.trivial

  Log Message:
  -----------
  Ensure final collected line doesn't include artifacts

We sometimes would see the following line:
collected 1 item s

just because previous write to the terminal includes number of
characters greater than 'collected 1 item'.


  Commit: 3578f4e40522496da38321ee3132e31fb5d5b7c8
      https://github.com/pytest-dev/pytest/commit/3578f4e40522496da38321ee3132e31fb5d5b7c8
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M _pytest/terminal.py
    A changelog/2571.trivial

  Log Message:
  -----------
  Merge pull request #2571 from ahartoto/master

Ensure final collected line doesn't include artifacts of previous write


  Commit: e5169a026a0da6a23c4068157824fd7b82b2337e
      https://github.com/pytest-dev/pytest/commit/e5169a026a0da6a23c4068157824fd7b82b2337e
  Author: Martin Altmayer <altmayer at posteo.de>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

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

  Log Message:
  -----------
  #2574: --fixtures, --fixtures-per-test keep indentation of docstring


  Commit: 2a979797ef637583a22d1e794da8de79f942732a
      https://github.com/pytest-dev/pytest/commit/2a979797ef637583a22d1e794da8de79f942732a
  Author: Martin Altmayer <altmayer at posteo.de>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    A changelog/2574.bugfix

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


  Commit: cc39f41c535e9206986b9e93e6b0880f0d5cdbe4
      https://github.com/pytest-dev/pytest/commit/cc39f41c535e9206986b9e93e6b0880f0d5cdbe4
  Author: Martin Altmayer <altmayer at posteo.de>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add myself to AUTHORS as required by the PR help text.


  Commit: 796ffa51230c82899f99fc3723ea6c6620f983a6
      https://github.com/pytest-dev/pytest/commit/796ffa51230c82899f99fc3723ea6c6620f983a6
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  reformatted tox.ini


  Commit: 6af2abdb53ed5277d7c43bfec0ec646b2a35a814
      https://github.com/pytest-dev/pytest/commit/6af2abdb53ed5277d7c43bfec0ec646b2a35a814
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/fixtures.py
    M testing/code/test_source.py
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_pastebin.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M tox.ini

  Log Message:
  -----------
  Fixed flake8 warnings

W191 indentation contains tabs
W292 no newline at end of file
W293 blank line contains whitespace
W391 blank line at end of file


  Commit: 6146ac97d9f79bb9ee5f8a26cbe4298f6fe06987
      https://github.com/pytest-dev/pytest/commit/6146ac97d9f79bb9ee5f8a26cbe4298f6fe06987
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/doctest.py
    M _pytest/pytester.py
    M _pytest/python.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_monkeypatch.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Fixed E101 flake8 errors

indentation contains mixed spaces and tabs


  Commit: 8de49e8742f08f17a46c64674b34e772f685a9e4
      https://github.com/pytest-dev/pytest/commit/8de49e8742f08f17a46c64674b34e772f685a9e4
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Fixed E111 flake8 errors

indentation is not a multiple of four


  Commit: 64a4b9058c4d27b47992f3d816e7969fcdddd102
      https://github.com/pytest-dev/pytest/commit/64a4b9058c4d27b47992f3d816e7969fcdddd102
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Fixed E113 flake8 errors

unexpected indentation


  Commit: 0be97624b745581af68bb9a0e2c1d04a249c55bf
      https://github.com/pytest-dev/pytest/commit/0be97624b745581af68bb9a0e2c1d04a249c55bf
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E121 flake8 errors

continuation line under-indented for hanging indent


  Commit: 425665cf25dd9a3f20982287338ca8e770531872
      https://github.com/pytest-dev/pytest/commit/425665cf25dd9a3f20982287338ca8e770531872
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/helpconfig.py
    M testing/python/fixture.py
    M testing/test_assertrewrite.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E122 flake8 errors

continuation line missing indentation or outdented


  Commit: 4b20b9d8d9fe4a027c425c6feeb8d7ed39c86ee3
      https://github.com/pytest-dev/pytest/commit/4b20b9d8d9fe4a027c425c6feeb8d7ed39c86ee3
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M testing/python/fixture.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E123 flake8 errors

closing bracket does not match indentation of opening bracket?s line


  Commit: 051d76a63f6b220e38cc53a54efe4bf800a3dcf3
      https://github.com/pytest-dev/pytest/commit/051d76a63f6b220e38cc53a54efe4bf800a3dcf3
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/python.py
    M _pytest/skipping.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/python/metafunc.py
    M testing/test_assertrewrite.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E124 flake8 errors

closing bracket does not match visual indentation


  Commit: 92e2cd9c68d7fbbdf479ba065254dd50724a8d5c
      https://github.com/pytest-dev/pytest/commit/92e2cd9c68d7fbbdf479ba065254dd50724a8d5c
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/unittest.py
    M tox.ini

  Log Message:
  -----------
  Fixed E125 flake8 errors

continuation line with same indent as next logical line


  Commit: e855a79dd4d3976c3432f08c4b5f57333dcb3917
      https://github.com/pytest-dev/pytest/commit/e855a79dd4d3976c3432f08c4b5f57333dcb3917
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M testing/code/test_source.py
    M testing/python/approx.py
    M testing/test_assertion.py
    M testing/test_mark.py
    M testing/test_pluginmanager.py
    M testing/test_resultlog.py
    M tox.ini

  Log Message:
  -----------
  Fixed E126 flake8 errors

continuation line over-indented for hanging indent


  Commit: 57438f3efe487106a5bc779237c5e4e84bd3f4f0
      https://github.com/pytest-dev/pytest/commit/57438f3efe487106a5bc779237c5e4e84bd3f4f0
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/junitxml.py
    M _pytest/pytester.py
    M _pytest/python.py
    M testing/code/test_excinfo.py
    M testing/python/integration.py
    M testing/test_collection.py
    M testing/test_parseopt.py
    M tox.ini

  Log Message:
  -----------
  Fixed E127 flake8 errors

continuation line over-indented for visual indent


  Commit: cf97159009723be555aaa724df18f6f38a417bd2
      https://github.com/pytest-dev/pytest/commit/cf97159009723be555aaa724df18f6f38a417bd2
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/cacheprovider.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/main.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M testing/code/test_excinfo.py
    M testing/python/collect.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_parseopt.py
    M testing/test_pluginmanager.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E128 flake8 errors

continuation line under-indented for visual indent


  Commit: 1c935db571b8e5e763360d682d236a0ee5b29dda
      https://github.com/pytest-dev/pytest/commit/1c935db571b8e5e763360d682d236a0ee5b29dda
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/unittest.py
    M tox.ini

  Log Message:
  -----------
  Fixed E129 flake8 errors

visually indented line with same indent as next logical line


  Commit: df54bf0db524a9c8e5b6c2847c56d1589f533087
      https://github.com/pytest-dev/pytest/commit/df54bf0db524a9c8e5b6c2847c56d1589f533087
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M testing/code/test_excinfo.py
    M testing/python/approx.py
    M testing/test_assertion.py
    M testing/test_mark.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E131 flake8 errors

continuation line unaligned for hanging indent


  Commit: 1ff54ba205925521faf12a9d1838c8893be5dcf0
      https://github.com/pytest-dev/pytest/commit/1ff54ba205925521faf12a9d1838c8893be5dcf0
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/source.py
    M testing/python/approx.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M tox.ini

  Log Message:
  -----------
  Fixed E201 flake8 errors

whitespace after ?(?


  Commit: ba0a4d0b2e385a5bc65345a3dda81588825c0566
      https://github.com/pytest-dev/pytest/commit/ba0a4d0b2e385a5bc65345a3dda81588825c0566
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M testing/code/test_excinfo.py
    M testing/test_assertion.py
    M tox.ini

  Log Message:
  -----------
  Fixed E202 flake8 errors

whitespace before ?)?


  Commit: ebb6d0650b6722cefba0a640b1f7e5486a6b8ea6
      https://github.com/pytest-dev/pytest/commit/ebb6d0650b6722cefba0a640b1f7e5486a6b8ea6
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M testing/test_assertrewrite.py
    M tox.ini

  Log Message:
  -----------
  Fixed E203 flake8 errors

whitespace before ?:?


  Commit: f640e0cb0481b239d1e3c705d0dbadb2a618ef17
      https://github.com/pytest-dev/pytest/commit/f640e0cb0481b239d1e3c705d0dbadb2a618ef17
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/warnings.py
    M testing/code/test_excinfo.py
    M tox.ini

  Log Message:
  -----------
  Fixed E221 flake8 errors

multiple spaces before operator


  Commit: 3fabc4d21918a0927a1717e2616862400bde5440
      https://github.com/pytest-dev/pytest/commit/3fabc4d21918a0927a1717e2616862400bde5440
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M testing/test_collection.py
    M tox.ini

  Log Message:
  -----------
  Fixed E222 flake8 errors

multiple spaces after operator


  Commit: 2e8caefcab33942a754ee7ddf7697fe487a4367a
      https://github.com/pytest-dev/pytest/commit/2e8caefcab33942a754ee7ddf7697fe487a4367a
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/main.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M testing/acceptance_test.py
    M testing/code/test_source.py
    M testing/python/fixture.py
    M testing/test_assertion.py
    M testing/test_conftest.py
    M testing/test_parseopt.py
    M testing/test_pdb.py
    M testing/test_skipping.py
    M tox.ini

  Log Message:
  -----------
  Fixed E225 flake8 errors

missing whitespace around operator


  Commit: 4b22f270a3583c97034ab63a343defbee146666a
      https://github.com/pytest-dev/pytest/commit/4b22f270a3583c97034ab63a343defbee146666a
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/util.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/test_assertion.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_skipping.py
    M tox.ini

  Log Message:
  -----------
  Fixed E226 flake8 errors

missing whitespace around arithmetic operator


  Commit: 617e510b6e4fb2e95a1486c8f30dd1e7583be248
      https://github.com/pytest-dev/pytest/commit/617e510b6e4fb2e95a1486c8f30dd1e7583be248
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E231 flake8 errors

missing whitespace after ?,?, ?;?, or ?:?


  Commit: 4c24947785f9dd758038742d66376db5942cf76e
      https://github.com/pytest-dev/pytest/commit/4c24947785f9dd758038742d66376db5942cf76e
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/pytester.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M tox.ini

  Log Message:
  -----------
  Fixed E241 flake8 errors

multiple spaces after ?,?


  Commit: b226454582f8fbf083e31cc54e67c52e36176e53
      https://github.com/pytest-dev/pytest/commit/b226454582f8fbf083e31cc54e67c52e36176e53
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/source.py
    M _pytest/helpconfig.py
    M _pytest/pytester.py
    M _pytest/python.py
    M testing/test_config.py
    M testing/test_parseopt.py
    M testing/test_resultlog.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E251 flake8 errors

unexpected spaces around keyword / parameter equals


  Commit: 8f3eb6dfc7d5e9ceca694ccf2c4906bbea969faf
      https://github.com/pytest-dev/pytest/commit/8f3eb6dfc7d5e9ceca694ccf2c4906bbea969faf
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_argcomplete.py
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_pdb.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E261 flake8 errors

at least two spaces before inline comment


  Commit: eae8b41b07013744774909beeb7bcf7ef40c6961
      https://github.com/pytest-dev/pytest/commit/eae8b41b07013744774909beeb7bcf7ef40c6961
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Fixed E262 flake8 errors

inline comment should start with ?# ?


  Commit: 195a81652239142f715d8d765b83429240e19c70
      https://github.com/pytest-dev/pytest/commit/195a81652239142f715d8d765b83429240e19c70
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/main.py
    M _pytest/nose.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/fixture.py
    M testing/test_assertion.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_helpconfig.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E265 flake8 errors

block comment should start with ?# ?


  Commit: c9a081d1a3344787bb30f9526036922fd7fcad1d
      https://github.com/pytest-dev/pytest/commit/c9a081d1a3344787bb30f9526036922fd7fcad1d
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/compat.py
    M testing/test_conftest.py
    M testing/test_parseopt.py
    M tox.ini

  Log Message:
  -----------
  Fixed E271 flake8 errors

multiple spaces after keyword


  Commit: 4730c6d99d017dacd4a0788c3f2cd2d041bc4968
      https://github.com/pytest-dev/pytest/commit/4730c6d99d017dacd4a0788c3f2cd2d041bc4968
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M testing/test_config.py
    M tox.ini

  Log Message:
  -----------
  Fixed E272 flake8 errors

multiple spaces before keyword


  Commit: 9bad9b53d8a7399cb2f72f9e5cf399488a065a3d
      https://github.com/pytest-dev/pytest/commit/9bad9b53d8a7399cb2f72f9e5cf399488a065a3d
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Fixed E293 flake8 errors


  Commit: 17a21d540bb7d5e8fc2da115b29e6f5c0c966b43
      https://github.com/pytest-dev/pytest/commit/17a21d540bb7d5e8fc2da115b29e6f5c0c966b43
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_pytester.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Fixed E301 flake8 errors

expected 1 blank line, found 0


  Commit: b840622819ee9867e92b094a07b371be68a1a43b
      https://github.com/pytest-dev/pytest/commit/b840622819ee9867e92b094a07b371be68a1a43b
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_argcomplete.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/nose.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/freeze/tests/test_trivial.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_helpconfig.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_pluginmanager.py
    M testing/test_pytester.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:
  -----------
  Fixed E302 flake8 errors

expected 2 blank lines, found 0


  Commit: 7248b759e88ff282cab5bf289d4d7047ef0bfaad
      https://github.com/pytest-dev/pytest/commit/7248b759e88ff282cab5bf289d4d7047ef0bfaad
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/cacheprovider.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_mark.py
    M testing/test_pdb.py
    M testing/test_recwarn.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Fixed E303 flake8 errors

too many blank lines (3)


  Commit: 45ac863069a45d4874370c2028aa7f2aae2cff91
      https://github.com/pytest-dev/pytest/commit/45ac863069a45d4874370c2028aa7f2aae2cff91
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/source.py
    M _pytest/helpconfig.py
    M testing/test_argcomplete.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_parseopt.py
    M tox.ini

  Log Message:
  -----------
  Fixed E401 flake8 errors

multiple imports on one line


  Commit: b9e318866eab409ae6487a5790a87610d6933258
      https://github.com/pytest-dev/pytest/commit/b9e318866eab409ae6487a5790a87610d6933258
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M testing/code/test_excinfo.py
    M testing/test_assertrewrite.py
    M tox.ini

  Log Message:
  -----------
  Fixed E402 flake8 errors

module level import not at top of file


  Commit: 7d2ceb7872c653019cd07fc0a405410072860e1e
      https://github.com/pytest-dev/pytest/commit/7d2ceb7872c653019cd07fc0a405410072860e1e
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/main.py
    M testing/python/approx.py
    M testing/python/metafunc.py
    M tox.ini

  Log Message:
  -----------
  Fixed E501 flake8 errors

line too long (> 120 characters)


  Commit: 85141a419f7c8ca314ff682ad58b18f1485da993
      https://github.com/pytest-dev/pytest/commit/85141a419f7c8ca314ff682ad58b18f1485da993
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/python/metafunc.py
    M testing/test_recwarn.py
    M tox.ini

  Log Message:
  -----------
  Fixed E701 flake8 errors

multiple statements on one line (colon)


  Commit: bf259d3c93427cb09c6ff40741a62e81678ee369
      https://github.com/pytest-dev/pytest/commit/bf259d3c93427cb09c6ff40741a62e81678ee369
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Fixed E702 flake8 errors

multiple statements on one line (semicolon)


  Commit: 5ae59279f48b500625b8cffb8ca3e6f8386aa291
      https://github.com/pytest-dev/pytest/commit/5ae59279f48b500625b8cffb8ca3e6f8386aa291
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_argcomplete.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_runner.py
    M tox.ini

  Log Message:
  -----------
  Fixed E704 flake8 errors

multiple statements on one line (def)


  Commit: 15610289ac720bbdd90c5b69b6a5ef6405a2c4ab
      https://github.com/pytest-dev/pytest/commit/15610289ac720bbdd90c5b69b6a5ef6405a2c4ab
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/fixtures.py
    M testing/test_parseopt.py
    M tox.ini

  Log Message:
  -----------
  Fixed E712 flake8 errors

comparison to True should be ?if cond is True:? or ?if cond:?


  Commit: b49e8baab3759d70d4af138d76cf28321f3e7807
      https://github.com/pytest-dev/pytest/commit/b49e8baab3759d70d4af138d76cf28321f3e7807
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/_code/source.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/python.py
    M testing/test_session.py
    M tox.ini

  Log Message:
  -----------
  Fixed E731 flake8 errors

do not assign a lambda expression, use a def


  Commit: b2a5ec3b9457734488dac9dd402876739985af40
      https://github.com/pytest-dev/pytest/commit/b2a5ec3b9457734488dac9dd402876739985af40
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M AUTHORS
    A changelog/2581.trivial

  Log Message:
  -----------
  updated meta


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

  Changed paths:
    M AUTHORS
    M _pytest/python.py
    A changelog/2574.bugfix
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #2575 from MartinAltmayer/master

#2574 Options --fixtures and --fixtures-per-test keep indentation of docstrings


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

  Changed paths:
    M AUTHORS
    M _pytest/_argcomplete.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    A changelog/2562.trivial
    A changelog/2571.trivial
    A changelog/2581.trivial
    M doc/en/_templates/globaltoc.html
    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/deprecated_test.py
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_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_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 branch 'fix-flake8-issues' into features


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

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/mark.py
    M _pytest/python.py
    M _pytest/python_api.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_runner.py

  Log Message:
  -----------
  Fix flake8 in features branch


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

  Changed paths:
    R _pytest/impl

  Log Message:
  -----------
  Remove _pytest/impl file

The file apparently contains an early design document to what
has become @pytest.fixture and can be deleted


  Commit: 0e559c978fa6c551d0691fa01c8eca19a3a60d56
      https://github.com/pytest-dev/pytest/commit/0e559c978fa6c551d0691fa01c8eca19a3a60d56
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
    R _pytest/impl

  Log Message:
  -----------
  Merge pull request #2587 from nicoddemus/remove-impl-file

Remove _pytest/impl file


  Commit: 2840634c2c918fb5ff74536999a2f7de495a6ea4
      https://github.com/pytest-dev/pytest/commit/2840634c2c918fb5ff74536999a2f7de495a6ea4
  Author: Raphael Pierzina <raphael at hackebrot.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Fix typo and improve comment about cookiecutter-template


  Commit: 91b4b229aa82711c3ee4eaa8159fe5face1bbcfb
      https://github.com/pytest-dev/pytest/commit/91b4b229aa82711c3ee4eaa8159fe5face1bbcfb
  Author: Raphael Pierzina <raphael at hackebrot.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Update documentation for testing plugin code


  Commit: e73a2f7ad98e35ec6ee972d2003a417731c1eb86
      https://github.com/pytest-dev/pytest/commit/e73a2f7ad98e35ec6ee972d2003a417731c1eb86
  Author: Raphael Pierzina <raphael at hackebrot.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    A changelog/971.doc

  Log Message:
  -----------
  Add changelog entry changelog/971.doc


  Commit: d06d97a7ac6b9f6c723eadaa2fc3fd59e2f91b4f
      https://github.com/pytest-dev/pytest/commit/d06d97a7ac6b9f6c723eadaa2fc3fd59e2f91b4f
  Author: Raphael Pierzina <raphael at hackebrot.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Remove unnecessary comma from docs


  Commit: 1ac02b8a3bb41864ffe2c2aa028ef385adb559b8
      https://github.com/pytest-dev/pytest/commit/1ac02b8a3bb41864ffe2c2aa028ef385adb559b8
  Author: Raphael Pierzina <raphael at hackebrot.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Add plugin code


  Commit: 61d4345ea4fd9517ab7deb3b33c93ed1615cf7f1
      https://github.com/pytest-dev/pytest/commit/61d4345ea4fd9517ab7deb3b33c93ed1615cf7f1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    A changelog/971.doc
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #2593 from hackebrot/extend-pytester-docs-for-testing-plugin-code

Extend pytester docs for testing plugin code


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

  Changed paths:
    M AUTHORS
    M _pytest/_argcomplete.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    A changelog/2581.trivial
    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/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_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_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 branch 'fix-flake8-issues'


  Commit: 26ee2355d98cb5654fedb0272dfa1c59f3b3a070
      https://github.com/pytest-dev/pytest/commit/26ee2355d98cb5654fedb0272dfa1c59f3b3a070
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/runner.py
    A changelog/2518.feature
    A changelog/2583.feature
    M doc/en/customize.rst
    M doc/en/example/simple.rst
    M doc/en/usage.rst
    M testing/test_collection.py
    M testing/test_runner.py
    M tox.ini

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


  Commit: 24da93832138b048c9126bbd7f1ab7bf6c091edf
      https://github.com/pytest-dev/pytest/commit/24da93832138b048c9126bbd7f1ab7bf6c091edf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M testing/code/test_source.py
    M testing/python/approx.py

  Log Message:
  -----------
  Fix additional flake8 errors


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

  Changed paths:
    M AUTHORS
    R _pytest/impl
    M _pytest/python.py
    A changelog/2574.bugfix
    A changelog/971.doc
    M doc/en/writing_plugins.rst
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into fix-flake8-errors


  Commit: 9e3e58af60691f7a8ec4245a7e1e319eb86d4bcd
      https://github.com/pytest-dev/pytest/commit/9e3e58af60691f7a8ec4245a7e1e319eb86d4bcd
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/_argcomplete.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    R _pytest/impl
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    A changelog/2562.trivial
    A changelog/2571.trivial
    A changelog/2574.bugfix
    A changelog/2581.trivial
    A changelog/971.doc
    M doc/en/_templates/globaltoc.html
    M doc/en/writing_plugins.rst
    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/deprecated_test.py
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_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_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 pull request #2594 from nicoddemus/fix-flake8-errors

Merge master into features and fix flake8 errors


Compare: https://github.com/pytest-dev/pytest/compare/eb79fa7825b5...9e3e58af6069

From nicoddemus at gmail.com  Thu Jul 20 21:10:30 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 20 Jul 2017 18:10:30 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] da12c5: Fix: do not load
 hypothesis during test_logging_in...
Message-ID: <5971548610596_6fd43ff385673c305204d@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: da12c5234737b7afb2865dc0a2bd99ee138678d3
      https://github.com/pytest-dev/pytest/commit/da12c5234737b7afb2865dc0a2bd99ee138678d3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

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

  Log Message:
  -----------
  Fix: do not load hypothesis during test_logging_initialized_in_test

A recent release seem to have added a "logging" import to the top-level,
which breaks test_logging_initialized_in_test



From nicoddemus at gmail.com  Thu Jul 20 21:11:21 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 20 Jul 2017 18:11:21 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] ba9a76: Provides encoding
 attribute on CaptureIO
Message-ID: <597154b944a60_2b373fcd5f177c3c950ab@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: ba9a76fdb33de948113b0e1908c9a8f95fde1627
      https://github.com/pytest-dev/pytest/commit/ba9a76fdb33de948113b0e1908c9a8f95fde1627
  Author: Llandy Riveron Del Risco <llandy3d at gmail.com>
  Date:   2017-07-16 (Sun, 16 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    A changelog/2375.trivial
    M testing/test_capture.py

  Log Message:
  -----------
  Provides encoding attribute on CaptureIO

Fix #2375


  Commit: 56e6b4b501258393e5ee8921df2f2a55141b7712
      https://github.com/pytest-dev/pytest/commit/56e6b4b501258393e5ee8921df2f2a55141b7712
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    A changelog/2375.trivial
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2578 from Llandy3d/2375

Provides encoding attribute on CaptureIO


  Commit: da12c5234737b7afb2865dc0a2bd99ee138678d3
      https://github.com/pytest-dev/pytest/commit/da12c5234737b7afb2865dc0a2bd99ee138678d3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

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

  Log Message:
  -----------
  Fix: do not load hypothesis during test_logging_initialized_in_test

A recent release seem to have added a "logging" import to the top-level,
which breaks test_logging_initialized_in_test


  Commit: abb5d2084192e3d2bc5a68f20d9eb2284cd127cf
      https://github.com/pytest-dev/pytest/commit/abb5d2084192e3d2bc5a68f20d9eb2284cd127cf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    A changelog/2375.trivial
    M testing/test_capture.py

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


Compare: https://github.com/pytest-dev/pytest/compare/9e3e58af6069...abb5d2084192

From nicoddemus at gmail.com  Fri Jul 21 09:42:26 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 21 Jul 2017 06:42:26 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 65b2de: fix #2540,
 introduce mark.with_args
Message-ID: <597204c2882d3_780e3fd2d3c1dc44299a5@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 65b2de13a370ef743bf9be3259fc34ed43da29f1
      https://github.com/pytest-dev/pytest/commit/65b2de13a370ef743bf9be3259fc34ed43da29f1
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M _pytest/mark.py
    A changelog/2540.feature
    M testing/test_mark.py

  Log Message:
  -----------
  fix #2540, introduce mark.with_args


  Commit: 6461dc9fc69dbd916d500fad9b3fd6cf0ee3bdf7
      https://github.com/pytest-dev/pytest/commit/6461dc9fc69dbd916d500fad9b3fd6cf0ee3bdf7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M _pytest/mark.py
    A changelog/2540.feature
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #2600 from RonnyPfannschmidt/mark_explicit_params

fix #2540, introduce mark.with_args


Compare: https://github.com/pytest-dev/pytest/compare/cbceef200898...6461dc9fc69d

From nicoddemus at gmail.com  Sat Jul 22 13:20:55 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 22 Jul 2017 10:20:55 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a3b35e: Remove `raises` and
 `approx` from `python.py`.
Message-ID: <597389771c93b_58283f9501dc5c3c165bc@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: a3b35e1c4b73ee93dc3399d1a0ce8035efaf9e8b
      https://github.com/pytest-dev/pytest/commit/a3b35e1c4b73ee93dc3399d1a0ce8035efaf9e8b
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  Remove `raises` and `approx` from `python.py`.

These two classes were recently moved to `python_api.py`, but it seems
that they found their way back into the original file somehow.  This
commit removes them again to avoid out-of-date code duplication.


  Commit: 7e0553267dbe80fc389d68583a16c05d11382607
      https://github.com/pytest-dev/pytest/commit/7e0553267dbe80fc389d68583a16c05d11382607
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M _pytest/python.py

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


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

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  Merge pull request #2607 from kalekundert/remove-code-dup

Remove stale copies of raises and approx


Compare: https://github.com/pytest-dev/pytest/compare/6461dc9fc69d...b35554ca2b2f

From nicoddemus at gmail.com  Sat Jul 22 13:21:09 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 22 Jul 2017 10:21:09 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 495f73: Simplify how
 comparisons with numpy arrays work.
Message-ID: <59738985627b0_1d0e3fe7ff339c4081121@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 495f731760341130deeeb05bef504921d20b7473
      https://github.com/pytest-dev/pytest/commit/495f731760341130deeeb05bef504921d20b7473
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Simplify how comparisons with numpy arrays work.

Previously I was subverting the natural order of operations by
subclassing from `ndarray`, but it turns out that you can tell just
numpy to call your operator instead of its by setting the
`__array_priority__` attribute on your class.  This is much simpler, and
it turns out the be a little more robust, too.


  Commit: 4c45bc997149582f05a1c4853838190194a074be
      https://github.com/pytest-dev/pytest/commit/4c45bc997149582f05a1c4853838190194a074be
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Add the numpy tests back into tox.ini

I'm not sure why they were removed...


  Commit: ebc7346be4da2d56e3c6f1686f545105f70b9c89
      https://github.com/pytest-dev/pytest/commit/ebc7346be4da2d56e3c6f1686f545105f70b9c89
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Raise TypeError for types that can't be compared to arrays.


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

  Changed paths:
    M _pytest/python_api.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2606 from kalekundert/simplify-numpy

Make approx more compatible with numpy


Compare: https://github.com/pytest-dev/pytest/compare/b35554ca2b2f...1b732fe36129

From nicoddemus at gmail.com  Mon Jul 24 06:44:20 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 24 Jul 2017 03:44:20 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 0aa248: Fix travis build after
 change from "precise" to "t...
Message-ID: <5975cf8422612_34323fe3a0f43c24759fe@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0aa2480e6a0659b4f714fccf0d4784717903bfba
      https://github.com/pytest-dev/pytest/commit/0aa2480e6a0659b4f714fccf0d4784717903bfba
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Fix travis build after change from "precise" to "trusty"

Travis recently has changed its dist from "precise" to "trusty", so
some Python versions are no longer installed by default



From nicoddemus at gmail.com  Mon Jul 24 11:37:23 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 24 Jul 2017 08:37:23 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 43544a: Early import colorama
 so that it get's the correct...
Message-ID: <597614338fc31_40793f98707e1c2c69373@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 43544a431ca958b411d6b84c7093f03e48461349
      https://github.com/pytest-dev/pytest/commit/43544a431ca958b411d6b84c7093f03e48461349
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  Early import colorama so that it get's the correct terminal


  Commit: df12500661e1408d247ff95193ad5a6dc7aaedbb
      https://github.com/pytest-dev/pytest/commit/df12500661e1408d247ff95193ad5a6dc7aaedbb
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    A changelog/2611.bugfix

  Log Message:
  -----------
  Create 2611.bugfix


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

  Changed paths:
    A changelog/2510.bugfix
    R changelog/2611.bugfix

  Log Message:
  -----------
  Update changelog file for #2510


  Commit: d0ecfdf00f951714058b629b21719cac2ab53c75
      https://github.com/pytest-dev/pytest/commit/d0ecfdf00f951714058b629b21719cac2ab53c75
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  Delete trailing whitespace


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

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

  Log Message:
  -----------
  Merge pull request #2611 from segevfiner/patch-1

Early import colorama so that it get's the correct terminal


Compare: https://github.com/pytest-dev/pytest/compare/81ad185f0d0b...e44284c12574

From nicoddemus at gmail.com  Mon Jul 24 15:29:04 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 24 Jul 2017 12:29:04 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] af2c15: Report lineno from
 doctest
Message-ID: <59764a806a987_4db63fcc406efc3479532@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: af2c15332422421ac280f90ac9a7ab470c44ed7b
      https://github.com/pytest-dev/pytest/commit/af2c15332422421ac280f90ac9a7ab470c44ed7b
  Author: Nguy?n H?ng Qu?n <ng.hong.quan at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  Report lineno from doctest

This is to fix pytest-sugar#122 issue.


  Commit: cdaa720bc4cc8cd5d5e0af178e30f259dcb21baf
      https://github.com/pytest-dev/pytest/commit/cdaa720bc4cc8cd5d5e0af178e30f259dcb21baf
  Author: Nguy?n H?ng Qu?n <ng.hong.quan at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M .travis.yml
    M CONTRIBUTING.rst
    M _pytest/config.py
    M doc/en/cache.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/example/index.rst
    M doc/en/nose.rst
    A doc/en/pythonpath.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst

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


  Commit: dea671f8ba3a76283735e8414a11595bc755872d
      https://github.com/pytest-dev/pytest/commit/dea671f8ba3a76283735e8414a11595bc755872d
  Author: Nguy?n H?ng Qu?n <ng.hong.quan at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    A changelog/2610.bugfix

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


  Commit: d40d77432c71d8eaa6bbc1dfb908fbcd4fe2bbb1
      https://github.com/pytest-dev/pytest/commit/d40d77432c71d8eaa6bbc1dfb908fbcd4fe2bbb1
  Author: Nguy?n H?ng Qu?n <ng.hong.quan at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M testing/test_doctest.py

  Log Message:
  -----------
  Add test case for DoctestItem.reportinfo()


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

  Changed paths:
    M _pytest/doctest.py
    A changelog/2610.bugfix
    M testing/test_doctest.py

  Log Message:
  -----------
  Merge pull request #2610 from AgriConnect/doctest-lineno

Report lineno from doctest


Compare: https://github.com/pytest-dev/pytest/compare/e44284c12574...70d9f8638f95

From nicoddemus at gmail.com  Tue Jul 25 10:19:27 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 25 Jul 2017 07:19:27 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 72531f: Improve error message
 for CollectError with skip/s...
Message-ID: <5977536fabf12_f5d3fe1536c5c2c879f5@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 72531f30c0d8834230f2007fe5b563c9fe5af04b
      https://github.com/pytest-dev/pytest/commit/72531f30c0d8834230f2007fe5b563c9fe5af04b
  Author: Daniel Hahler <git at thequod.de>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

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

  Log Message:
  -----------
  Improve error message for CollectError with skip/skipif


  Commit: 71947cb4f057155679209c7e72449ce0f18ab6dd
      https://github.com/pytest-dev/pytest/commit/71947cb4f057155679209c7e72449ce0f18ab6dd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

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

  Log Message:
  -----------
  Merge pull request #2546 from blueyed/better-skip-not-allowed-error

[RFC] Improve error message for CollectError with skip/skipif


Compare: https://github.com/pytest-dev/pytest/compare/70d9f8638f95...71947cb4f057

From nicoddemus at gmail.com  Tue Jul 25 12:35:16 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 25 Jul 2017 09:35:16 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 869eed: Fix lineno offset in
 show_skipped
Message-ID: <5977734468d58_30ed3fe44e167c28575d3@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 869eed9898df0d06c7d9be916d4224141c7dd3fe
      https://github.com/pytest-dev/pytest/commit/869eed9898df0d06c7d9be916d4224141c7dd3fe
  Author: Daniel Hahler <git at thequod.de>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M _pytest/skipping.py
    A changelog/2548.bugfix
    M testing/test_skipping.py

  Log Message:
  -----------
  Fix lineno offset in show_skipped

The line number is 0-based here, so add 1.


  Commit: 595ecd23fdf5826ae415b86047384a67f19b5ab9
      https://github.com/pytest-dev/pytest/commit/595ecd23fdf5826ae415b86047384a67f19b5ab9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M _pytest/skipping.py
    A changelog/2548.bugfix
    M testing/test_skipping.py

  Log Message:
  -----------
  Merge pull request #2548 from blueyed/skip-fix-lineno

Fix lineno offset in show_skipped


Compare: https://github.com/pytest-dev/pytest/compare/71947cb4f057...595ecd23fdf5

From nicoddemus at gmail.com  Tue Jul 25 12:37:29 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 25 Jul 2017 09:37:29 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 1a42e2: Improve changelog
 wording to be more user-oriented
Message-ID: <597773c9796de_20df3f9043971c34400d4@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 1a42e2658648dd967dd76958e2da817fd30850d6
      https://github.com/pytest-dev/pytest/commit/1a42e2658648dd967dd76958e2da817fd30850d6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M changelog/2548.bugfix

  Log Message:
  -----------
  Improve changelog wording to be more user-oriented



From nicoddemus at gmail.com  Tue Jul 25 12:40:47 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 25 Jul 2017 09:40:47 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 949a14: Revisit CONTRIBUTING.rst
Message-ID: <5977748fde039_201fa3fad28e4bc4460582@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 949a1406f08495e0365e5ce91ea14ab104a34866
      https://github.com/pytest-dev/pytest/commit/949a1406f08495e0365e5ce91ea14ab104a34866
  Author: Daniel Hahler <git at thequod.de>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Revisit CONTRIBUTING.rst


  Commit: 79097e84e2f44f4e8a9a94d7570c68a4a15a7f44
      https://github.com/pytest-dev/pytest/commit/79097e84e2f44f4e8a9a94d7570c68a4a15a7f44
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Merge pull request #2615 from blueyed/revisit_contributing.rst

Revisit CONTRIBUTING.rst


Compare: https://github.com/pytest-dev/pytest/compare/1a42e2658648...79097e84e2f4

From nicoddemus at gmail.com  Wed Jul 26 09:37:50 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 26 Jul 2017 06:37:50 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 50764d: Avoid interactive pdb
 when pytest tests itself - f...
Message-ID: <59789b2e8d10e_5e2c3f8440e6dc3874762@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 50764d9ebbea4cd15717e49ba4ef4f467254a2be
      https://github.com/pytest-dev/pytest/commit/50764d9ebbea4cd15717e49ba4ef4f467254a2be
  Author: Andras Tim <andras.tim at gmail.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M _pytest/pytester.py
    A changelog/2023.bugfix

  Log Message:
  -----------
  Avoid interactive pdb when pytest tests itself - fix #2023

The debugging.py calls post_mortem() on error and pdb will drops an
interactive debugger when the stdin is a readable fd.


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

  Changed paths:
    M _pytest/pytester.py
    A changelog/2023.bugfix

  Log Message:
  -----------
  Merge pull request #2580 from andras-tim/fix-runpytest-subprocess

Avoid interactive pdb when pytest tests itself - fix #2023


Compare: https://github.com/pytest-dev/pytest/compare/79097e84e2f4...2c2cf81d0a86

From nicoddemus at gmail.com  Wed Jul 26 09:39:12 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 26 Jul 2017 06:39:12 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 0603d1: capture: ensure name of
 EncodedFile being a string
Message-ID: <59789b8033b2f_1b3f3f9339297c309641b@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0603d1d500c14a67715e486568b50f15b2086616
      https://github.com/pytest-dev/pytest/commit/0603d1d500c14a67715e486568b50f15b2086616
  Author: Daniel Hahler <git at thequod.de>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

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

  Log Message:
  -----------
  capture: ensure name of EncodedFile being a string

Fixes https://github.com/pytest-dev/pytest/issues/2555.


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

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

  Log Message:
  -----------
  Merge pull request #2557 from blueyed/EncodedFile-name

capture: ensure name of EncodedFile being a string


Compare: https://github.com/pytest-dev/pytest/compare/2c2cf81d0a86...dd294aafb3ad

From nicoddemus at gmail.com  Wed Jul 26 15:00:02 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 26 Jul 2017 12:00:02 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 10ded3: Show multiple issue
 links in CHANGELOG entries
Message-ID: <5978e6b2e61d6_30113fcfaca87c3848249@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 10ded399d8246ef8383d5cac27f58fe9b0c65fb1
      https://github.com/pytest-dev/pytest/commit/10ded399d8246ef8383d5cac27f58fe9b0c65fb1
  Author: Mihai Capot? <mihai at mihaic.ro>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M AUTHORS
    A changelog/2620.trivial
    M changelog/_template.rst

  Log Message:
  -----------
  Show multiple issue links in CHANGELOG entries

Restores the functionality removed in PR #2488.


  Commit: 1a9bc141a50901e2d01bfc3df447ad592d350225
      https://github.com/pytest-dev/pytest/commit/1a9bc141a50901e2d01bfc3df447ad592d350225
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M AUTHORS
    A changelog/2620.trivial
    M changelog/_template.rst

  Log Message:
  -----------
  Merge pull request #2620 from mihaic/multiple-issues-in-changelog

Show multiple issue links in CHANGELOG entries


Compare: https://github.com/pytest-dev/pytest/compare/dd294aafb3ad...1a9bc141a509

From nicoddemus at gmail.com  Fri Jul 28 13:48:25 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 28 Jul 2017 10:48:25 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 75e6f7: Use new hook to report
 accurate tests skipped in -...
Message-ID: <597b78e9caa3e_13813fac0fd89c30800ea@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 75e6f7717c12d9fe50a2b0cd0eed86ea0bc4797d
      https://github.com/pytest-dev/pytest/commit/75e6f7717c12d9fe50a2b0cd0eed86ea0bc4797d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M _pytest/cacheprovider.py
    M testing/test_cache.py

  Log Message:
  -----------
  Use new hook to report accurate tests skipped in --lf and --ff


  Commit: 5acb64be900e499087bdff8d2e0a37683617b65f
      https://github.com/pytest-dev/pytest/commit/5acb64be900e499087bdff8d2e0a37683617b65f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M _pytest/hookspec.py

  Log Message:
  -----------
  Add versionadded tag to pytest_report_collectionfinish hook


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

  Changed paths:
    M _pytest/hookspec.py

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


  Commit: 768edde899fe3629a69d55289f82bb0d95635c06
      https://github.com/pytest-dev/pytest/commit/768edde899fe3629a69d55289f82bb0d95635c06
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M _pytest/cacheprovider.py
    M _pytest/hookspec.py
    M testing/test_cache.py

  Log Message:
  -----------
  Merge pull request #2624 from nicoddemus/lf-report-after-collection

Fix --last-failed reported items in terminal


Compare: https://github.com/pytest-dev/pytest/compare/17121960b45c...768edde899fe

From nicoddemus at gmail.com  Sat Jul 29 11:22:07 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 29 Jul 2017 08:22:07 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f770f1: Replace deprecated
 "config.option.<name>" usages f...
Message-ID: <597ca81f3119e_22cff3ff30ec27c34563a9@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

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

  Changed paths:
    M doc/en/example/attic.rst
    M doc/en/example/parametrize.rst
    M doc/en/parametrize.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Replace deprecated "config.option.<name>" usages from docs


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

  Changed paths:
    M doc/en/contact.rst

  Log Message:
  -----------
  Fixes in "contact" doc


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

  Changed paths:
    M doc/en/cache.rst
    M doc/en/contents.rst
    M doc/en/example/markers.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    A doc/en/historical-notes.rst
    M doc/en/parametrize.rst
    R doc/en/setup.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Move historical notes to their own doc

Fix #2512


  Commit: 7082320f3f69e0fac9f2f80f0af6a1ac463411af
      https://github.com/pytest-dev/pytest/commit/7082320f3f69e0fac9f2f80f0af6a1ac463411af
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M doc/en/example/markers.rst
    M doc/en/unittest.rst

  Log Message:
  -----------
  Apply modifications requested in review


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

  Changed paths:
    M doc/en/unittest.rst

  Log Message:
  -----------
  Rephrase the bit about unittest migration to pytest


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

  Changed paths:
    M doc/en/cache.rst
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/example/attic.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    A doc/en/historical-notes.rst
    M doc/en/parametrize.rst
    R doc/en/setup.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #2625 from nicoddemus/historical-notes

Historical notes in the docs


Compare: https://github.com/pytest-dev/pytest/compare/1a9bc141a509...5e0e038fec61

From nicoddemus at gmail.com  Sun Jul 30 16:17:42 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 30 Jul 2017 13:17:42 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b39f95: Add test of issue #920
Message-ID: <597e3ee61cd27_18173fb358ba3c2c3272d@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: b39f957b88b6f44252c0ad2eb289b92fd7937f8e
      https://github.com/pytest-dev/pytest/commit/b39f957b88b6f44252c0ad2eb289b92fd7937f8e
  Author: Lawrence Mitchell <lawrence.mitchell at imperial.ac.uk>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Add test of issue #920


  Commit: a546a612bde02292488b6f9b3185a950d61fbe94
      https://github.com/pytest-dev/pytest/commit/a546a612bde02292488b6f9b3185a950d61fbe94
  Author: Lawrence Mitchell <lawrence.mitchell at imperial.ac.uk>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/fixtures.py
    A changelog/920.bugfix
    M testing/python/fixture.py
    M tox.ini

  Log Message:
  -----------
  Fix nondeterminism in fixture collection order

fixtures.reorder_items is non-deterministic because it reorders based
on iteration over an (unordered) set.  Change the code to use an
OrderedDict instead so that we get deterministic behaviour, fixes #920.


  Commit: f8bd693f8348dbf5b0536b5529cc5a4884bf06b7
      https://github.com/pytest-dev/pytest/commit/f8bd693f8348dbf5b0536b5529cc5a4884bf06b7
  Author: Lawrence Mitchell <lawrence.mitchell at imperial.ac.uk>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M setup.py
    M tox.ini

  Log Message:
  -----------
  Add ordereddict to install_requires for py26


  Commit: f047e078e2d1c8aba19015e151c1e78c5cbc1cff
      https://github.com/pytest-dev/pytest/commit/f047e078e2d1c8aba19015e151c1e78c5cbc1cff
  Author: Lawrence Mitchell <lawrence.mitchell at imperial.ac.uk>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M changelog/920.bugfix
    M doc/en/getting-started.rst

  Log Message:
  -----------
  Mention new (py26) ordereddict dependency in changelog and docs


  Commit: 4cd87273791d1bfc1b39f1a181e623f80a7c1cfa
      https://github.com/pytest-dev/pytest/commit/4cd87273791d1bfc1b39f1a181e623f80a7c1cfa
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/fixtures.py
    A changelog/920.bugfix
    M doc/en/getting-started.rst
    M setup.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #2617 from wence-/fix/nondeterministic-fixtures

Fix nondeterminism in fixture collection order


Compare: https://github.com/pytest-dev/pytest/compare/768edde899fe...4cd87273791d

From nicoddemus at gmail.com  Sun Jul 30 16:22:42 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 30 Jul 2017 13:22:42 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 2e61f7: Support PEP-415's
 Exception.__suppress_context__
Message-ID: <597e40122dc37_15d63fb70ce19c24470ce@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 2e61f702c09899bf375dba0c59eec3760fdd8990
      https://github.com/pytest-dev/pytest/commit/2e61f702c09899bf375dba0c59eec3760fdd8990
  Author: Jordan Moldow <jmoldow at box.com>
  Date:   2017-07-29 (Sat, 29 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/_code/code.py
    A changelog/2631.feature
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Support PEP-415's Exception.__suppress_context__

PEP-415 states that `exception.__context__` should be suppressed
in traceback outputs, if `exception.__suppress_context__` is
`True`.

Now if a ``raise exception from None`` is caught by pytest,
pytest will no longer chain the context in the test report.

The algorithm in `FormattedExcinfo` now better matches the one
in `traceback.TracebackException`.

`Exception.__suppress_context__` is available in all of the
versions of Python 3 that are supported by pytest.

Fixes #2631.


  Commit: 713f7636e1d18cf5f817906ae1505cc9633c571b
      https://github.com/pytest-dev/pytest/commit/713f7636e1d18cf5f817906ae1505cc9633c571b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/_code/code.py
    A changelog/2631.feature
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Merge pull request #2632 from jmoldow/pep_0415_suppress_exception_context

Support PEP-415's Exception.__suppress_context__


Compare: https://github.com/pytest-dev/pytest/compare/4cd87273791d...713f7636e1d1

From nicoddemus at gmail.com  Sun Jul 30 16:38:44 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 30 Jul 2017 13:38:44 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 06a493: make Test Outcomes
 inherit from BaseException inst...
Message-ID: <597e43d4f04f_3fa13fe3c6223c4411417b@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 06a49338b2b1be8daed89f779439459a2cb4cbc7
      https://github.com/pytest-dev/pytest/commit/06a49338b2b1be8daed89f779439459a2cb4cbc7
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/main.py
    A _pytest/outcomes.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/unittest.py
    A changelog/580.feature
    M doc/en/builtin.rst
    M pytest.py
    M testing/test_runner.py

  Log Message:
  -----------
  make Test Outcomes inherit from BaseException instead of exception

fixes #580


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

  Changed paths:
    M _pytest/outcomes.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M testing/test_runner.py

  Log Message:
  -----------
  fix linting issues


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

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/main.py
    A _pytest/outcomes.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/unittest.py
    A changelog/580.feature
    M doc/en/builtin.rst
    M pytest.py
    M testing/test_runner.py

  Log Message:
  -----------
  Merge pull request #2490 from RonnyPfannschmidt/fix-580

Test Outcomes as BaseException - fix #580


Compare: https://github.com/pytest-dev/pytest/compare/713f7636e1d1...e1aed8cb1787

From nicoddemus at gmail.com  Sun Jul 30 16:48:34 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 30 Jul 2017 13:48:34 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d3ab1b: Add user documentation
Message-ID: <597e462289ade_6eb63ffdc48b1c381109a3@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: d3ab1b9df4b8854b75c5fe88157aae2b5c572357
      https://github.com/pytest-dev/pytest/commit/d3ab1b9df4b8854b75c5fe88157aae2b5c572357
  Author: Maik Figura <maiksensi at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

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

The new doc section explains why we raise a `NotImplementedError`.


  Commit: f0936d42fbb13eb3db4ee4bdf35e981bb7da2a4c
      https://github.com/pytest-dev/pytest/commit/f0936d42fbb13eb3db4ee4bdf35e981bb7da2a4c
  Author: Maik Figura <maiksensi at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Fix linter errors


  Commit: 1851f36beba36a08eb6946a6a187bfc8a0ebcbd4
      https://github.com/pytest-dev/pytest/commit/1851f36beba36a08eb6946a6a187bfc8a0ebcbd4
  Author: Maik Figura <maiksensi at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M AUTHORS
    A changelog/2003.feature

  Log Message:
  -----------
  Add PR requirements changelog and authors


  Commit: 57a232fc5a275f7a0ae813713afba436c658262a
      https://github.com/pytest-dev/pytest/commit/57a232fc5a275f7a0ae813713afba436c658262a
  Author: Maik Figura <maiksensi at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Remove out of scope change


  Commit: 80f4699572c0ccd304f30a9451d1728066b0db27
      https://github.com/pytest-dev/pytest/commit/80f4699572c0ccd304f30a9451d1728066b0db27
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M _pytest/python_api.py
    R changelog/2003.feature
    A changelog/2003.removal
    M testing/python/approx.py

  Log Message:
  -----------
  approx raises TypeError in Python 2 for comparison operators other than != and ==


  Commit: 763c580a2a578eeefe72f72206b09b6d01b69350
      https://github.com/pytest-dev/pytest/commit/763c580a2a578eeefe72f72206b09b6d01b69350
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/python_api.py
    A changelog/2003.removal
    M testing/python/approx.py

  Log Message:
  -----------
  Merge pull request #2576 from maiksensi/feat/raise-not-implemented-for-lt-gt-in-approx

#2003 Change behavior of `approx.py` to only support `__eq__` comparison


Compare: https://github.com/pytest-dev/pytest/compare/e1aed8cb1787...763c580a2a57

From nicoddemus at gmail.com  Sun Jul 30 17:34:08 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 30 Jul 2017 14:34:08 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f770f1: Replace deprecated
 "config.option.<name>" usages f...
Message-ID: <597e50d08b864_1a833fd3cb8ebc30519e2@hookshot-fe6-cp1-prd.iad.github.net.mail>

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

  Changed paths:
    M doc/en/example/attic.rst
    M doc/en/example/parametrize.rst
    M doc/en/parametrize.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Replace deprecated "config.option.<name>" usages from docs


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

  Changed paths:
    M doc/en/contact.rst

  Log Message:
  -----------
  Fixes in "contact" doc


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

  Changed paths:
    M doc/en/cache.rst
    M doc/en/contents.rst
    M doc/en/example/markers.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    A doc/en/historical-notes.rst
    M doc/en/parametrize.rst
    R doc/en/setup.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Move historical notes to their own doc

Fix #2512


  Commit: 7082320f3f69e0fac9f2f80f0af6a1ac463411af
      https://github.com/pytest-dev/pytest/commit/7082320f3f69e0fac9f2f80f0af6a1ac463411af
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M doc/en/example/markers.rst
    M doc/en/unittest.rst

  Log Message:
  -----------
  Apply modifications requested in review


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

  Changed paths:
    M doc/en/unittest.rst

  Log Message:
  -----------
  Rephrase the bit about unittest migration to pytest


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

  Changed paths:
    M doc/en/cache.rst
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/example/attic.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    A doc/en/historical-notes.rst
    M doc/en/parametrize.rst
    R doc/en/setup.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #2625 from nicoddemus/historical-notes

Historical notes in the docs


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

  Changed paths:
    M doc/en/cache.rst
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/example/attic.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    A doc/en/historical-notes.rst
    M doc/en/parametrize.rst
    R doc/en/setup.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst

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


Compare: https://github.com/pytest-dev/pytest/compare/763c580a2a57...f1467f8f0385