From nicoddemus at gmail.com  Thu May  3 11:20:45 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 03 May 2018 08:20:45 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] c258fe: --pdb treats
 KeyboardInterrupt as exception
Message-ID: <5aeb28cd3e20a_11222ac3ae045c083908c@hookshot-fe-da92815.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: c258fe1459638437ba4d2ecd77862091369183e6
      https://github.com/pytest-dev/pytest/commit/c258fe1459638437ba4d2ecd77862091369183e6
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-05-02 (Wed, 02 May 2018)

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

  Log Message:
  -----------
  --pdb treats KeyboardInterrupt as exception


  Commit: 1a880be85b4aaa42f38c9a4922a9ad8338dd7552
      https://github.com/pytest-dev/pytest/commit/1a880be85b4aaa42f38c9a4922a9ad8338dd7552
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-01 (Tue, 01 May 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Remove unused import to fix linting


  Commit: b03b387861f6630846995aa59f4b5ef7f4adb526
      https://github.com/pytest-dev/pytest/commit/b03b387861f6630846995aa59f4b5ef7f4adb526
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

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

  Log Message:
  -----------
  Merge pull request #3436 from brianmaissy/feature/enter_pdb_on_keyboard_interrupt

--pdb treats KeyboardInterrupt as exception


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

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

From nicoddemus at gmail.com  Thu May  3 18:27:10 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 03 May 2018 15:27:10 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 63ef46: fix #3441 - use
 iter-marks to populate markexpr na...
Message-ID: <5aeb8cbeed9b_263282b262d545c1c5734b@hookshot-fe-dfcc362.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 63ef46dd91d8e320a0e1db226da0b32912e0c8c5
      https://github.com/pytest-dev/pytest/commit/63ef46dd91d8e320a0e1db226da0b32912e0c8c5
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M _pytest/mark/legacy.py
    A changelog/3441.bugfix

  Log Message:
  -----------
  fix #3441 - use iter-marks to populate markexpr namespace


  Commit: a5cf55dd4a5237ad4b5d6e93d9822558bbc8cd28
      https://github.com/pytest-dev/pytest/commit/a5cf55dd4a5237ad4b5d6e93d9822558bbc8cd28
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M testing/test_mark.py

  Log Message:
  -----------
  fix test_mark_option_custom - it used the legacy keyword storage for addign markers


  Commit: e6a86e0f4c2c5b1b600e86eda8d1ba545142ac72
      https://github.com/pytest-dev/pytest/commit/e6a86e0f4c2c5b1b600e86eda8d1ba545142ac72
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M testing/test_mark.py

  Log Message:
  -----------
  add tests for #3441


  Commit: 35f53a7353418f63705349aee92b229723646f9c
      https://github.com/pytest-dev/pytest/commit/35f53a7353418f63705349aee92b229723646f9c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

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

  Log Message:
  -----------
  Merge pull request #3442 from RonnyPfannschmidt/fix-3441-markexpr-markstorage

Fix #3441 let mark expressions be populated from the modern marker storage


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

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

From nicoddemus at gmail.com  Mon May 14 08:56:39 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 14 May 2018 05:56:39 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 36614b: Fix formatting in
 CHANGELOG entry
Message-ID: <5af987871b297_2702ad70e40dc147913d@hookshot-fe-b0febf1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 36614b0a3d1846d36ba3840ef25eb986a5b551c4
      https://github.com/pytest-dev/pytest/commit/36614b0a3d1846d36ba3840ef25eb986a5b551c4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-14 (Mon, 14 May 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix formatting in CHANGELOG entry



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

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

From nicoddemus at gmail.com  Tue May 15 06:59:59 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 15 May 2018 03:59:59 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] aa51fc: Spelling and grammar
 fixes
Message-ID: <5afabdaf56592_60e42acb98f79c1477010@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: aa51fcb2b665233069962ecf67f9603fba7276ec
      https://github.com/pytest-dev/pytest/commit/aa51fcb2b665233069962ecf67f9603fba7276ec
  Author: Ville Skytt? <ville.skytta at iki.fi>
  Date:   2018-05-13 (Sun, 13 May 2018)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/_code/source.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark/structures.py
    M _pytest/outcomes.py
    M _pytest/python.py
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/example/parametrize.rst
    M doc/en/goodpractices.rst
    M doc/en/reference.rst
    M testing/code/test_excinfo.py
    M testing/python/fixture.py
    M testing/test_assertion.py
    M testing/test_capture.py
    M testing/test_conftest.py
    M testing/test_nose.py

  Log Message:
  -----------
  Spelling and grammar fixes


  Commit: 01d2d81d1f07607aaf26de566a9bd1f1c4cee6a9
      https://github.com/pytest-dev/pytest/commit/01d2d81d1f07607aaf26de566a9bd1f1c4cee6a9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/_code/source.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark/structures.py
    M _pytest/outcomes.py
    M _pytest/python.py
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/example/parametrize.rst
    M doc/en/goodpractices.rst
    M doc/en/reference.rst
    M testing/code/test_excinfo.py
    M testing/python/fixture.py
    M testing/test_assertion.py
    M testing/test_capture.py
    M testing/test_conftest.py
    M testing/test_nose.py

  Log Message:
  -----------
  Merge pull request #3468 from scop/spelling

Spelling and grammar fixes


Compare: https://github.com/pytest-dev/pytest/compare/36614b0a3d18...01d2d81d1f07
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

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

From nicoddemus at gmail.com  Tue May 15 07:00:29 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 15 May 2018 04:00:29 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b4370c: #dropthedot
Message-ID: <5afabdcdd90be_78c02aec6e051c1827824@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: b4370c08b948d217f9719f56690f6438785c388e
      https://github.com/pytest-dev/pytest/commit/b4370c08b948d217f9719f56690f6438785c388e
  Author: Ville Skytt? <ville.skytta at iki.fi>
  Date:   2018-05-13 (Sun, 13 May 2018)

  Changed paths:
    M _pytest/freeze_support.py
    M _pytest/pytester.py
    M doc/en/cache.rst
    M doc/en/example/pythoncollection.rst

  Log Message:
  -----------
  #dropthedot


  Commit: a4425cb4afefbb0d1bbc353dce62dc45f4ba9c5a
      https://github.com/pytest-dev/pytest/commit/a4425cb4afefbb0d1bbc353dce62dc45f4ba9c5a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M _pytest/freeze_support.py
    M _pytest/pytester.py
    M doc/en/cache.rst
    M doc/en/example/pythoncollection.rst

  Log Message:
  -----------
  Merge pull request #3469 from scop/dropthedot

#dropthedot


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

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

From nicoddemus at gmail.com  Wed May 16 16:53:27 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 16 May 2018 13:53:27 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a59f67: change doc copyright
 year to range and auto update...
Message-ID: <5afc9a47435ee_21bb2b0021d09c145412@hookshot-fe-cace476.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: a59f677d934830053ebf608db31a87e89c0f0ed1
      https://github.com/pytest-dev/pytest/commit/a59f677d934830053ebf608db31a87e89c0f0ed1
  Author: aviral1701 <aviral1701 at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M doc/en/conf.py

  Log Message:
  -----------
  change doc copyright year to range and auto update year


  Commit: f14e097635411d80eccb77e50d78c58a11a97f17
      https://github.com/pytest-dev/pytest/commit/f14e097635411d80eccb77e50d78c58a11a97f17
  Author: aviral1701 <aviral1701 at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M AUTHORS
    A changelog/3303.doc.rst

  Log Message:
  -----------
  added changelog and added my name to the authors


  Commit: f68bab06b44cd4c457663a479c45771ab0e0c01b
      https://github.com/pytest-dev/pytest/commit/f68bab06b44cd4c457663a479c45771ab0e0c01b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M changelog/3303.doc.rst

  Log Message:
  -----------
  Reword the changelog


  Commit: 5edad01d4e257d1916f42d83ce68de8b0bac815e
      https://github.com/pytest-dev/pytest/commit/5edad01d4e257d1916f42d83ce68de8b0bac815e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

  Changed paths:
    M AUTHORS
    A changelog/3303.doc.rst
    M doc/en/conf.py

  Log Message:
  -----------
  Merge pull request #3476 from avirlrma/master

change doc copyright year to range and auto update year


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

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

From nicoddemus at gmail.com  Thu May 17 09:15:49 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 17 May 2018 06:15:49 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 11fb38: Fix link to skipif
 tutorial in ref docs
Message-ID: <5afd80857d138_15f42ad8ba841c10490fa@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 11fb384efb2f0504feccc7bdcf6e4c7458b26217
      https://github.com/pytest-dev/pytest/commit/11fb384efb2f0504feccc7bdcf6e4c7458b26217
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Fix link to skipif tutorial in ref docs



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

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

From nicoddemus at gmail.com  Sun May 20 14:51:04 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 20 May 2018 11:51:04 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f0b855: fix typo
Message-ID: <5b01c398cf5ee_57422ad9f5153c14829a3@hookshot-fe-265448d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: f0b855369c5d5163e64f88e8ea3172cfa38de5c8
      https://github.com/pytest-dev/pytest/commit/f0b855369c5d5163e64f88e8ea3172cfa38de5c8
  Author: Tim Hughes <timhughes at users.noreply.github.com>
  Date:   2018-05-20 (Sun, 20 May 2018)

  Changed paths:
    M doc/en/logging.rst

  Log Message:
  -----------
  fix typo


  Commit: 8e17e322535b36d01cf6ba1199f8a812858062c1
      https://github.com/pytest-dev/pytest/commit/8e17e322535b36d01cf6ba1199f8a812858062c1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-20 (Sun, 20 May 2018)

  Changed paths:
    M doc/en/logging.rst

  Log Message:
  -----------
  Merge pull request #3492 from timhughes/patch-1

fix typo in docs


Compare: https://github.com/pytest-dev/pytest/compare/45faaeca7ae9...8e17e322535b
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

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

From nicoddemus at gmail.com  Mon May 21 12:24:42 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 21 May 2018 09:24:42 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 491413: introduce name
 filtering for marker iteration agai...
Message-ID: <5b02f2ca717dd_4d4b2ad2e7dadc041836c@hookshot-fe-cace476.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 4914135fdf45bc4fa0469f2a9d3161c5830e84fd
      https://github.com/pytest-dev/pytest/commit/4914135fdf45bc4fa0469f2a9d3161c5830e84fd
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-11 (Fri, 11 May 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/mark/evaluate.py
    M _pytest/nodes.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/warnings.py
    A changelog/3446.feature
    A changelog/3459.feature
    M doc/en/example/markers.rst
    M doc/en/usage.rst
    M testing/test_mark.py

  Log Message:
  -----------
  introduce name filtering for marker iteration again


  Commit: 1b2f4f44839da59ba7e34aa688ab2b24c1b6a1f5
      https://github.com/pytest-dev/pytest/commit/1b2f4f44839da59ba7e34aa688ab2b24c1b6a1f5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M changelog/3446.feature

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


  Commit: 718ba83600370f8a176c805ae4ad665d7d61fdf7
      https://github.com/pytest-dev/pytest/commit/718ba83600370f8a176c805ae4ad665d7d61fdf7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M changelog/3459.feature

  Log Message:
  -----------
  Small adjustment to the CHANGELOG


  Commit: 2cd159e8c54e98cf431d0528eceb6d404c4a0d19
      https://github.com/pytest-dev/pytest/commit/2cd159e8c54e98cf431d0528eceb6d404c4a0d19
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M _pytest/deprecated.py
    M doc/en/mark.rst

  Log Message:
  -----------
  Add section on how to update marks and add ref to the deprecation notice


  Commit: afe4800daf14e2da25b08a4a21ea5df0e5a95020
      https://github.com/pytest-dev/pytest/commit/afe4800daf14e2da25b08a4a21ea5df0e5a95020
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M _pytest/nodes.py
    M doc/en/mark.rst

  Log Message:
  -----------
  Fix deprecation notice in Node.get_marker


  Commit: bb626fe8a780706698b700feb410036f4d5b88bb
      https://github.com/pytest-dev/pytest/commit/bb626fe8a780706698b700feb410036f4d5b88bb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  Fix typo in mark.rst


  Commit: 5be85a1f55b181e1f2c8fcc11d44d395fb6ac3e0
      https://github.com/pytest-dev/pytest/commit/5be85a1f55b181e1f2c8fcc11d44d395fb6ac3e0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M changelog/3317.feature
    R changelog/3446.feature
    R changelog/3459.feature

  Log Message:
  -----------
  Merge changelog marks refactoring changelog entries as discussed in review


  Commit: e7f75f69f202a3f980263526d135b76094ad7129
      https://github.com/pytest-dev/pytest/commit/e7f75f69f202a3f980263526d135b76094ad7129
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M changelog/3317.feature

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


  Commit: 7d0c9837ce4c3411ad8b5d82ee2ce6b1eebeaf28
      https://github.com/pytest-dev/pytest/commit/7d0c9837ce4c3411ad8b5d82ee2ce6b1eebeaf28
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/mark/evaluate.py
    M _pytest/nodes.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/warnings.py
    M changelog/3317.feature
    M doc/en/example/markers.rst
    M doc/en/mark.rst
    M doc/en/usage.rst
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #3459 from RonnyPfannschmidt/mark-iter-name-filter

introduce name filtering for marker iteration again


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

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

From nicoddemus at gmail.com  Tue May 22 08:15:27 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 22 May 2018 05:15:27 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] ad39fd: Merge remote-tracking
 branch 'upstream/master' int...
Message-ID: <5b0409dfdc239_169d2b0267f61c1c6174e@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/release-3.6.0
  Home:   https://github.com/pytest-dev/pytest
  Commit: ad39fd5248fb2e4062b4a272b5cc330e3c091eb8
      https://github.com/pytest-dev/pytest/commit/ad39fd5248fb2e4062b4a272b5cc330e3c091eb8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M doc/en/logging.rst

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


  Commit: e38ee5ccf400abd87fe9c0ab233e7ea215ffd960
      https://github.com/pytest-dev/pytest/commit/e38ee5ccf400abd87fe9c0ab233e7ea215ffd960
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M tasks/requirements.txt

  Log Message:
  -----------
  Add missing libs to tasks/requirements.txt


  Commit: 6614318cdaac0749855bc8f2b023790c05a5bec4
      https://github.com/pytest-dev/pytest/commit/6614318cdaac0749855bc8f2b023790c05a5bec4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2334.feature
    R changelog/3008.bugfix.rst
    R changelog/3008.trivial.rst
    R changelog/3180.feature.rst
    R changelog/3290.feature
    R changelog/3299.feature.rst
    R changelog/3303.doc.rst
    R changelog/3307.feature.rst
    R changelog/3317.feature
    R changelog/3431.trivial.rst
    R changelog/3441.bugfix
    R changelog/3443.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.0.rst
    M doc/en/example/parametrize.rst

  Log Message:
  -----------
  Preparing release version 3.6.0


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

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

From nicoddemus at gmail.com  Tue May 22 08:16:04 2018
From: nicoddemus at gmail.com (nicoddemus)
Date: Tue, 22 May 2018 05:16:04 -0700
Subject: [Pytest-commit] [pytest-dev/pytest]
Message-ID: <5b040a049636c_db62aaf6ee11c0099548@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/release-3.6.0
  Home:   https://github.com/pytest-dev/pytest

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

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

From nicoddemus at gmail.com  Tue May 22 19:57:32 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 22 May 2018 16:57:32 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 507222: Import Mapping and
 Sequence from compat in python_...
Message-ID: <5b04ae6c627c0_7cc22b184f9d5c001058b5@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 5072226f69ce7bb2fedd091d3e84cb40fac390ec
      https://github.com/pytest-dev/pytest/commit/5072226f69ce7bb2fedd091d3e84cb40fac390ec
  Author: Miro Hron?ok <miro at hroncok.cz>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    M _pytest/python_api.py
    A changelog/3497.trivial.rst

  Log Message:
  -----------
  Import Mapping and Sequence from compat in python_api::approx

Related to https://github.com/pytest-dev/pytest/issues/3339

Fixes a DeprecationWarning on Python 3.7

Adds Mapping to compat


  Commit: 7985eff5b4b824576c0a1a98ddf31cbce14498ef
      https://github.com/pytest-dev/pytest/commit/7985eff5b4b824576c0a1a98ddf31cbce14498ef
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    M _pytest/python_api.py
    A changelog/3497.trivial.rst

  Log Message:
  -----------
  Merge pull request #3497 from hroncok/approx_compat_import

Import Mapping and Sequence from compat in python_api::approx


Compare: https://github.com/pytest-dev/pytest/compare/6c8d46d8ea23...7985eff5b4b8
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

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

From nicoddemus at gmail.com  Wed May 23 06:25:18 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 23 May 2018 03:25:18 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 16583a: Add missing libs to
 tasks/requirements.txt
Message-ID: <5b05418eca789_53452abec54b3c1099423@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/tags/3.6.0
  Home:   https://github.com/pytest-dev/pytest
  Commit: 16583a6d43ed542bdfd4b67d83b52dff467386d8
      https://github.com/pytest-dev/pytest/commit/16583a6d43ed542bdfd4b67d83b52dff467386d8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M tasks/requirements.txt

  Log Message:
  -----------
  Add missing libs to tasks/requirements.txt


  Commit: c55db1faac4401bc055f75245b82f87c102da51a
      https://github.com/pytest-dev/pytest/commit/c55db1faac4401bc055f75245b82f87c102da51a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/python_api.py
    A changelog/3487.trivial.rst
    A changelog/3497.trivial.rst
    M doc/en/logging.rst

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


  Commit: d70e910b65d1a33bfc179248e024b766c7fc30fa
      https://github.com/pytest-dev/pytest/commit/d70e910b65d1a33bfc179248e024b766c7fc30fa
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2334.feature
    R changelog/3008.bugfix.rst
    R changelog/3008.trivial.rst
    R changelog/3180.feature.rst
    R changelog/3290.feature
    R changelog/3299.feature.rst
    R changelog/3303.doc.rst
    R changelog/3307.feature.rst
    R changelog/3317.feature
    R changelog/3431.trivial.rst
    R changelog/3441.bugfix
    R changelog/3443.bugfix.rst
    R changelog/3487.trivial.rst
    R changelog/3497.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.0.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Preparing release version 3.6.0


  Commit: 45e77031336b11a64756d745b1aba46301b32f27
      https://github.com/pytest-dev/pytest/commit/45e77031336b11a64756d745b1aba46301b32f27
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Move mark revamp note to the top of the CHANGELOG


Compare: https://github.com/pytest-dev/pytest/compare/16583a6d43ed^...45e77031336b
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

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

From nicoddemus at gmail.com  Wed May 23 06:51:31 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 23 May 2018 03:51:31 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d4065a: Detect `pytest_`
 prefixed hooks
Message-ID: <5b0547b3be3e1_61d32b29d1ef3c1c628af@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: d4065a91668fa5fa3f8ef4b7ae5d2443e78328d7
      https://github.com/pytest-dev/pytest/commit/d4065a91668fa5fa3f8ef4b7ae5d2443e78328d7
  Author: Tyler Goodlet <tgoodlet at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Detect `pytest_` prefixed hooks

`pluggy` is deprecating the `implprefix` argument in the next major
release so implement this detection in our derived plugin manager.

Relates to pytest-dev/pluggy#145


  Commit: 486b786cb22e037fc76f210a8c00ab7d42c83a49
      https://github.com/pytest-dev/pytest/commit/486b786cb22e037fc76f210a8c00ab7d42c83a49
  Author: Tyler Goodlet <tgoodlet at gmail.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    A changelog/3487.trivial.rst

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


  Commit: f0b855369c5d5163e64f88e8ea3172cfa38de5c8
      https://github.com/pytest-dev/pytest/commit/f0b855369c5d5163e64f88e8ea3172cfa38de5c8
  Author: Tim Hughes <timhughes at users.noreply.github.com>
  Date:   2018-05-20 (Sun, 20 May 2018)

  Changed paths:
    M doc/en/logging.rst

  Log Message:
  -----------
  fix typo


  Commit: 8e17e322535b36d01cf6ba1199f8a812858062c1
      https://github.com/pytest-dev/pytest/commit/8e17e322535b36d01cf6ba1199f8a812858062c1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-20 (Sun, 20 May 2018)

  Changed paths:
    M doc/en/logging.rst

  Log Message:
  -----------
  Merge pull request #3492 from timhughes/patch-1

fix typo in docs


  Commit: 6c8d46d8ea2341ef20362d8f46665f7e563b9821
      https://github.com/pytest-dev/pytest/commit/6c8d46d8ea2341ef20362d8f46665f7e563b9821
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M _pytest/config.py
    A changelog/3487.trivial.rst

  Log Message:
  -----------
  Merge pull request #3487 from tgoodlet/detect_pytest_hook_prefix

Detect `pytest_` prefixed hooks


  Commit: 5072226f69ce7bb2fedd091d3e84cb40fac390ec
      https://github.com/pytest-dev/pytest/commit/5072226f69ce7bb2fedd091d3e84cb40fac390ec
  Author: Miro Hron?ok <miro at hroncok.cz>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    M _pytest/python_api.py
    A changelog/3497.trivial.rst

  Log Message:
  -----------
  Import Mapping and Sequence from compat in python_api::approx

Related to https://github.com/pytest-dev/pytest/issues/3339

Fixes a DeprecationWarning on Python 3.7

Adds Mapping to compat


  Commit: 7985eff5b4b824576c0a1a98ddf31cbce14498ef
      https://github.com/pytest-dev/pytest/commit/7985eff5b4b824576c0a1a98ddf31cbce14498ef
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    M _pytest/python_api.py
    A changelog/3497.trivial.rst

  Log Message:
  -----------
  Merge pull request #3497 from hroncok/approx_compat_import

Import Mapping and Sequence from compat in python_api::approx


  Commit: 16583a6d43ed542bdfd4b67d83b52dff467386d8
      https://github.com/pytest-dev/pytest/commit/16583a6d43ed542bdfd4b67d83b52dff467386d8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M tasks/requirements.txt

  Log Message:
  -----------
  Add missing libs to tasks/requirements.txt


  Commit: c55db1faac4401bc055f75245b82f87c102da51a
      https://github.com/pytest-dev/pytest/commit/c55db1faac4401bc055f75245b82f87c102da51a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/python_api.py
    A changelog/3487.trivial.rst
    A changelog/3497.trivial.rst
    M doc/en/logging.rst

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


  Commit: d70e910b65d1a33bfc179248e024b766c7fc30fa
      https://github.com/pytest-dev/pytest/commit/d70e910b65d1a33bfc179248e024b766c7fc30fa
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2334.feature
    R changelog/3008.bugfix.rst
    R changelog/3008.trivial.rst
    R changelog/3180.feature.rst
    R changelog/3290.feature
    R changelog/3299.feature.rst
    R changelog/3303.doc.rst
    R changelog/3307.feature.rst
    R changelog/3317.feature
    R changelog/3431.trivial.rst
    R changelog/3441.bugfix
    R changelog/3443.bugfix.rst
    R changelog/3487.trivial.rst
    R changelog/3497.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.0.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Preparing release version 3.6.0


  Commit: 45e77031336b11a64756d745b1aba46301b32f27
      https://github.com/pytest-dev/pytest/commit/45e77031336b11a64756d745b1aba46301b32f27
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Move mark revamp note to the top of the CHANGELOG


  Commit: b4cd010d71b26cfaeb59b7350556ba5373685c0c
      https://github.com/pytest-dev/pytest/commit/b4cd010d71b26cfaeb59b7350556ba5373685c0c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/python_api.py
    R changelog/2334.feature
    R changelog/3008.bugfix.rst
    R changelog/3008.trivial.rst
    R changelog/3180.feature.rst
    R changelog/3290.feature
    R changelog/3299.feature.rst
    R changelog/3303.doc.rst
    R changelog/3307.feature.rst
    R changelog/3317.feature
    R changelog/3431.trivial.rst
    R changelog/3441.bugfix
    R changelog/3443.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.0.rst
    M doc/en/example/simple.rst
    M doc/en/logging.rst
    M tasks/requirements.txt

  Log Message:
  -----------
  Merge pull request #3495 from nicoddemus/release-3.6.0

Release 3.6.0


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

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

From nicoddemus at gmail.com  Wed May 23 06:54:36 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 23 May 2018 03:54:36 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] cfd16d: provide error fixture
 applied to the same func
Message-ID: <5b05486c11c3e_33c2b02ee9afc10974a4@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: cfd16d0dac1c935952b892bfbc225978c9b25de3
      https://github.com/pytest-dev/pytest/commit/cfd16d0dac1c935952b892bfbc225978c9b25de3
  Author: ApaDoctor <vovanopulus at gmail.com>
  Date:   2017-10-18 (Wed, 18 Oct 2017)

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

  Log Message:
  -----------
  provide error fixture applied to the same func

provide error fixture applied to the same func

provide error fixture applied to the same func


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

  Changed paths:
    M changelog/2334.feature

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


  Commit: 9edcb7edc643feafd91ebe0922d02bcafaceb1fb
      https://github.com/pytest-dev/pytest/commit/9edcb7edc643feafd91ebe0922d02bcafaceb1fb
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-22 (Thu, 22 Mar 2018)

  Changed paths:
    A testing/test_debugging.py

  Log Message:
  -----------
  start acceptance testing


  Commit: 3bca983a95d935b3c91130a1397e910fb460f338
      https://github.com/pytest-dev/pytest/commit/3bca983a95d935b3c91130a1397e910fb460f338
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-22 (Thu, 22 Mar 2018)

  Changed paths:
    M _pytest/debugging.py
    M testing/test_debugging.py

  Log Message:
  -----------
  add a module global for whether the current runtime supports the builtin breakpoint function


  Commit: 91d99affb7a81d4665fe50be4f51c4eaeb340dcd
      https://github.com/pytest-dev/pytest/commit/91d99affb7a81d4665fe50be4f51c4eaeb340dcd
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-22 (Thu, 22 Mar 2018)

  Changed paths:
    M testing/test_debugging.py

  Log Message:
  -----------
  assert that custom PDB class is used as breakpoint hook where supported


  Commit: 5a53b9aabb296f18b77edabb6b873195c27ebd34
      https://github.com/pytest-dev/pytest/commit/5a53b9aabb296f18b77edabb6b873195c27ebd34
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-22 (Thu, 22 Mar 2018)

  Changed paths:
    R testing/test_debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  move tests to test_pdb


  Commit: a1ff758d0d0fbb1655e85472fe896b3356dac404
      https://github.com/pytest-dev/pytest/commit/a1ff758d0d0fbb1655e85472fe896b3356dac404
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-23 (Fri, 23 Mar 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  "Added acceptance tests for configuration of sys.breakpointhook and resetting back when system default (pdb) is used""


  Commit: 21ada0fa23d20dcc2945ecb3f8ef5c62a96deac3
      https://github.com/pytest-dev/pytest/commit/21ada0fa23d20dcc2945ecb3f8ef5c62a96deac3
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-23 (Fri, 23 Mar 2018)

  Changed paths:
    M _pytest/debugging.py

  Log Message:
  -----------
  add check for support of breakpoint() and use Custom Pdb class when system default is set


  Commit: 0e83e4f292a44ee86e6974dc30c652fa0bba5172
      https://github.com/pytest-dev/pytest/commit/0e83e4f292a44ee86e6974dc30c652fa0bba5172
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-23 (Fri, 23 Mar 2018)

  Changed paths:
    M _pytest/debugging.py

  Log Message:
  -----------
  conditional for resetting of sys.breakpointhook for cleanup where breakpoint() not supported


  Commit: db581eabcbc8a279020cceb5217a2ca593024aba
      https://github.com/pytest-dev/pytest/commit/db581eabcbc8a279020cceb5217a2ca593024aba
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-23 (Fri, 23 Mar 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  add tests to validate that --pdbcls custom debugger classes will be called when breakpoint() is used


  Commit: dcbba381d44f081dd3974326337c30c6850a65bf
      https://github.com/pytest-dev/pytest/commit/dcbba381d44f081dd3974326337c30c6850a65bf
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-23 (Fri, 23 Mar 2018)

  Changed paths:
    A changelog/3180.feature.rst

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


  Commit: 1ec99132e69a9fa2d103471fc6145b375d1e5fe1
      https://github.com/pytest-dev/pytest/commit/1ec99132e69a9fa2d103471fc6145b375d1e5fe1
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-23 (Fri, 23 Mar 2018)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  add myself to authors


  Commit: 242fb7852b66e2dc419e8a1d8b0150876ae38eac
      https://github.com/pytest-dev/pytest/commit/242fb7852b66e2dc419e8a1d8b0150876ae38eac
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-23 (Fri, 23 Mar 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  linting and removed double test


  Commit: e97bd87ee20635bf585900747c3b571fd43e0fa8
      https://github.com/pytest-dev/pytest/commit/e97bd87ee20635bf585900747c3b571fd43e0fa8
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-23 (Fri, 23 Mar 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  fix assertion when hypothesis is installed (which is should be for developing in pytest)


  Commit: d895f5d6fce13981f11cfc6c47e2c12474a3f07f
      https://github.com/pytest-dev/pytest/commit/d895f5d6fce13981f11cfc6c47e2c12474a3f07f
  Author: Katerina Koukiou <kkoukiou at redhat.com>
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
    M AUTHORS
    M _pytest/logging.py
    A changelog/3307.feature.rst
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  logging.py: Don't change log level of the root logger to bigger numeric value


  Commit: 6cfed00a6134ff76e040ee3108ecaf97523ad1a0
      https://github.com/pytest-dev/pytest/commit/6cfed00a6134ff76e040ee3108ecaf97523ad1a0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
    M changelog/3307.feature.rst

  Log Message:
  -----------
  Tweak changelog entry


  Commit: f1f4c8c10481ab643a497876dfaed713f54c9479
      https://github.com/pytest-dev/pytest/commit/f1f4c8c10481ab643a497876dfaed713f54c9479
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

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

  Log Message:
  -----------
  updates for code review recommendations


  Commit: 671ab5a36cee2e4110ca12826de8d5ab5ca45aa8
      https://github.com/pytest-dev/pytest/commit/671ab5a36cee2e4110ca12826de8d5ab5ca45aa8
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M changelog/3180.feature.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  update documentation for new feature


  Commit: b45006e9a3af8c60c7835ddf4c1aee6920c0caa7
      https://github.com/pytest-dev/pytest/commit/b45006e9a3af8c60c7835ddf4c1aee6920c0caa7
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  fix syntax


  Commit: 0a4200bbb3a422ff7f77fb83ca16c43737fd9231
      https://github.com/pytest-dev/pytest/commit/0a4200bbb3a422ff7f77fb83ca16c43737fd9231
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M doc/en/usage.rst

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


  Commit: 2962c7367cff967b03b46581eafe13c5fd2e2d54
      https://github.com/pytest-dev/pytest/commit/2962c7367cff967b03b46581eafe13c5fd2e2d54
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M AUTHORS
    M _pytest/logging.py
    A changelog/3307.feature.rst
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Merge pull request #3307 from KKoukiou/rhv-qe-fix

logging.py: Don't change log level of the root logger to bigger numeric value


  Commit: 060f047a7ea24c9ce7671defe12ab2a1085d4db5
      https://github.com/pytest-dev/pytest/commit/060f047a7ea24c9ce7671defe12ab2a1085d4db5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M changelog/3180.feature.rst

  Log Message:
  -----------
  Use full link in CHANGELOG

Our rst-linter unfortunately doesn't accept `ref` directives in the CHANGELOG files


  Commit: 3998b70ff6e5268e828d87d4afde39aa7f867dee
      https://github.com/pytest-dev/pytest/commit/3998b70ff6e5268e828d87d4afde39aa7f867dee
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-28 (Wed, 28 Mar 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  add test for custom environment variable


  Commit: 09e5a226dceb925450bd38f0e06739901d9b9706
      https://github.com/pytest-dev/pytest/commit/09e5a226dceb925450bd38f0e06739901d9b9706
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M testing/test_pdb.py

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


  Commit: 804392e5f2222fc2c83d7a8a098b58ca4c126195
      https://github.com/pytest-dev/pytest/commit/804392e5f2222fc2c83d7a8a098b58ca4c126195
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-28 (Wed, 28 Mar 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fix tests that check that breakpoint function is configured/restored

* Execute pytest in a subprocess in cases of tests which change global
  state
* Parametrize with --pdb and without the flag


  Commit: 360d608da4e11c66539967e625c70e6cae31395e
      https://github.com/pytest-dev/pytest/commit/360d608da4e11c66539967e625c70e6cae31395e
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

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

  Log Message:
  -----------
  introduce a own storage for markers


  Commit: 27072215593b2808bbae2fb633caf556cc5852e3
      https://github.com/pytest-dev/pytest/commit/27072215593b2808bbae2fb633caf556cc5852e3
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

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

  Log Message:
  -----------
  port mark evaluation to the new storage and fix a bug in evaluation


  Commit: f1a1695aaabf554fea21382b7edc0ee79e59b3d5
      https://github.com/pytest-dev/pytest/commit/f1a1695aaabf554fea21382b7edc0ee79e59b3d5
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M testing/test_mark.py

  Log Message:
  -----------
  enable deep merging test - new structure fixed it


  Commit: e8feee0612246d4f3414530388c9aee6dd0f563c
      https://github.com/pytest-dev/pytest/commit/e8feee0612246d4f3414530388c9aee6dd0f563c
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M _pytest/mark/evaluate.py

  Log Message:
  -----------
  fix up the mark evaluator validity check


  Commit: 180ae0920235e883138d56fa4274565793058465
      https://github.com/pytest-dev/pytest/commit/180ae0920235e883138d56fa4274565793058465
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/mark/structures.py
    M _pytest/python.py
    M _pytest/skipping.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_mark.py

  Log Message:
  -----------
  deprecate markinfo and fix up most marker scoping access while completely breaking metafunc testing


  Commit: 99015bfc86d6ad309bdd9abbe2c0700d58ca36d1
      https://github.com/pytest-dev/pytest/commit/99015bfc86d6ad309bdd9abbe2c0700d58ca36d1
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

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

  Log Message:
  -----------
  fix most of metafunc tests by mocking


  Commit: 2d06ae0f65f88ca21d3f2ad8fe51286548dafab5
      https://github.com/pytest-dev/pytest/commit/2d06ae0f65f88ca21d3f2ad8fe51286548dafab5
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  base metafunc fixtureinfo on the functiondefinition to caputure its marks


  Commit: 5e56e9b4f67185bf52f851ea5d1f5829e01f804c
      https://github.com/pytest-dev/pytest/commit/5e56e9b4f67185bf52f851ea5d1f5829e01f804c
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

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

  Log Message:
  -----------
  refactor node markers, remove need to be aware of nodes


  Commit: ced1316bc80454d461df1ce1a281844e273e7dda
      https://github.com/pytest-dev/pytest/commit/ced1316bc80454d461df1ce1a281844e273e7dda
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

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

  Log Message:
  -----------
  add docstrings for nodemarkers


  Commit: 775fb96ac3f86de3e53120769fd0eb72c1d9dce0
      https://github.com/pytest-dev/pytest/commit/775fb96ac3f86de3e53120769fd0eb72c1d9dce0
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    A changelog/3317.feature

  Log Message:
  -----------
  first changelog entry


  Commit: 159ea9b7c0654f7e300ec2a91d7502ce1ae45571
      https://github.com/pytest-dev/pytest/commit/159ea9b7c0654f7e300ec2a91d7502ce1ae45571
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M _pytest/mark/structures.py
    M _pytest/nodes.py
    M _pytest/warnings.py
    M testing/test_mark.py

  Log Message:
  -----------
  turn Markinfo into atts clsas, and return correct instances of it from node.get_marker


  Commit: a92a51b01b261df5b8491c6b13784c982a5320ca
      https://github.com/pytest-dev/pytest/commit/a92a51b01b261df5b8491c6b13784c982a5320ca
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M _pytest/nodes.py

  Log Message:
  -----------
  clarify find_markers return value


  Commit: 02315c04891fa04d7877761a9c85fd6ca47c49a6
      https://github.com/pytest-dev/pytest/commit/02315c04891fa04d7877761a9c85fd6ca47c49a6
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  remove unnecessary of in the code figuring the fixture names


  Commit: 2cb7e725ce30d99153af0ed8cf62e534088d5179
      https://github.com/pytest-dev/pytest/commit/2cb7e725ce30d99153af0ed8cf62e534088d5179
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  document the hack used to avoid duplicate markers due Instance collectors


  Commit: ee51fa58812e23ab3b26a2d11e8706d5d9b7cd67
      https://github.com/pytest-dev/pytest/commit/ee51fa58812e23ab3b26a2d11e8706d5d9b7cd67
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M _pytest/mark/structures.py
    M _pytest/nodes.py
    M doc/en/mark.rst

  Log Message:
  -----------
  add api to iterate over all marerks of a node


  Commit: 8805036fd8596750caa588853707346235ae6bdd
      https://github.com/pytest-dev/pytest/commit/8805036fd8596750caa588853707346235ae6bdd
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M _pytest/nodes.py

  Log Message:
  -----------
  add node iteration apis

TODO: add tests


  Commit: dbb1b5a2279775730d593622fb2a993e12960b22
      https://github.com/pytest-dev/pytest/commit/dbb1b5a2279775730d593622fb2a993e12960b22
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/mark/evaluate.py
    M _pytest/nodes.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/warnings.py
    M testing/test_mark.py

  Log Message:
  -----------
  remove NodeMarkers, turn own_markers into a list and use iter_markers api exclusively


  Commit: 802da781c62519b26f1a9d0ad9ac6adcc331222c
      https://github.com/pytest-dev/pytest/commit/802da781c62519b26f1a9d0ad9ac6adcc331222c
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M _pytest/deprecated.py

  Log Message:
  -----------
  fix method reference to iter_markers in warning


  Commit: e4a52c1795c068a8b113578429532f9e5103a835
      https://github.com/pytest-dev/pytest/commit/e4a52c1795c068a8b113578429532f9e5103a835
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  prevent doubleing of function level marks


  Commit: 7454a381e2f619f32579fb31ed8bb1ed4ed2604c
      https://github.com/pytest-dev/pytest/commit/7454a381e2f619f32579fb31ed8bb1ed4ed2604c
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M doc/en/example/markers.rst
    M doc/en/example/simple.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  update configuration examples to new mark api


  Commit: a2974dd06795b783ebcdd68625d0ff953df352c7
      https://github.com/pytest-dev/pytest/commit/a2974dd06795b783ebcdd68625d0ff953df352c7
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  fix doc building


  Commit: 4d847593b323d041c11df15c8158a330caf07a79
      https://github.com/pytest-dev/pytest/commit/4d847593b323d041c11df15c8158a330caf07a79
  Author: Anthony Shaw <anthonyshaw at apache.org>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  remove a test that would fail because pytest is being used to test itself


  Commit: 0762666bd116d92b55f746cde8e25e965ea2912b
      https://github.com/pytest-dev/pytest/commit/0762666bd116d92b55f746cde8e25e965ea2912b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M testing/test_pdb.py

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


  Commit: 1fcadeb2ce443b3166320a38740834f00fbb3432
      https://github.com/pytest-dev/pytest/commit/1fcadeb2ce443b3166320a38740834f00fbb3432
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M _pytest/mark/structures.py
    M doc/en/mark.rst

  Log Message:
  -----------
  extend marker docs with reasons on marker iteration


  Commit: 48bcc3419f3c69e6646038e008a6410f094968df
      https://github.com/pytest-dev/pytest/commit/48bcc3419f3c69e6646038e008a6410f094968df
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  Reword the docs on markers a bit


  Commit: a8ad89cdb3973537d9f75a33c0c6a96c760b4a69
      https://github.com/pytest-dev/pytest/commit/a8ad89cdb3973537d9f75a33c0c6a96c760b4a69
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  fix documentation references


  Commit: 3582e1f6bedf5007a8936de71f5865d9a2192822
      https://github.com/pytest-dev/pytest/commit/3582e1f6bedf5007a8936de71f5865d9a2192822
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  include more detail on the marker api issues


  Commit: e534cc81a353b178b017f070dbe421f563e604a0
      https://github.com/pytest-dev/pytest/commit/e534cc81a353b178b017f070dbe421f563e604a0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  Fix typos in docs


  Commit: 4df8f2b153339387f13949c37a40ff86073bda70
      https://github.com/pytest-dev/pytest/commit/4df8f2b153339387f13949c37a40ff86073bda70
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  fix doc build, use noindex on the mark reference


  Commit: 715337011be81c721a35d0056a352d7cdc2731ec
      https://github.com/pytest-dev/pytest/commit/715337011be81c721a35d0056a352d7cdc2731ec
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/mark/evaluate.py
    M _pytest/mark/structures.py
    M _pytest/nodes.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/warnings.py
    A changelog/3317.feature
    M doc/en/example/markers.rst
    M doc/en/example/simple.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #3317 from RonnyPfannschmidt/marker-pristine-node-storage

introduce a distinct searchable non-broken storage for markers


  Commit: 2241c98b18cbc2c9ac26b94a07872610cfb36da3
      https://github.com/pytest-dev/pytest/commit/2241c98b18cbc2c9ac26b94a07872610cfb36da3
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

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

  Log Message:
  -----------
  Merge pull request #3331 from tonybaloney/breakpoint_support

Support for the new builtin breakpoint function in Python 3.7


  Commit: d1ba19acad3e1187149fc73593f4015fb73e8d54
      https://github.com/pytest-dev/pytest/commit/d1ba19acad3e1187149fc73593f4015fb73e8d54
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  Add the list of issues fixed by the new marker implementation to the docs

This will help make users more understanding if their code breaks under the
new implementation.


  Commit: 372bcdba0c9a9f84ad9aaec121e0d945a7785013
      https://github.com/pytest-dev/pytest/commit/372bcdba0c9a9f84ad9aaec121e0d945a7785013
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  Merge pull request #3380 from nicoddemus/marks-fixes

Add the list of issues fixed by the new marker implementation to the docs


  Commit: 659c044372ece204146fee9164fb6144c494eb58
      https://github.com/pytest-dev/pytest/commit/659c044372ece204146fee9164fb6144c494eb58
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M _pytest/monkeypatch.py

  Log Message:
  -----------
  #3290 Improved monkeypatch to support some form of with statement


  Commit: 3d60f955f037e53a4be0a6561d664b8cb43367a9
      https://github.com/pytest-dev/pytest/commit/3d60f955f037e53a4be0a6561d664b8cb43367a9
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M testing/test_monkeypatch.py

  Log Message:
  -----------
  #3290 Added test


  Commit: 97be076f2930adc6bd67f4bc4690a7ccf2540c41
      https://github.com/pytest-dev/pytest/commit/97be076f2930adc6bd67f4bc4690a7ccf2540c41
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    A changelog/3290.bugfix

  Log Message:
  -----------
  #3290 Added changelog file


  Commit: a4daac7eb03f934752929297fe9d9329a4e86850
      https://github.com/pytest-dev/pytest/commit/a4daac7eb03f934752929297fe9d9329a4e86850
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M doc/en/monkeypatch.rst

  Log Message:
  -----------
  #3290 Fix doc


  Commit: 10a71605498d50851e937837fafe2d2672ea2bd4
      https://github.com/pytest-dev/pytest/commit/10a71605498d50851e937837fafe2d2672ea2bd4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

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

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


  Commit: f79b0324fe21eb35918ca67421f9967fa23c0e3b
      https://github.com/pytest-dev/pytest/commit/f79b0324fe21eb35918ca67421f9967fa23c0e3b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

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

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

Merge master into features


  Commit: aa95a425d7708d80fc887b1825662daf3a624ba7
      https://github.com/pytest-dev/pytest/commit/aa95a425d7708d80fc887b1825662daf3a624ba7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

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

  Log Message:
  -----------
  Attempt to solve race-condition which corrupts .pyc files on Windows

This uses of the `atomicwrites` library.

This is very hard to create a reliable test for.

Fix #3008


  Commit: 13a6f63cd95c06104bf265f8587131346da55d90
      https://github.com/pytest-dev/pytest/commit/13a6f63cd95c06104bf265f8587131346da55d90
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

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

  Log Message:
  -----------
  Merge pull request #3390 from nicoddemus/atomic-pyc-writes

Attempt to solve race-condition which corrupts .pyc files on Windows


  Commit: ba7cad3962d646768351bb12fb9922720c46f8f8
      https://github.com/pytest-dev/pytest/commit/ba7cad3962d646768351bb12fb9922720c46f8f8
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-04-13 (Fri, 13 Apr 2018)

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

  Log Message:
  -----------
  #3290 Fix comments


  Commit: 283ac8bbf4e8c9d270419815802a6a4460418a8e
      https://github.com/pytest-dev/pytest/commit/283ac8bbf4e8c9d270419815802a6a4460418a8e
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-04-14 (Sat, 14 Apr 2018)

  Changed paths:
    M doc/en/monkeypatch.rst

  Log Message:
  -----------
  #3290 Fix doc


  Commit: 3318e53d01e66eae0ded2d5d7e58b2e867a62f3b
      https://github.com/pytest-dev/pytest/commit/3318e53d01e66eae0ded2d5d7e58b2e867a62f3b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-19 (Thu, 19 Apr 2018)

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

  Log Message:
  -----------
  Merge pull request #3382 from feuillemorte/3290-improve-monkeypatch

#3290 improve monkeypatch


  Commit: 03850cf962e9c3c9b8d05a63a2fde0ba8ec0f7fa
      https://github.com/pytest-dev/pytest/commit/03850cf962e9c3c9b8d05a63a2fde0ba8ec0f7fa
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Add test for applying fixture twice

Fix #2334


  Commit: 132fb61ebad5ab9836678f3a8476fb4a0c597932
      https://github.com/pytest-dev/pytest/commit/132fb61ebad5ab9836678f3a8476fb4a0c597932
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M .coveragerc
    M .github/PULL_REQUEST_TEMPLATE.md
    M .gitignore
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M HOWTORELEASE.rst
    M README.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    R _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/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
    A _pytest/logging.py
    M _pytest/main.py
    R _pytest/mark.py
    A _pytest/mark/__init__.py
    A _pytest/mark/evaluate.py
    A _pytest/mark/legacy.py
    A _pytest/mark/structures.py
    M _pytest/monkeypatch.py
    A _pytest/nodes.py
    M _pytest/nose.py
    A _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    R _pytest/vendored_packages/README.md
    R _pytest/vendored_packages/__init__.py
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/INSTALLER
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/RECORD
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/WHEEL
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/metadata.json
    R _pytest/vendored_packages/pluggy-0.4.0.dist-info/top_level.txt
    R _pytest/vendored_packages/pluggy.py
    M _pytest/warnings.py
    M appveyor.yml
    R changelog/2147.removal
    R changelog/2427.removal
    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/2489.trivial
    R changelog/2493.doc
    R changelog/2499.trivial
    R changelog/2516.feature
    A changelog/3008.bugfix.rst
    A changelog/3008.trivial.rst
    A changelog/3180.feature.rst
    A changelog/3290.feature
    A changelog/3307.feature.rst
    A changelog/3317.feature
    A changelog/3330.trivial.rst
    A changelog/3339.trivial
    A changelog/3348.bugfix.rst
    A changelog/3360.trivial
    A changelog/3372.bugfix.rst
    A changelog/README.rst
    M changelog/_template.rst
    M doc/en/Makefile
    M doc/en/_templates/globaltoc.html
    M doc/en/_templates/links.html
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.7.0.rst
    A doc/en/announce/release-3.1.3.rst
    A doc/en/announce/release-3.2.0.rst
    A doc/en/announce/release-3.2.1.rst
    A doc/en/announce/release-3.2.2.rst
    A doc/en/announce/release-3.2.3.rst
    A doc/en/announce/release-3.2.4.rst
    A doc/en/announce/release-3.2.5.rst
    A doc/en/announce/release-3.3.0.rst
    A doc/en/announce/release-3.3.1.rst
    A doc/en/announce/release-3.3.2.rst
    A doc/en/announce/release-3.4.0.rst
    A doc/en/announce/release-3.4.1.rst
    A doc/en/announce/release-3.4.2.rst
    A doc/en/announce/release-3.5.0.rst
    M doc/en/assert.rst
    M doc/en/backwards-compatibility.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/conf.py
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    A doc/en/development_guide.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    M doc/en/example/attic.rst
    R doc/en/example/costlysetup/sub1/__init__.py
    R doc/en/example/costlysetup/sub1/test_quick.py
    R doc/en/example/costlysetup/sub2/__init__.py
    R doc/en/example/costlysetup/sub2/test_two.py
    A doc/en/example/costlysetup/sub_a/__init__.py
    A doc/en/example/costlysetup/sub_a/test_quick.py
    A doc/en/example/costlysetup/sub_b/__init__.py
    A doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/index.rst
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    A doc/en/historical-notes.rst
    M doc/en/index.rst
    A doc/en/logging.rst
    M doc/en/mark.rst
    M doc/en/monkeypatch.rst
    M doc/en/nose.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    M doc/en/projects.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    A doc/en/pythonpath.rst
    A doc/en/reference.rst
    M doc/en/requirements.txt
    R doc/en/setup.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M extra/get_issues.py
    M pytest.py
    M scripts/call-tox.bat
    M setup.py
    M tasks/__init__.py
    M tasks/generate.py
    M tasks/requirements.txt
    R tasks/vendoring.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    A testing/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    A testing/logging/test_fixture.py
    A testing/logging/test_formatter.py
    A testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/python/setup_only.py
    M testing/python/show_fixtures_per_test.py
    A testing/python/test_deprecations.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    R testing/test_cache.py
    A testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    A testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features' into ApaDoctor/disable-repeated-fixture


  Commit: 6e62fc98ff0eae0a3559ddcc82576139d54815c0
      https://github.com/pytest-dev/pytest/commit/6e62fc98ff0eae0a3559ddcc82576139d54815c0
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

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

  Log Message:
  -----------
  Merge pull request #2849 from ApaDoctor/disable-repeated-fixture

provide error fixture applied to the same func


  Commit: 63368e07ea40872772fa1d11e628186a9924fb9d
      https://github.com/pytest-dev/pytest/commit/63368e07ea40872772fa1d11e628186a9924fb9d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

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

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


  Commit: 5ba06638272234d99052d7ebee32fd11e8b63a9e
      https://github.com/pytest-dev/pytest/commit/5ba06638272234d99052d7ebee32fd11e8b63a9e
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-04-25 (Wed, 25 Apr 2018)

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

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

Merge master into features


  Commit: c258fe1459638437ba4d2ecd77862091369183e6
      https://github.com/pytest-dev/pytest/commit/c258fe1459638437ba4d2ecd77862091369183e6
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-05-02 (Wed, 02 May 2018)

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

  Log Message:
  -----------
  --pdb treats KeyboardInterrupt as exception


  Commit: 1a880be85b4aaa42f38c9a4922a9ad8338dd7552
      https://github.com/pytest-dev/pytest/commit/1a880be85b4aaa42f38c9a4922a9ad8338dd7552
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-01 (Tue, 01 May 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Remove unused import to fix linting


  Commit: ccaa979f27a664c9507e1c027eb3913781c51c27
      https://github.com/pytest-dev/pytest/commit/ccaa979f27a664c9507e1c027eb3913781c51c27
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-01 (Tue, 01 May 2018)

  Changed paths:
    M changelog/3317.feature
    M doc/en/contents.rst
    M doc/en/mark.rst

  Log Message:
  -----------
  Improve changelog note about markers

Also changed the title in the docs because the previous title had
the same level as the title, making it appear in a separate entry
in `contents.rst`


  Commit: 7834b450024ad8986414e001afbf72962fd7fc14
      https://github.com/pytest-dev/pytest/commit/7834b450024ad8986414e001afbf72962fd7fc14
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M changelog/3317.feature
    M doc/en/contents.rst
    M doc/en/mark.rst

  Log Message:
  -----------
  Merge pull request #3437 from nicoddemus/mark-changelog

Improve changelog note about markers


  Commit: 63ef46dd91d8e320a0e1db226da0b32912e0c8c5
      https://github.com/pytest-dev/pytest/commit/63ef46dd91d8e320a0e1db226da0b32912e0c8c5
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M _pytest/mark/legacy.py
    A changelog/3441.bugfix

  Log Message:
  -----------
  fix #3441 - use iter-marks to populate markexpr namespace


  Commit: a5cf55dd4a5237ad4b5d6e93d9822558bbc8cd28
      https://github.com/pytest-dev/pytest/commit/a5cf55dd4a5237ad4b5d6e93d9822558bbc8cd28
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M testing/test_mark.py

  Log Message:
  -----------
  fix test_mark_option_custom - it used the legacy keyword storage for addign markers


  Commit: b03b387861f6630846995aa59f4b5ef7f4adb526
      https://github.com/pytest-dev/pytest/commit/b03b387861f6630846995aa59f4b5ef7f4adb526
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

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

  Log Message:
  -----------
  Merge pull request #3436 from brianmaissy/feature/enter_pdb_on_keyboard_interrupt

--pdb treats KeyboardInterrupt as exception


  Commit: e6a86e0f4c2c5b1b600e86eda8d1ba545142ac72
      https://github.com/pytest-dev/pytest/commit/e6a86e0f4c2c5b1b600e86eda8d1ba545142ac72
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M testing/test_mark.py

  Log Message:
  -----------
  add tests for #3441


  Commit: 35f53a7353418f63705349aee92b229723646f9c
      https://github.com/pytest-dev/pytest/commit/35f53a7353418f63705349aee92b229723646f9c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

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

  Log Message:
  -----------
  Merge pull request #3442 from RonnyPfannschmidt/fix-3441-markexpr-markstorage

Fix #3441 let mark expressions be populated from the modern marker storage


  Commit: 4914135fdf45bc4fa0469f2a9d3161c5830e84fd
      https://github.com/pytest-dev/pytest/commit/4914135fdf45bc4fa0469f2a9d3161c5830e84fd
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-11 (Fri, 11 May 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/mark/evaluate.py
    M _pytest/nodes.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/warnings.py
    A changelog/3446.feature
    A changelog/3459.feature
    M doc/en/example/markers.rst
    M doc/en/usage.rst
    M testing/test_mark.py

  Log Message:
  -----------
  introduce name filtering for marker iteration again


  Commit: 1b2f4f44839da59ba7e34aa688ab2b24c1b6a1f5
      https://github.com/pytest-dev/pytest/commit/1b2f4f44839da59ba7e34aa688ab2b24c1b6a1f5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M changelog/3446.feature

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


  Commit: 718ba83600370f8a176c805ae4ad665d7d61fdf7
      https://github.com/pytest-dev/pytest/commit/718ba83600370f8a176c805ae4ad665d7d61fdf7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M changelog/3459.feature

  Log Message:
  -----------
  Small adjustment to the CHANGELOG


  Commit: 2cd159e8c54e98cf431d0528eceb6d404c4a0d19
      https://github.com/pytest-dev/pytest/commit/2cd159e8c54e98cf431d0528eceb6d404c4a0d19
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M _pytest/deprecated.py
    M doc/en/mark.rst

  Log Message:
  -----------
  Add section on how to update marks and add ref to the deprecation notice


  Commit: afe4800daf14e2da25b08a4a21ea5df0e5a95020
      https://github.com/pytest-dev/pytest/commit/afe4800daf14e2da25b08a4a21ea5df0e5a95020
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M _pytest/nodes.py
    M doc/en/mark.rst

  Log Message:
  -----------
  Fix deprecation notice in Node.get_marker


  Commit: bb626fe8a780706698b700feb410036f4d5b88bb
      https://github.com/pytest-dev/pytest/commit/bb626fe8a780706698b700feb410036f4d5b88bb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  Fix typo in mark.rst


  Commit: 5be85a1f55b181e1f2c8fcc11d44d395fb6ac3e0
      https://github.com/pytest-dev/pytest/commit/5be85a1f55b181e1f2c8fcc11d44d395fb6ac3e0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M changelog/3317.feature
    R changelog/3446.feature
    R changelog/3459.feature

  Log Message:
  -----------
  Merge changelog marks refactoring changelog entries as discussed in review


  Commit: e7f75f69f202a3f980263526d135b76094ad7129
      https://github.com/pytest-dev/pytest/commit/e7f75f69f202a3f980263526d135b76094ad7129
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M changelog/3317.feature

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


  Commit: 674879976f3f0cebe1798a249ac9a50c850294dd
      https://github.com/pytest-dev/pytest/commit/674879976f3f0cebe1798a249ac9a50c850294dd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M README.rst
    M _pytest/_code/source.py
    M _pytest/assertion/util.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/main.py
    M _pytest/mark/structures.py
    M _pytest/outcomes.py
    M _pytest/pytester.py
    M _pytest/python.py
    A changelog/3303.doc.rst
    A changelog/3431.trivial.rst
    A changelog/3443.bugfix.rst
    M doc/en/_templates/links.html
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/cache.rst
    M doc/en/conf.py
    M doc/en/development_guide.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/simple.rst
    M doc/en/faq.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/links.inc
    M doc/en/plugins.rst
    M doc/en/projects.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    M doc/en/reference.rst
    M doc/en/test/plugin/cov.rst
    M doc/en/test/plugin/oejskit.rst
    M doc/en/test/plugin/xdist.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M testing/code/test_excinfo.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_capture.py
    M testing/test_conftest.py
    M testing/test_nose.py
    M tox.ini

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


  Commit: 4aa7ebaf52ce44760c99f16024c8be6ed8cdd001
      https://github.com/pytest-dev/pytest/commit/4aa7ebaf52ce44760c99f16024c8be6ed8cdd001
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-19 (Sat, 19 May 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M README.rst
    M _pytest/_code/source.py
    M _pytest/assertion/util.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/main.py
    M _pytest/mark/structures.py
    M _pytest/outcomes.py
    M _pytest/pytester.py
    M _pytest/python.py
    A changelog/3303.doc.rst
    A changelog/3431.trivial.rst
    A changelog/3443.bugfix.rst
    M doc/en/_templates/links.html
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/cache.rst
    M doc/en/conf.py
    M doc/en/development_guide.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/simple.rst
    M doc/en/faq.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/links.inc
    M doc/en/plugins.rst
    M doc/en/projects.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    M doc/en/reference.rst
    M doc/en/test/plugin/cov.rst
    M doc/en/test/plugin/oejskit.rst
    M doc/en/test/plugin/xdist.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M testing/code/test_excinfo.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_capture.py
    M testing/test_conftest.py
    M testing/test_nose.py
    M tox.ini

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

Merge master into features


  Commit: 7d0c9837ce4c3411ad8b5d82ee2ce6b1eebeaf28
      https://github.com/pytest-dev/pytest/commit/7d0c9837ce4c3411ad8b5d82ee2ce6b1eebeaf28
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/mark/evaluate.py
    M _pytest/nodes.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/warnings.py
    M changelog/3317.feature
    M doc/en/example/markers.rst
    M doc/en/mark.rst
    M doc/en/usage.rst
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #3459 from RonnyPfannschmidt/mark-iter-name-filter

introduce name filtering for marker iteration again


  Commit: 16583a6d43ed542bdfd4b67d83b52dff467386d8
      https://github.com/pytest-dev/pytest/commit/16583a6d43ed542bdfd4b67d83b52dff467386d8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M tasks/requirements.txt

  Log Message:
  -----------
  Add missing libs to tasks/requirements.txt


  Commit: c55db1faac4401bc055f75245b82f87c102da51a
      https://github.com/pytest-dev/pytest/commit/c55db1faac4401bc055f75245b82f87c102da51a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/python_api.py
    A changelog/3487.trivial.rst
    A changelog/3497.trivial.rst
    M doc/en/logging.rst

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


  Commit: d70e910b65d1a33bfc179248e024b766c7fc30fa
      https://github.com/pytest-dev/pytest/commit/d70e910b65d1a33bfc179248e024b766c7fc30fa
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2334.feature
    R changelog/3008.bugfix.rst
    R changelog/3008.trivial.rst
    R changelog/3180.feature.rst
    R changelog/3290.feature
    R changelog/3299.feature.rst
    R changelog/3303.doc.rst
    R changelog/3307.feature.rst
    R changelog/3317.feature
    R changelog/3431.trivial.rst
    R changelog/3441.bugfix
    R changelog/3443.bugfix.rst
    R changelog/3487.trivial.rst
    R changelog/3497.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.0.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Preparing release version 3.6.0


  Commit: 45e77031336b11a64756d745b1aba46301b32f27
      https://github.com/pytest-dev/pytest/commit/45e77031336b11a64756d745b1aba46301b32f27
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Move mark revamp note to the top of the CHANGELOG


  Commit: b4cd010d71b26cfaeb59b7350556ba5373685c0c
      https://github.com/pytest-dev/pytest/commit/b4cd010d71b26cfaeb59b7350556ba5373685c0c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/python_api.py
    R changelog/2334.feature
    R changelog/3008.bugfix.rst
    R changelog/3008.trivial.rst
    R changelog/3180.feature.rst
    R changelog/3290.feature
    R changelog/3299.feature.rst
    R changelog/3303.doc.rst
    R changelog/3307.feature.rst
    R changelog/3317.feature
    R changelog/3431.trivial.rst
    R changelog/3441.bugfix
    R changelog/3443.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.0.rst
    M doc/en/example/simple.rst
    M doc/en/logging.rst
    M tasks/requirements.txt

  Log Message:
  -----------
  Merge pull request #3495 from nicoddemus/release-3.6.0

Release 3.6.0


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

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

From nicoddemus at gmail.com  Wed May 23 07:06:48 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 23 May 2018 04:06:48 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] afde9f: Update number of tests
 in email template
Message-ID: <5b054b48797ca_26042aeb3d73bc04235be@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: afde9f07f7303511dec3b74850f0e10b1579393b
      https://github.com/pytest-dev/pytest/commit/afde9f07f7303511dec3b74850f0e10b1579393b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M tasks/release.minor.rst

  Log Message:
  -----------
  Update number of tests in email template



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

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

From nicoddemus at gmail.com  Thu May 24 12:51:20 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 24 May 2018 09:51:20 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 74cfdc: add failing test for
 #3498
Message-ID: <5b06ed88b15c8_408c2ac6af4e9bfc834a9@hookshot-fe-da92815.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 74cfdc5feb9b07ff538b6c85d864437aadeb314e
      https://github.com/pytest-dev/pytest/commit/74cfdc5feb9b07ff538b6c85d864437aadeb314e
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M testing/test_unittest.py

  Log Message:
  -----------
  add failing test for #3498


  Commit: da2c2e8492c85b315d3cc0892a69ff2fc9c259e8
      https://github.com/pytest-dev/pytest/commit/da2c2e8492c85b315d3cc0892a69ff2fc9c259e8
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M testing/test_unittest.py

  Log Message:
  -----------
  more debugging for #3498


  Commit: 5a0c9aca639596b9d0bf5d909462b0435afda244
      https://github.com/pytest-dev/pytest/commit/5a0c9aca639596b9d0bf5d909462b0435afda244
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/python.py
    M _pytest/unittest.py
    A changelog/3498.bugfix

  Log Message:
  -----------
  correctly instantiate fixtureinfo for unittest tests, fixes #3498


  Commit: bc25d51b2f59a92df28c37b436b21aa311a30913
      https://github.com/pytest-dev/pytest/commit/bc25d51b2f59a92df28c37b436b21aa311a30913
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M changelog/3498.bugfix

  Log Message:
  -----------
  Re-word changelog


  Commit: 48215fdcb90baf9abc1f83661d9d8be3e72a4b22
      https://github.com/pytest-dev/pytest/commit/48215fdcb90baf9abc1f83661d9d8be3e72a4b22
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/python.py
    M _pytest/unittest.py
    A changelog/3498.bugfix
    M testing/test_unittest.py

  Log Message:
  -----------
  Merge pull request #3500 from RonnyPfannschmidt/fix-3498-unittest-marks

fix #3498 - correctly consider marks on unittest classes


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

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

From nicoddemus at gmail.com  Thu May 24 19:50:18 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 24 May 2018 16:50:18 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 6c519b: Fixed a bug where
 stdout and stderr were logged tw...
Message-ID: <5b074fba694c8_41932af7dd41dc145339f@hookshot-fe-da92815.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 6c519b12802347b257840c4d286ca0bf94cd92a5
      https://github.com/pytest-dev/pytest/commit/6c519b12802347b257840c4d286ca0bf94cd92a5
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M _pytest/junitxml.py
    A changelog/3491.bugfix.rst
    M testing/test_junitxml.py

  Log Message:
  -----------
  Fixed a bug where stdout and stderr were logged twice by junitxml.


  Commit: 210ad22dbe6d61a4dcfb9a1f431058e6a8c26bad
      https://github.com/pytest-dev/pytest/commit/210ad22dbe6d61a4dcfb9a1f431058e6a8c26bad
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M changelog/3491.bugfix.rst

  Log Message:
  -----------
  Updating changelog text


  Commit: b4e02656226ca74fd0676668926e20e5bceeebf0
      https://github.com/pytest-dev/pytest/commit/b4e02656226ca74fd0676668926e20e5bceeebf0
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M testing/test_junitxml.py

  Log Message:
  -----------
  Removed whitespace from empty line.


  Commit: 93fdad28aae28342940156701b813f6743b6e317
      https://github.com/pytest-dev/pytest/commit/93fdad28aae28342940156701b813f6743b6e317
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M _pytest/junitxml.py
    A changelog/3491.bugfix.rst
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #3499 from jeffreyrack/3491-junit-logging

3491 - Fixed a bug where stdout and stderr were logged twice by junitxml for xfail tests.


Compare: https://github.com/pytest-dev/pytest/compare/48215fdcb90b...93fdad28aae2
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

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

From nicoddemus at gmail.com  Fri May 25 16:07:15 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 25 May 2018 13:07:15 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] c55635: Fix tox spelling (all
 lower case).
Message-ID: <5b086cf377f98_7a332ae1e3be5c0486470@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: c55635d42a6e6bab35307f5d728dfff0b3161901
      https://github.com/pytest-dev/pytest/commit/c55635d42a6e6bab35307f5d728dfff0b3161901
  Author: Oliver Bestwalter <oliver.bestwalter at avira.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M doc/en/goodpractices.rst
    M doc/en/nose.rst

  Log Message:
  -----------
  Fix tox spelling (all lower case).


  Commit: 65bc43dc56d6152a2e9bd766961ad67b7b0f127c
      https://github.com/pytest-dev/pytest/commit/65bc43dc56d6152a2e9bd766961ad67b7b0f127c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M doc/en/goodpractices.rst
    M doc/en/nose.rst

  Log Message:
  -----------
  Merge pull request #3505 from Avira/tox-lowercase

Fix tox spelling (all lower case).


Compare: https://github.com/pytest-dev/pytest/compare/93fdad28aae2...65bc43dc56d6
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

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

From nicoddemus at gmail.com  Fri May 25 18:03:47 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 25 May 2018 15:03:47 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d41119: add the config
Message-ID: <5b088843a03ff_69372ad98ba87c14984b0@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d41119ed04b4b48e0d5db74d7a4ee29192d9e6b1
      https://github.com/pytest-dev/pytest/commit/d41119ed04b4b48e0d5db74d7a4ee29192d9e6b1
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

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

  Log Message:
  -----------
  add the config


  Commit: 9aacb4635e81edd6ecf281d4f6c0cfc8e94ab301
      https://github.com/pytest-dev/pytest/commit/9aacb4635e81edd6ecf281d4f6c0cfc8e94ab301
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark/legacy.py
    M _pytest/mark/structures.py
    M _pytest/outcomes.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/skipping.py
    M doc/en/example/assertion/failure_demo.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/deprecated_test.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_assertion.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_parseopt.py

  Log Message:
  -----------
  run pyupgrade


  Commit: 3b9e063fe8eea19504cea1bd7764c9631d0c8019
      https://github.com/pytest-dev/pytest/commit/3b9e063fe8eea19504cea1bd7764c9631d0c8019
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M bench/manyparam.py
    M doc/en/_templates/links.html
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.1.1.rst
    M doc/en/announce/release-2.1.2.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.1.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/announce/release-2.6.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.0.rst
    M doc/en/announce/release-2.7.2.rst
    M doc/en/announce/release-2.8.3.rst
    M doc/en/announce/release-2.8.7.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/bash-completion.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/check_sphinx.py
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/py2py3/test_py2.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/simple.rst
    M doc/en/funcarg_compare.rst
    M doc/en/funcargs.rst
    M doc/en/mark.rst
    M doc/en/nose.rst
    M doc/en/talks.rst
    M doc/en/test/index.rst
    M doc/en/test/plugin/django.rst
    M doc/en/writing_plugins.rst
    M extra/get_issues.py
    M testing/freeze/.gitignore

  Log Message:
  -----------
  fix line endings


  Commit: b60376dc289ceae886c7d54d3c5c4074d9969791
      https://github.com/pytest-dev/pytest/commit/b60376dc289ceae886c7d54d3c5c4074d9969791
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  add pre-commit to CONTRIBUTING.txt


  Commit: 86fc31db8d3b5ae33d18be43efdf23ff6f2ce040
      https://github.com/pytest-dev/pytest/commit/86fc31db8d3b5ae33d18be43efdf23ff6f2ce040
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CONTRIBUTING.rst
    M changelog/README.rst
    M doc/en/_themes/flask/theme.conf
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.1.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.2.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.1.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.4.1.rst
    M doc/en/announce/release-2.4.2.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.1.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.8.3.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/announce/release-2.9.1.rst
    M doc/en/announce/release-3.0.0.rst
    M doc/en/announce/release-3.0.1.rst
    M doc/en/announce/release-3.0.2.rst
    M doc/en/announce/release-3.0.3.rst
    M doc/en/announce/release-3.0.4.rst
    M doc/en/announce/release-3.0.5.rst
    M doc/en/announce/release-3.0.6.rst
    M doc/en/announce/release-3.0.7.rst
    M doc/en/announce/release-3.1.1.rst
    M doc/en/announce/release-3.1.2.rst
    M doc/en/announce/release-3.1.3.rst
    M doc/en/announce/release-3.2.1.rst
    M doc/en/announce/release-3.2.2.rst
    M doc/en/announce/release-3.2.3.rst
    M doc/en/announce/release-3.2.4.rst
    M doc/en/announce/release-3.2.5.rst
    M doc/en/announce/release-3.3.1.rst
    M doc/en/announce/release-3.3.2.rst
    M doc/en/announce/release-3.4.1.rst
    M doc/en/announce/release-3.4.2.rst
    M doc/en/announce/release-3.5.1.rst
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/contact.rst
    M doc/en/customize.rst
    M doc/en/development_guide.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/monkeypatch.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/test/config.html
    M doc/en/test/dist.html
    M doc/en/test/extend.html
    M doc/en/test/plugin/coverage.rst
    M doc/en/test/plugin/figleaf.rst
    M doc/en/test/test.html
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/xunit_setup.rst
    M tasks/release.patch.rst

  Log Message:
  -----------
  apply most other hooks and opt out of black reformating


  Commit: 3e1590bcfcce1a28619abc31425f407cb0459b75
      https://github.com/pytest-dev/pytest/commit/3e1590bcfcce1a28619abc31425f407cb0459b75
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M _pytest/fixtures.py
    M _pytest/recwarn.py
    M testing/test_mark.py

  Log Message:
  -----------
  sort out pyupgrade fallout


  Commit: 703e4b11ba76171eccd3f13e723c47b810ded7ef
      https://github.com/pytest-dev/pytest/commit/703e4b11ba76171eccd3f13e723c47b810ded7ef
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M _pytest/__init__.py
    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/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark/__init__.py
    M _pytest/mark/evaluate.py
    M _pytest/mark/legacy.py
    M _pytest/mark/structures.py
    M _pytest/monkeypatch.py
    M _pytest/nodes.py
    M _pytest/nose.py
    M _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    M bench/bench.py
    M bench/bench_argcomplete.py
    M bench/empty.py
    M bench/manyparam.py
    M bench/skip.py
    M doc/en/_themes/flask_theme_support.py
    M doc/en/announce/release-2.4.0.rst
    M doc/en/check_sphinx.py
    M doc/en/conf.py
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/costlysetup/sub_a/test_quick.py
    M doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/multipython.py
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/xfail_demo.py
    M doc/en/fixture.rst
    M doc/en/genapi.py
    M extra/get_issues.py
    M pytest.py
    M scripts/check-rst.py
    M setup.py
    M tasks/__init__.py
    M tasks/generate.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/logging/test_fixture.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/python/setup_only.py
    M testing/python/setup_plan.py
    M testing/python/show_fixtures_per_test.py
    M testing/python/test_deprecations.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py

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


  Commit: 3e08c4ee64dffa14450ca29b1ef8bc3f820a5b2b
      https://github.com/pytest-dev/pytest/commit/3e08c4ee64dffa14450ca29b1ef8bc3f820a5b2b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/compat.py
    M _pytest/fixtures.py
    M _pytest/python.py
    M _pytest/python_api.py
    M bench/bench.py
    M bench/bench_argcomplete.py
    M bench/skip.py
    M doc/en/check_sphinx.py
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/pythoncollection.py
    M extra/get_issues.py
    M testing/code/test_code.py
    M testing/python/collect.py
    M testing/test_capture.py
    M testing/test_collection.py

  Log Message:
  -----------
  sort out flake8 issues and unicode name usage


  Commit: d4bf2ff8f5f95fe63f114769af315e7080d37e3d
      https://github.com/pytest-dev/pytest/commit/d4bf2ff8f5f95fe63f114769af315e7080d37e3d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M testing/code/test_source.py

  Log Message:
  -----------
  fix test_source


  Commit: 57a55cd0a3d9adcf5437e357aa1f65631248ca90
      https://github.com/pytest-dev/pytest/commit/57a55cd0a3d9adcf5437e357aa1f65631248ca90
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M testing/code/test_source_multiline_block.py

  Log Message:
  -----------
  restore formatting of test_source_multiline_block


  Commit: 9ed1289b01f09a8f130460083c4d91d4ad6b5420
      https://github.com/pytest-dev/pytest/commit/9ed1289b01f09a8f130460083c4d91d4ad6b5420
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M testing/code/test_source_multiline_block.py

  Log Message:
  -----------
  run black on test_source_multiline_block.py


  Commit: 6eb7af5a4edaae0d4b8afcd946f1671c9deffe0f
      https://github.com/pytest-dev/pytest/commit/6eb7af5a4edaae0d4b8afcd946f1671c9deffe0f
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  experimentally add pre-commit for linting in travis


  Commit: df17bb2bd38a1f40bbd748c9cc7ae2c4b864949c
      https://github.com/pytest-dev/pytest/commit/df17bb2bd38a1f40bbd748c9cc7ae2c4b864949c
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M tox.ini

  Log Message:
  -----------
  switch linting tox env to use pre-commit, clean out travis linting env as unneeded


  Commit: 5a6a58076569292bd1ce84be514995d24c569e1d
      https://github.com/pytest-dev/pytest/commit/5a6a58076569292bd1ce84be514995d24c569e1d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  clean env for the linting stage


  Commit: 6f8547cc1a516a1615bb33fcc4c9fc0fc7196731
      https://github.com/pytest-dev/pytest/commit/6f8547cc1a516a1615bb33fcc4c9fc0fc7196731
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/python.py
    M _pytest/unittest.py
    A changelog/3491.bugfix.rst
    A changelog/3498.bugfix
    M doc/en/goodpractices.rst
    M doc/en/nose.rst
    M testing/test_junitxml.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Merge branch 'master' into pre-commit-hook


  Commit: 1b16d649f9c43573111af19d29f34fa7330aff88
      https://github.com/pytest-dev/pytest/commit/1b16d649f9c43573111af19d29f34fa7330aff88
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M _pytest/junitxml.py
    M changelog/3491.bugfix.rst
    M testing/test_junitxml.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Fix formatting of merged files


  Commit: 437a6fb224fefe6df8577d3299b31364372dbd14
      https://github.com/pytest-dev/pytest/commit/437a6fb224fefe6df8577d3299b31364372dbd14
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Add "black code-style" badge


  Commit: a36bab448f4b4a88e617cdaba7e80ed03a371244
      https://github.com/pytest-dev/pytest/commit/a36bab448f4b4a88e617cdaba7e80ed03a371244
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    A .pre-commit-config.yaml
    M .travis.yml
    M CONTRIBUTING.rst
    M README.rst
    M _pytest/__init__.py
    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/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark/__init__.py
    M _pytest/mark/evaluate.py
    M _pytest/mark/legacy.py
    M _pytest/mark/structures.py
    M _pytest/monkeypatch.py
    M _pytest/nodes.py
    M _pytest/nose.py
    M _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    M bench/bench.py
    M bench/bench_argcomplete.py
    M bench/empty.py
    M bench/manyparam.py
    M bench/skip.py
    M changelog/3491.bugfix.rst
    M changelog/README.rst
    M doc/en/_templates/links.html
    M doc/en/_themes/flask/theme.conf
    M doc/en/_themes/flask_theme_support.py
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.1.1.rst
    M doc/en/announce/release-2.1.2.rst
    M doc/en/announce/release-2.1.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.2.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.1.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.4.1.rst
    M doc/en/announce/release-2.4.2.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.1.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/announce/release-2.6.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.0.rst
    M doc/en/announce/release-2.7.2.rst
    M doc/en/announce/release-2.8.3.rst
    M doc/en/announce/release-2.8.7.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/announce/release-2.9.1.rst
    M doc/en/announce/release-3.0.0.rst
    M doc/en/announce/release-3.0.1.rst
    M doc/en/announce/release-3.0.2.rst
    M doc/en/announce/release-3.0.3.rst
    M doc/en/announce/release-3.0.4.rst
    M doc/en/announce/release-3.0.5.rst
    M doc/en/announce/release-3.0.6.rst
    M doc/en/announce/release-3.0.7.rst
    M doc/en/announce/release-3.1.1.rst
    M doc/en/announce/release-3.1.2.rst
    M doc/en/announce/release-3.1.3.rst
    M doc/en/announce/release-3.2.1.rst
    M doc/en/announce/release-3.2.2.rst
    M doc/en/announce/release-3.2.3.rst
    M doc/en/announce/release-3.2.4.rst
    M doc/en/announce/release-3.2.5.rst
    M doc/en/announce/release-3.3.1.rst
    M doc/en/announce/release-3.3.2.rst
    M doc/en/announce/release-3.4.1.rst
    M doc/en/announce/release-3.4.2.rst
    M doc/en/announce/release-3.5.1.rst
    M doc/en/assert.rst
    M doc/en/bash-completion.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/check_sphinx.py
    M doc/en/conf.py
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/development_guide.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/costlysetup/sub_a/test_quick.py
    M doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/parametrize.rst
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/py2py3/test_py2.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/xfail_demo.py
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/funcargs.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/mark.rst
    M doc/en/monkeypatch.rst
    M doc/en/nose.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/talks.rst
    M doc/en/test/config.html
    M doc/en/test/dist.html
    M doc/en/test/extend.html
    M doc/en/test/index.rst
    M doc/en/test/plugin/coverage.rst
    M doc/en/test/plugin/django.rst
    M doc/en/test/plugin/figleaf.rst
    M doc/en/test/test.html
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M doc/en/xunit_setup.rst
    M extra/get_issues.py
    M pytest.py
    M scripts/check-rst.py
    M setup.py
    M tasks/__init__.py
    M tasks/generate.py
    M tasks/release.patch.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/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/freeze/.gitignore
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/logging/test_fixture.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/python/setup_only.py
    M testing/python/setup_plan.py
    M testing/python/show_fixtures_per_test.py
    M testing/python/test_deprecations.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3485 from RonnyPfannschmidt/pre-commit-hook

adapt Pre commit hook and black


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

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

From nicoddemus at gmail.com  Fri May 25 18:09:15 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 25 May 2018 15:09:15 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] afde9f: Update number of tests
 in email template
Message-ID: <5b08898b1b0ff_e032ab4707f9c081782@hookshot-fe-b0febf1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: afde9f07f7303511dec3b74850f0e10b1579393b
      https://github.com/pytest-dev/pytest/commit/afde9f07f7303511dec3b74850f0e10b1579393b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M tasks/release.minor.rst

  Log Message:
  -----------
  Update number of tests in email template


  Commit: d41119ed04b4b48e0d5db74d7a4ee29192d9e6b1
      https://github.com/pytest-dev/pytest/commit/d41119ed04b4b48e0d5db74d7a4ee29192d9e6b1
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

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

  Log Message:
  -----------
  add the config


  Commit: 9aacb4635e81edd6ecf281d4f6c0cfc8e94ab301
      https://github.com/pytest-dev/pytest/commit/9aacb4635e81edd6ecf281d4f6c0cfc8e94ab301
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark/legacy.py
    M _pytest/mark/structures.py
    M _pytest/outcomes.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/skipping.py
    M doc/en/example/assertion/failure_demo.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/deprecated_test.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_assertion.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_parseopt.py

  Log Message:
  -----------
  run pyupgrade


  Commit: 3b9e063fe8eea19504cea1bd7764c9631d0c8019
      https://github.com/pytest-dev/pytest/commit/3b9e063fe8eea19504cea1bd7764c9631d0c8019
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M bench/manyparam.py
    M doc/en/_templates/links.html
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.1.1.rst
    M doc/en/announce/release-2.1.2.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.1.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/announce/release-2.6.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.0.rst
    M doc/en/announce/release-2.7.2.rst
    M doc/en/announce/release-2.8.3.rst
    M doc/en/announce/release-2.8.7.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/bash-completion.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/check_sphinx.py
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/py2py3/test_py2.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/simple.rst
    M doc/en/funcarg_compare.rst
    M doc/en/funcargs.rst
    M doc/en/mark.rst
    M doc/en/nose.rst
    M doc/en/talks.rst
    M doc/en/test/index.rst
    M doc/en/test/plugin/django.rst
    M doc/en/writing_plugins.rst
    M extra/get_issues.py
    M testing/freeze/.gitignore

  Log Message:
  -----------
  fix line endings


  Commit: b60376dc289ceae886c7d54d3c5c4074d9969791
      https://github.com/pytest-dev/pytest/commit/b60376dc289ceae886c7d54d3c5c4074d9969791
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  add pre-commit to CONTRIBUTING.txt


  Commit: 86fc31db8d3b5ae33d18be43efdf23ff6f2ce040
      https://github.com/pytest-dev/pytest/commit/86fc31db8d3b5ae33d18be43efdf23ff6f2ce040
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CONTRIBUTING.rst
    M changelog/README.rst
    M doc/en/_themes/flask/theme.conf
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.1.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.2.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.1.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.4.1.rst
    M doc/en/announce/release-2.4.2.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.1.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.8.3.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/announce/release-2.9.1.rst
    M doc/en/announce/release-3.0.0.rst
    M doc/en/announce/release-3.0.1.rst
    M doc/en/announce/release-3.0.2.rst
    M doc/en/announce/release-3.0.3.rst
    M doc/en/announce/release-3.0.4.rst
    M doc/en/announce/release-3.0.5.rst
    M doc/en/announce/release-3.0.6.rst
    M doc/en/announce/release-3.0.7.rst
    M doc/en/announce/release-3.1.1.rst
    M doc/en/announce/release-3.1.2.rst
    M doc/en/announce/release-3.1.3.rst
    M doc/en/announce/release-3.2.1.rst
    M doc/en/announce/release-3.2.2.rst
    M doc/en/announce/release-3.2.3.rst
    M doc/en/announce/release-3.2.4.rst
    M doc/en/announce/release-3.2.5.rst
    M doc/en/announce/release-3.3.1.rst
    M doc/en/announce/release-3.3.2.rst
    M doc/en/announce/release-3.4.1.rst
    M doc/en/announce/release-3.4.2.rst
    M doc/en/announce/release-3.5.1.rst
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/contact.rst
    M doc/en/customize.rst
    M doc/en/development_guide.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/monkeypatch.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/test/config.html
    M doc/en/test/dist.html
    M doc/en/test/extend.html
    M doc/en/test/plugin/coverage.rst
    M doc/en/test/plugin/figleaf.rst
    M doc/en/test/test.html
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/xunit_setup.rst
    M tasks/release.patch.rst

  Log Message:
  -----------
  apply most other hooks and opt out of black reformating


  Commit: 3e1590bcfcce1a28619abc31425f407cb0459b75
      https://github.com/pytest-dev/pytest/commit/3e1590bcfcce1a28619abc31425f407cb0459b75
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M _pytest/fixtures.py
    M _pytest/recwarn.py
    M testing/test_mark.py

  Log Message:
  -----------
  sort out pyupgrade fallout


  Commit: 703e4b11ba76171eccd3f13e723c47b810ded7ef
      https://github.com/pytest-dev/pytest/commit/703e4b11ba76171eccd3f13e723c47b810ded7ef
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M _pytest/__init__.py
    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/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark/__init__.py
    M _pytest/mark/evaluate.py
    M _pytest/mark/legacy.py
    M _pytest/mark/structures.py
    M _pytest/monkeypatch.py
    M _pytest/nodes.py
    M _pytest/nose.py
    M _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    M bench/bench.py
    M bench/bench_argcomplete.py
    M bench/empty.py
    M bench/manyparam.py
    M bench/skip.py
    M doc/en/_themes/flask_theme_support.py
    M doc/en/announce/release-2.4.0.rst
    M doc/en/check_sphinx.py
    M doc/en/conf.py
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/costlysetup/sub_a/test_quick.py
    M doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/multipython.py
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/xfail_demo.py
    M doc/en/fixture.rst
    M doc/en/genapi.py
    M extra/get_issues.py
    M pytest.py
    M scripts/check-rst.py
    M setup.py
    M tasks/__init__.py
    M tasks/generate.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/logging/test_fixture.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/python/setup_only.py
    M testing/python/setup_plan.py
    M testing/python/show_fixtures_per_test.py
    M testing/python/test_deprecations.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py

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


  Commit: 3e08c4ee64dffa14450ca29b1ef8bc3f820a5b2b
      https://github.com/pytest-dev/pytest/commit/3e08c4ee64dffa14450ca29b1ef8bc3f820a5b2b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/compat.py
    M _pytest/fixtures.py
    M _pytest/python.py
    M _pytest/python_api.py
    M bench/bench.py
    M bench/bench_argcomplete.py
    M bench/skip.py
    M doc/en/check_sphinx.py
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/pythoncollection.py
    M extra/get_issues.py
    M testing/code/test_code.py
    M testing/python/collect.py
    M testing/test_capture.py
    M testing/test_collection.py

  Log Message:
  -----------
  sort out flake8 issues and unicode name usage


  Commit: d4bf2ff8f5f95fe63f114769af315e7080d37e3d
      https://github.com/pytest-dev/pytest/commit/d4bf2ff8f5f95fe63f114769af315e7080d37e3d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M testing/code/test_source.py

  Log Message:
  -----------
  fix test_source


  Commit: 57a55cd0a3d9adcf5437e357aa1f65631248ca90
      https://github.com/pytest-dev/pytest/commit/57a55cd0a3d9adcf5437e357aa1f65631248ca90
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M testing/code/test_source_multiline_block.py

  Log Message:
  -----------
  restore formatting of test_source_multiline_block


  Commit: 6c519b12802347b257840c4d286ca0bf94cd92a5
      https://github.com/pytest-dev/pytest/commit/6c519b12802347b257840c4d286ca0bf94cd92a5
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M _pytest/junitxml.py
    A changelog/3491.bugfix.rst
    M testing/test_junitxml.py

  Log Message:
  -----------
  Fixed a bug where stdout and stderr were logged twice by junitxml.


  Commit: 210ad22dbe6d61a4dcfb9a1f431058e6a8c26bad
      https://github.com/pytest-dev/pytest/commit/210ad22dbe6d61a4dcfb9a1f431058e6a8c26bad
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M changelog/3491.bugfix.rst

  Log Message:
  -----------
  Updating changelog text


  Commit: b4e02656226ca74fd0676668926e20e5bceeebf0
      https://github.com/pytest-dev/pytest/commit/b4e02656226ca74fd0676668926e20e5bceeebf0
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M testing/test_junitxml.py

  Log Message:
  -----------
  Removed whitespace from empty line.


  Commit: 74cfdc5feb9b07ff538b6c85d864437aadeb314e
      https://github.com/pytest-dev/pytest/commit/74cfdc5feb9b07ff538b6c85d864437aadeb314e
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M testing/test_unittest.py

  Log Message:
  -----------
  add failing test for #3498


  Commit: da2c2e8492c85b315d3cc0892a69ff2fc9c259e8
      https://github.com/pytest-dev/pytest/commit/da2c2e8492c85b315d3cc0892a69ff2fc9c259e8
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M testing/test_unittest.py

  Log Message:
  -----------
  more debugging for #3498


  Commit: 5a0c9aca639596b9d0bf5d909462b0435afda244
      https://github.com/pytest-dev/pytest/commit/5a0c9aca639596b9d0bf5d909462b0435afda244
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/python.py
    M _pytest/unittest.py
    A changelog/3498.bugfix

  Log Message:
  -----------
  correctly instantiate fixtureinfo for unittest tests, fixes #3498


  Commit: 9ed1289b01f09a8f130460083c4d91d4ad6b5420
      https://github.com/pytest-dev/pytest/commit/9ed1289b01f09a8f130460083c4d91d4ad6b5420
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M testing/code/test_source_multiline_block.py

  Log Message:
  -----------
  run black on test_source_multiline_block.py


  Commit: bc25d51b2f59a92df28c37b436b21aa311a30913
      https://github.com/pytest-dev/pytest/commit/bc25d51b2f59a92df28c37b436b21aa311a30913
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M changelog/3498.bugfix

  Log Message:
  -----------
  Re-word changelog


  Commit: 6eb7af5a4edaae0d4b8afcd946f1671c9deffe0f
      https://github.com/pytest-dev/pytest/commit/6eb7af5a4edaae0d4b8afcd946f1671c9deffe0f
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  experimentally add pre-commit for linting in travis


  Commit: df17bb2bd38a1f40bbd748c9cc7ae2c4b864949c
      https://github.com/pytest-dev/pytest/commit/df17bb2bd38a1f40bbd748c9cc7ae2c4b864949c
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M tox.ini

  Log Message:
  -----------
  switch linting tox env to use pre-commit, clean out travis linting env as unneeded


  Commit: 5a6a58076569292bd1ce84be514995d24c569e1d
      https://github.com/pytest-dev/pytest/commit/5a6a58076569292bd1ce84be514995d24c569e1d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  clean env for the linting stage


  Commit: 48215fdcb90baf9abc1f83661d9d8be3e72a4b22
      https://github.com/pytest-dev/pytest/commit/48215fdcb90baf9abc1f83661d9d8be3e72a4b22
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/python.py
    M _pytest/unittest.py
    A changelog/3498.bugfix
    M testing/test_unittest.py

  Log Message:
  -----------
  Merge pull request #3500 from RonnyPfannschmidt/fix-3498-unittest-marks

fix #3498 - correctly consider marks on unittest classes


  Commit: 93fdad28aae28342940156701b813f6743b6e317
      https://github.com/pytest-dev/pytest/commit/93fdad28aae28342940156701b813f6743b6e317
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M _pytest/junitxml.py
    A changelog/3491.bugfix.rst
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #3499 from jeffreyrack/3491-junit-logging

3491 - Fixed a bug where stdout and stderr were logged twice by junitxml for xfail tests.


  Commit: c55635d42a6e6bab35307f5d728dfff0b3161901
      https://github.com/pytest-dev/pytest/commit/c55635d42a6e6bab35307f5d728dfff0b3161901
  Author: Oliver Bestwalter <oliver.bestwalter at avira.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M doc/en/goodpractices.rst
    M doc/en/nose.rst

  Log Message:
  -----------
  Fix tox spelling (all lower case).


  Commit: 65bc43dc56d6152a2e9bd766961ad67b7b0f127c
      https://github.com/pytest-dev/pytest/commit/65bc43dc56d6152a2e9bd766961ad67b7b0f127c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M doc/en/goodpractices.rst
    M doc/en/nose.rst

  Log Message:
  -----------
  Merge pull request #3505 from Avira/tox-lowercase

Fix tox spelling (all lower case).


  Commit: 6f8547cc1a516a1615bb33fcc4c9fc0fc7196731
      https://github.com/pytest-dev/pytest/commit/6f8547cc1a516a1615bb33fcc4c9fc0fc7196731
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/python.py
    M _pytest/unittest.py
    A changelog/3491.bugfix.rst
    A changelog/3498.bugfix
    M doc/en/goodpractices.rst
    M doc/en/nose.rst
    M testing/test_junitxml.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Merge branch 'master' into pre-commit-hook


  Commit: 1b16d649f9c43573111af19d29f34fa7330aff88
      https://github.com/pytest-dev/pytest/commit/1b16d649f9c43573111af19d29f34fa7330aff88
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M _pytest/junitxml.py
    M changelog/3491.bugfix.rst
    M testing/test_junitxml.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Fix formatting of merged files


  Commit: 437a6fb224fefe6df8577d3299b31364372dbd14
      https://github.com/pytest-dev/pytest/commit/437a6fb224fefe6df8577d3299b31364372dbd14
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Add "black code-style" badge


  Commit: a36bab448f4b4a88e617cdaba7e80ed03a371244
      https://github.com/pytest-dev/pytest/commit/a36bab448f4b4a88e617cdaba7e80ed03a371244
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    A .pre-commit-config.yaml
    M .travis.yml
    M CONTRIBUTING.rst
    M README.rst
    M _pytest/__init__.py
    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/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark/__init__.py
    M _pytest/mark/evaluate.py
    M _pytest/mark/legacy.py
    M _pytest/mark/structures.py
    M _pytest/monkeypatch.py
    M _pytest/nodes.py
    M _pytest/nose.py
    M _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    M bench/bench.py
    M bench/bench_argcomplete.py
    M bench/empty.py
    M bench/manyparam.py
    M bench/skip.py
    M changelog/3491.bugfix.rst
    M changelog/README.rst
    M doc/en/_templates/links.html
    M doc/en/_themes/flask/theme.conf
    M doc/en/_themes/flask_theme_support.py
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.1.1.rst
    M doc/en/announce/release-2.1.2.rst
    M doc/en/announce/release-2.1.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.2.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.1.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.4.1.rst
    M doc/en/announce/release-2.4.2.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.1.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/announce/release-2.6.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.0.rst
    M doc/en/announce/release-2.7.2.rst
    M doc/en/announce/release-2.8.3.rst
    M doc/en/announce/release-2.8.7.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/announce/release-2.9.1.rst
    M doc/en/announce/release-3.0.0.rst
    M doc/en/announce/release-3.0.1.rst
    M doc/en/announce/release-3.0.2.rst
    M doc/en/announce/release-3.0.3.rst
    M doc/en/announce/release-3.0.4.rst
    M doc/en/announce/release-3.0.5.rst
    M doc/en/announce/release-3.0.6.rst
    M doc/en/announce/release-3.0.7.rst
    M doc/en/announce/release-3.1.1.rst
    M doc/en/announce/release-3.1.2.rst
    M doc/en/announce/release-3.1.3.rst
    M doc/en/announce/release-3.2.1.rst
    M doc/en/announce/release-3.2.2.rst
    M doc/en/announce/release-3.2.3.rst
    M doc/en/announce/release-3.2.4.rst
    M doc/en/announce/release-3.2.5.rst
    M doc/en/announce/release-3.3.1.rst
    M doc/en/announce/release-3.3.2.rst
    M doc/en/announce/release-3.4.1.rst
    M doc/en/announce/release-3.4.2.rst
    M doc/en/announce/release-3.5.1.rst
    M doc/en/assert.rst
    M doc/en/bash-completion.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/check_sphinx.py
    M doc/en/conf.py
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/development_guide.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/costlysetup/sub_a/test_quick.py
    M doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/parametrize.rst
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/py2py3/test_py2.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/xfail_demo.py
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/funcargs.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/mark.rst
    M doc/en/monkeypatch.rst
    M doc/en/nose.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/talks.rst
    M doc/en/test/config.html
    M doc/en/test/dist.html
    M doc/en/test/extend.html
    M doc/en/test/index.rst
    M doc/en/test/plugin/coverage.rst
    M doc/en/test/plugin/django.rst
    M doc/en/test/plugin/figleaf.rst
    M doc/en/test/test.html
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M doc/en/xunit_setup.rst
    M extra/get_issues.py
    M pytest.py
    M scripts/check-rst.py
    M setup.py
    M tasks/__init__.py
    M tasks/generate.py
    M tasks/release.patch.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/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/freeze/.gitignore
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/logging/test_fixture.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/python/setup_only.py
    M testing/python/setup_plan.py
    M testing/python/show_fixtures_per_test.py
    M testing/python/test_deprecations.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3485 from RonnyPfannschmidt/pre-commit-hook

adapt Pre commit hook and black


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

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

From nicoddemus at gmail.com  Fri May 25 20:24:47 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 25 May 2018 17:24:47 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b5a94d: Write rewritten code
 using file.write(marshal.dump...
Message-ID: <5b08a94fac73c_626a2adf93309c18146a@hookshot-fe-da92815.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: b5a94d8e6c49201c8c79a7c52b8466e020e6d6b8
      https://github.com/pytest-dev/pytest/commit/b5a94d8e6c49201c8c79a7c52b8466e020e6d6b8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M _pytest/assertion/rewrite.py
    A changelog/3503.bugfix.rst

  Log Message:
  -----------
  Write rewritten code using file.write(marshal.dumps())

This works around the fact that some libraries might monkey patch
the file object, so the previous approach of marshal.dump(co, file)
breaks because file is not a built-in file object anymore.

Fix #3503


  Commit: 1d451c786d15fc6978e451c42c0e7e889c83fc12
      https://github.com/pytest-dev/pytest/commit/1d451c786d15fc6978e451c42c0e7e889c83fc12
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M _pytest/assertion/rewrite.py
    A changelog/3503.bugfix.rst

  Log Message:
  -----------
  Merge pull request #3509 from nicoddemus/marshal-3503

Write rewritten code using file.write(marshal.dumps())


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

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

From nicoddemus at gmail.com  Sat May 26 09:36:25 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 26 May 2018 06:36:25 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] eaa882: switch to src layout
Message-ID: <5b0962d98e608_75c32afbbce81c04113f2@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: eaa882f3d5340956beb176aa1753e07e3f3f2190
      https://github.com/pytest-dev/pytest/commit/eaa882f3d5340956beb176aa1753e07e3f3f2190
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-26 (Sat, 26 May 2018)

  Changed paths:
    M .gitignore
    R _pytest/__init__.py
    R _pytest/_argcomplete.py
    R _pytest/_code/__init__.py
    R _pytest/_code/_py2traceback.py
    R _pytest/_code/code.py
    R _pytest/_code/source.py
    R _pytest/assertion/__init__.py
    R _pytest/assertion/rewrite.py
    R _pytest/assertion/truncate.py
    R _pytest/assertion/util.py
    R _pytest/cacheprovider.py
    R _pytest/capture.py
    R _pytest/compat.py
    R _pytest/config.py
    R _pytest/debugging.py
    R _pytest/deprecated.py
    R _pytest/doctest.py
    R _pytest/fixtures.py
    R _pytest/freeze_support.py
    R _pytest/helpconfig.py
    R _pytest/hookspec.py
    R _pytest/junitxml.py
    R _pytest/logging.py
    R _pytest/main.py
    R _pytest/mark/__init__.py
    R _pytest/mark/evaluate.py
    R _pytest/mark/legacy.py
    R _pytest/mark/structures.py
    R _pytest/monkeypatch.py
    R _pytest/nodes.py
    R _pytest/nose.py
    R _pytest/outcomes.py
    R _pytest/pastebin.py
    R _pytest/pytester.py
    R _pytest/python.py
    R _pytest/python_api.py
    R _pytest/recwarn.py
    R _pytest/resultlog.py
    R _pytest/runner.py
    R _pytest/setuponly.py
    R _pytest/setupplan.py
    R _pytest/skipping.py
    R _pytest/terminal.py
    R _pytest/tmpdir.py
    R _pytest/unittest.py
    R _pytest/warnings.py
    A changelog/3513.trivial.rst
    R pytest.py
    M setup.py
    A src/_pytest/__init__.py
    A src/_pytest/_argcomplete.py
    A src/_pytest/_code/__init__.py
    A src/_pytest/_code/_py2traceback.py
    A src/_pytest/_code/code.py
    A src/_pytest/_code/source.py
    A src/_pytest/assertion/__init__.py
    A src/_pytest/assertion/rewrite.py
    A src/_pytest/assertion/truncate.py
    A src/_pytest/assertion/util.py
    A src/_pytest/cacheprovider.py
    A src/_pytest/capture.py
    A src/_pytest/compat.py
    A src/_pytest/config.py
    A src/_pytest/debugging.py
    A src/_pytest/deprecated.py
    A src/_pytest/doctest.py
    A src/_pytest/fixtures.py
    A src/_pytest/freeze_support.py
    A src/_pytest/helpconfig.py
    A src/_pytest/hookspec.py
    A src/_pytest/junitxml.py
    A src/_pytest/logging.py
    A src/_pytest/main.py
    A src/_pytest/mark/__init__.py
    A src/_pytest/mark/evaluate.py
    A src/_pytest/mark/legacy.py
    A src/_pytest/mark/structures.py
    A src/_pytest/monkeypatch.py
    A src/_pytest/nodes.py
    A src/_pytest/nose.py
    A src/_pytest/outcomes.py
    A src/_pytest/pastebin.py
    A src/_pytest/pytester.py
    A src/_pytest/python.py
    A src/_pytest/python_api.py
    A src/_pytest/recwarn.py
    A src/_pytest/resultlog.py
    A src/_pytest/runner.py
    A src/_pytest/setuponly.py
    A src/_pytest/setupplan.py
    A src/_pytest/skipping.py
    A src/_pytest/terminal.py
    A src/_pytest/tmpdir.py
    A src/_pytest/unittest.py
    A src/_pytest/warnings.py
    A src/pytest.py

  Log Message:
  -----------
  switch to src layout


  Commit: 075faa5e2b860151a7680cb1d4c50590d3b619cf
      https://github.com/pytest-dev/pytest/commit/075faa5e2b860151a7680cb1d4c50590d3b619cf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-26 (Sat, 26 May 2018)

  Changed paths:
    M .gitignore
    R _pytest/__init__.py
    R _pytest/_argcomplete.py
    R _pytest/_code/__init__.py
    R _pytest/_code/_py2traceback.py
    R _pytest/_code/code.py
    R _pytest/_code/source.py
    R _pytest/assertion/__init__.py
    R _pytest/assertion/rewrite.py
    R _pytest/assertion/truncate.py
    R _pytest/assertion/util.py
    R _pytest/cacheprovider.py
    R _pytest/capture.py
    R _pytest/compat.py
    R _pytest/config.py
    R _pytest/debugging.py
    R _pytest/deprecated.py
    R _pytest/doctest.py
    R _pytest/fixtures.py
    R _pytest/freeze_support.py
    R _pytest/helpconfig.py
    R _pytest/hookspec.py
    R _pytest/junitxml.py
    R _pytest/logging.py
    R _pytest/main.py
    R _pytest/mark/__init__.py
    R _pytest/mark/evaluate.py
    R _pytest/mark/legacy.py
    R _pytest/mark/structures.py
    R _pytest/monkeypatch.py
    R _pytest/nodes.py
    R _pytest/nose.py
    R _pytest/outcomes.py
    R _pytest/pastebin.py
    R _pytest/pytester.py
    R _pytest/python.py
    R _pytest/python_api.py
    R _pytest/recwarn.py
    R _pytest/resultlog.py
    R _pytest/runner.py
    R _pytest/setuponly.py
    R _pytest/setupplan.py
    R _pytest/skipping.py
    R _pytest/terminal.py
    R _pytest/tmpdir.py
    R _pytest/unittest.py
    R _pytest/warnings.py
    A changelog/3513.trivial.rst
    R pytest.py
    M setup.py
    A src/_pytest/__init__.py
    A src/_pytest/_argcomplete.py
    A src/_pytest/_code/__init__.py
    A src/_pytest/_code/_py2traceback.py
    A src/_pytest/_code/code.py
    A src/_pytest/_code/source.py
    A src/_pytest/assertion/__init__.py
    A src/_pytest/assertion/rewrite.py
    A src/_pytest/assertion/truncate.py
    A src/_pytest/assertion/util.py
    A src/_pytest/cacheprovider.py
    A src/_pytest/capture.py
    A src/_pytest/compat.py
    A src/_pytest/config.py
    A src/_pytest/debugging.py
    A src/_pytest/deprecated.py
    A src/_pytest/doctest.py
    A src/_pytest/fixtures.py
    A src/_pytest/freeze_support.py
    A src/_pytest/helpconfig.py
    A src/_pytest/hookspec.py
    A src/_pytest/junitxml.py
    A src/_pytest/logging.py
    A src/_pytest/main.py
    A src/_pytest/mark/__init__.py
    A src/_pytest/mark/evaluate.py
    A src/_pytest/mark/legacy.py
    A src/_pytest/mark/structures.py
    A src/_pytest/monkeypatch.py
    A src/_pytest/nodes.py
    A src/_pytest/nose.py
    A src/_pytest/outcomes.py
    A src/_pytest/pastebin.py
    A src/_pytest/pytester.py
    A src/_pytest/python.py
    A src/_pytest/python_api.py
    A src/_pytest/recwarn.py
    A src/_pytest/resultlog.py
    A src/_pytest/runner.py
    A src/_pytest/setuponly.py
    A src/_pytest/setupplan.py
    A src/_pytest/skipping.py
    A src/_pytest/terminal.py
    A src/_pytest/tmpdir.py
    A src/_pytest/unittest.py
    A src/_pytest/warnings.py
    A src/pytest.py

  Log Message:
  -----------
  Merge pull request #3513 from RonnyPfannschmidt/src-layout

switch to src layout


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

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

From nicoddemus at gmail.com  Sat May 26 09:39:48 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 26 May 2018 06:39:48 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b5a94d: Write rewritten code
 using file.write(marshal.dump...
Message-ID: <5b0963a431952_2b5b2abf53cedc08457b9@hookshot-fe-cace476.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: b5a94d8e6c49201c8c79a7c52b8466e020e6d6b8
      https://github.com/pytest-dev/pytest/commit/b5a94d8e6c49201c8c79a7c52b8466e020e6d6b8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M _pytest/assertion/rewrite.py
    A changelog/3503.bugfix.rst

  Log Message:
  -----------
  Write rewritten code using file.write(marshal.dumps())

This works around the fact that some libraries might monkey patch
the file object, so the previous approach of marshal.dump(co, file)
breaks because file is not a built-in file object anymore.

Fix #3503


  Commit: 1d451c786d15fc6978e451c42c0e7e889c83fc12
      https://github.com/pytest-dev/pytest/commit/1d451c786d15fc6978e451c42c0e7e889c83fc12
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M _pytest/assertion/rewrite.py
    A changelog/3503.bugfix.rst

  Log Message:
  -----------
  Merge pull request #3509 from nicoddemus/marshal-3503

Write rewritten code using file.write(marshal.dumps())


  Commit: 2a8463c7455dbcc10fe7b5552c3b31f37d0cc8aa
      https://github.com/pytest-dev/pytest/commit/2a8463c7455dbcc10fe7b5552c3b31f37d0cc8aa
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    R scripts/check-rst.py

  Log Message:
  -----------
  Call rst-lint directly with pre-commit


  Commit: ee6c54904b236fae0a15245ac0317a1818e71afc
      https://github.com/pytest-dev/pytest/commit/ee6c54904b236fae0a15245ac0317a1818e71afc
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-26 (Sat, 26 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    R scripts/check-rst.py

  Log Message:
  -----------
  Merge pull request #3512 from asottile/rst_via_pre_commit

Call rst-lint directly with pre-commit


  Commit: eaa882f3d5340956beb176aa1753e07e3f3f2190
      https://github.com/pytest-dev/pytest/commit/eaa882f3d5340956beb176aa1753e07e3f3f2190
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-26 (Sat, 26 May 2018)

  Changed paths:
    M .gitignore
    R _pytest/__init__.py
    R _pytest/_argcomplete.py
    R _pytest/_code/__init__.py
    R _pytest/_code/_py2traceback.py
    R _pytest/_code/code.py
    R _pytest/_code/source.py
    R _pytest/assertion/__init__.py
    R _pytest/assertion/rewrite.py
    R _pytest/assertion/truncate.py
    R _pytest/assertion/util.py
    R _pytest/cacheprovider.py
    R _pytest/capture.py
    R _pytest/compat.py
    R _pytest/config.py
    R _pytest/debugging.py
    R _pytest/deprecated.py
    R _pytest/doctest.py
    R _pytest/fixtures.py
    R _pytest/freeze_support.py
    R _pytest/helpconfig.py
    R _pytest/hookspec.py
    R _pytest/junitxml.py
    R _pytest/logging.py
    R _pytest/main.py
    R _pytest/mark/__init__.py
    R _pytest/mark/evaluate.py
    R _pytest/mark/legacy.py
    R _pytest/mark/structures.py
    R _pytest/monkeypatch.py
    R _pytest/nodes.py
    R _pytest/nose.py
    R _pytest/outcomes.py
    R _pytest/pastebin.py
    R _pytest/pytester.py
    R _pytest/python.py
    R _pytest/python_api.py
    R _pytest/recwarn.py
    R _pytest/resultlog.py
    R _pytest/runner.py
    R _pytest/setuponly.py
    R _pytest/setupplan.py
    R _pytest/skipping.py
    R _pytest/terminal.py
    R _pytest/tmpdir.py
    R _pytest/unittest.py
    R _pytest/warnings.py
    A changelog/3513.trivial.rst
    R pytest.py
    M setup.py
    A src/_pytest/__init__.py
    A src/_pytest/_argcomplete.py
    A src/_pytest/_code/__init__.py
    A src/_pytest/_code/_py2traceback.py
    A src/_pytest/_code/code.py
    A src/_pytest/_code/source.py
    A src/_pytest/assertion/__init__.py
    A src/_pytest/assertion/rewrite.py
    A src/_pytest/assertion/truncate.py
    A src/_pytest/assertion/util.py
    A src/_pytest/cacheprovider.py
    A src/_pytest/capture.py
    A src/_pytest/compat.py
    A src/_pytest/config.py
    A src/_pytest/debugging.py
    A src/_pytest/deprecated.py
    A src/_pytest/doctest.py
    A src/_pytest/fixtures.py
    A src/_pytest/freeze_support.py
    A src/_pytest/helpconfig.py
    A src/_pytest/hookspec.py
    A src/_pytest/junitxml.py
    A src/_pytest/logging.py
    A src/_pytest/main.py
    A src/_pytest/mark/__init__.py
    A src/_pytest/mark/evaluate.py
    A src/_pytest/mark/legacy.py
    A src/_pytest/mark/structures.py
    A src/_pytest/monkeypatch.py
    A src/_pytest/nodes.py
    A src/_pytest/nose.py
    A src/_pytest/outcomes.py
    A src/_pytest/pastebin.py
    A src/_pytest/pytester.py
    A src/_pytest/python.py
    A src/_pytest/python_api.py
    A src/_pytest/recwarn.py
    A src/_pytest/resultlog.py
    A src/_pytest/runner.py
    A src/_pytest/setuponly.py
    A src/_pytest/setupplan.py
    A src/_pytest/skipping.py
    A src/_pytest/terminal.py
    A src/_pytest/tmpdir.py
    A src/_pytest/unittest.py
    A src/_pytest/warnings.py
    A src/pytest.py

  Log Message:
  -----------
  switch to src layout


  Commit: 075faa5e2b860151a7680cb1d4c50590d3b619cf
      https://github.com/pytest-dev/pytest/commit/075faa5e2b860151a7680cb1d4c50590d3b619cf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-26 (Sat, 26 May 2018)

  Changed paths:
    M .gitignore
    R _pytest/__init__.py
    R _pytest/_argcomplete.py
    R _pytest/_code/__init__.py
    R _pytest/_code/_py2traceback.py
    R _pytest/_code/code.py
    R _pytest/_code/source.py
    R _pytest/assertion/__init__.py
    R _pytest/assertion/rewrite.py
    R _pytest/assertion/truncate.py
    R _pytest/assertion/util.py
    R _pytest/cacheprovider.py
    R _pytest/capture.py
    R _pytest/compat.py
    R _pytest/config.py
    R _pytest/debugging.py
    R _pytest/deprecated.py
    R _pytest/doctest.py
    R _pytest/fixtures.py
    R _pytest/freeze_support.py
    R _pytest/helpconfig.py
    R _pytest/hookspec.py
    R _pytest/junitxml.py
    R _pytest/logging.py
    R _pytest/main.py
    R _pytest/mark/__init__.py
    R _pytest/mark/evaluate.py
    R _pytest/mark/legacy.py
    R _pytest/mark/structures.py
    R _pytest/monkeypatch.py
    R _pytest/nodes.py
    R _pytest/nose.py
    R _pytest/outcomes.py
    R _pytest/pastebin.py
    R _pytest/pytester.py
    R _pytest/python.py
    R _pytest/python_api.py
    R _pytest/recwarn.py
    R _pytest/resultlog.py
    R _pytest/runner.py
    R _pytest/setuponly.py
    R _pytest/setupplan.py
    R _pytest/skipping.py
    R _pytest/terminal.py
    R _pytest/tmpdir.py
    R _pytest/unittest.py
    R _pytest/warnings.py
    A changelog/3513.trivial.rst
    R pytest.py
    M setup.py
    A src/_pytest/__init__.py
    A src/_pytest/_argcomplete.py
    A src/_pytest/_code/__init__.py
    A src/_pytest/_code/_py2traceback.py
    A src/_pytest/_code/code.py
    A src/_pytest/_code/source.py
    A src/_pytest/assertion/__init__.py
    A src/_pytest/assertion/rewrite.py
    A src/_pytest/assertion/truncate.py
    A src/_pytest/assertion/util.py
    A src/_pytest/cacheprovider.py
    A src/_pytest/capture.py
    A src/_pytest/compat.py
    A src/_pytest/config.py
    A src/_pytest/debugging.py
    A src/_pytest/deprecated.py
    A src/_pytest/doctest.py
    A src/_pytest/fixtures.py
    A src/_pytest/freeze_support.py
    A src/_pytest/helpconfig.py
    A src/_pytest/hookspec.py
    A src/_pytest/junitxml.py
    A src/_pytest/logging.py
    A src/_pytest/main.py
    A src/_pytest/mark/__init__.py
    A src/_pytest/mark/evaluate.py
    A src/_pytest/mark/legacy.py
    A src/_pytest/mark/structures.py
    A src/_pytest/monkeypatch.py
    A src/_pytest/nodes.py
    A src/_pytest/nose.py
    A src/_pytest/outcomes.py
    A src/_pytest/pastebin.py
    A src/_pytest/pytester.py
    A src/_pytest/python.py
    A src/_pytest/python_api.py
    A src/_pytest/recwarn.py
    A src/_pytest/resultlog.py
    A src/_pytest/runner.py
    A src/_pytest/setuponly.py
    A src/_pytest/setupplan.py
    A src/_pytest/skipping.py
    A src/_pytest/terminal.py
    A src/_pytest/tmpdir.py
    A src/_pytest/unittest.py
    A src/_pytest/warnings.py
    A src/pytest.py

  Log Message:
  -----------
  Merge pull request #3513 from RonnyPfannschmidt/src-layout

switch to src layout


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

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

From nicoddemus at gmail.com  Sun May 27 11:51:53 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 27 May 2018 08:51:53 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 130f76: enable pip/pre-commit
 caching on travis and appvey...
Message-ID: <5b0ad419c5453_46682b002d619c0494384@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 130f76f66efbd961ff33775ba37e550131ab7bf7
      https://github.com/pytest-dev/pytest/commit/130f76f66efbd961ff33775ba37e550131ab7bf7
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-27 (Sun, 27 May 2018)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    A changelog/3502.trivial.rst

  Log Message:
  -----------
  enable pip/pre-commit caching on travis and appveyor


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

  Changed paths:
    M .travis.yml
    M appveyor.yml
    A changelog/3502.trivial.rst

  Log Message:
  -----------
  Merge pull request #3516 from RonnyPfannschmidt/travis-optimize

enable pip/pre-commit caching on travis and appveyor


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

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

From nicoddemus at gmail.com  Wed May 30 07:24:12 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 30 May 2018 04:24:12 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 5748c5: Fix default cache
 directory to .pytest_cache
Message-ID: <5b0e89dcbbffa_608e2acb318a3c08496af@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 5748c5ce8f9f9afd8b3af3689de0976dde05c083
      https://github.com/pytest-dev/pytest/commit/5748c5ce8f9f9afd8b3af3689de0976dde05c083
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Fix default cache directory to .pytest_cache



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

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

From nicoddemus at gmail.com  Thu May 31 11:43:51 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 31 May 2018 08:43:51 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 4dc5f7: Fix typo in marks.rst
Message-ID: <5b101837317bd_3faf2b29aab19c08302cc@hookshot-fe-b0febf1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 4dc5f7897d28ac236a50fbdbb3a534095ca962ab
      https://github.com/pytest-dev/pytest/commit/4dc5f7897d28ac236a50fbdbb3a534095ca962ab
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M doc/en/mark.rst

  Log Message:
  -----------
  Fix typo in marks.rst



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

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