From nicoddemus at gmail.com  Thu Mar  1 16:24:04 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 01 Mar 2018 13:24:04 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 0f8872: Add
 register_assert_rewrite and improve signature ...
Message-ID: <5a986f74bb77d_f9c2aefd8f47c14355ea@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0f88722369a0842641d600709d594cc05865c97d
      https://github.com/pytest-dev/pytest/commit/0f88722369a0842641d600709d594cc05865c97d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

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

  Log Message:
  -----------
  Add register_assert_rewrite and improve signature of other functions


  Commit: 7b39a0c3e5e9fe59423350574111f3e8ea01cecf
      https://github.com/pytest-dev/pytest/commit/7b39a0c3e5e9fe59423350574111f3e8ea01cecf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

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

  Log Message:
  -----------
  Add pytest_addhooks


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Improve fixture reference a bit


  Commit: 774f259b57fa02c6f76f0e743362b6d5696586ac
      https://github.com/pytest-dev/pytest/commit/774f259b57fa02c6f76f0e743362b6d5696586ac
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

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

  Log Message:
  -----------
  Add pytest_plugins and pytestmark special variables


Compare: https://github.com/pytest-dev/pytest/compare/3ab1434664bd...774f259b57fa

From nicoddemus at gmail.com  Thu Mar  1 21:33:30 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 01 Mar 2018 18:33:30 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 59ee52: Add docs for
 CaptureFixture
Message-ID: <5a98b7faba213_14352ada0fad9c10994d9@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: 59ee520daaf96c1912f4f23a960a00b534efbcf1
      https://github.com/pytest-dev/pytest/commit/59ee520daaf96c1912f4f23a960a00b534efbcf1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M _pytest/capture.py
    M doc/en/reference.rst

  Log Message:
  -----------
  Add docs for CaptureFixture



From nicoddemus at gmail.com  Fri Mar  2 14:34:33 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 02 Mar 2018 11:34:33 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 99aab2: #3268 Added deprecation
 to custom configs
Message-ID: <5a99a749def53_243c2ae6ce4edc04691a5@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 99aab2c3f532fa128257f79852078292001b5247
      https://github.com/pytest-dev/pytest/commit/99aab2c3f532fa128257f79852078292001b5247
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M _pytest/config.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  #3268 Added deprecation to custom configs


  Commit: a506052d12e28562f92bf6c07fac58c6c593e9aa
      https://github.com/pytest-dev/pytest/commit/a506052d12e28562f92bf6c07fac58c6c593e9aa
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    A changelog/3268.trivial

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


  Commit: f501d0021c3a86a46da928cf0fc3d806fd5ac03d
      https://github.com/pytest-dev/pytest/commit/f501d0021c3a86a46da928cf0fc3d806fd5ac03d
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

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

  Log Message:
  -----------
  #3268 Fix warning variable


  Commit: 1549d613792f2d861d29e8696e954c8dd3505025
      https://github.com/pytest-dev/pytest/commit/1549d613792f2d861d29e8696e954c8dd3505025
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M _pytest/config.py
    M _pytest/deprecated.py
    A changelog/3268.trivial
    M testing/deprecated_test.py

  Log Message:
  -----------
  Merge pull request #3274 from feuillemorte/3268-add-deprecation

Added warning when "[pytest]" section is used in a ".cfg" file passed with "-c"


Compare: https://github.com/pytest-dev/pytest/compare/ea854086e172...1549d613792f

From nicoddemus at gmail.com  Fri Mar  2 16:33:27 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 02 Mar 2018 13:33:27 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] dff050: #3034 Added new option
 "--new-first"
Message-ID: <5a99c3273da68_2b932b227f295c0854992@hookshot-fe-265448d.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: dff0500114971b30a7bb9043acb0d0fb6a9e01c4
      https://github.com/pytest-dev/pytest/commit/dff0500114971b30a7bb9043acb0d0fb6a9e01c4
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/3034.feature
    M doc/en/cache.rst
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  #3034 Added new option "--new-first"


  Commit: e865f2a2358a8cbbf33018167a33c44598b9da55
      https://github.com/pytest-dev/pytest/commit/e865f2a2358a8cbbf33018167a33c44598b9da55
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-23 (Fri, 23 Feb 2018)

  Changed paths:
    M _pytest/cacheprovider.py
    M changelog/3034.feature
    M doc/en/cache.rst
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  #3034 Fix comments


  Commit: c032d4c5d57460f5bd4212bd1404c420359dcca3
      https://github.com/pytest-dev/pytest/commit/c032d4c5d57460f5bd4212bd1404c420359dcca3
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-23 (Fri, 23 Feb 2018)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M _pytest/compat.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/nodes.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M changelog/1478.feature
    A changelog/2770.feature
    A changelog/2770.removal.rst
    A changelog/3198.feature.rst
    A changelog/3204.feature
    A changelog/3213.feature
    A changelog/3228.trivial.rst
    A changelog/3246.trival.rst
    A changelog/README.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.1.rst
    M doc/en/builtin.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/logging.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M tasks/generate.py
    M tasks/requirements.txt
    M testing/logging/test_reporting.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/raises.py
    M testing/test_cacheprovider.py
    M testing/test_junitxml.py
    M testing/test_pdb.py
    M testing/test_recwarn.py
    M testing/test_session.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge branch 'features' of https://github.com/feuillemorte/pytest into 3034-new-tests-first


  Commit: 08831396a55dae6f2f8816770448cf9e57b03976
      https://github.com/pytest-dev/pytest/commit/08831396a55dae6f2f8816770448cf9e57b03976
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/3034.feature
    M doc/en/cache.rst
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #3218 from feuillemorte/3034-new-tests-first

#3034 Added new option "--new-first"


Compare: https://github.com/pytest-dev/pytest/compare/1549d613792f...08831396a55d

From nicoddemus at gmail.com  Sat Mar  3 21:17:06 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 03 Mar 2018 18:17:06 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 304530: Add logging plugin to
 plugins list
Message-ID: <5a9b5722ae347_1871b2ab1d6b2dc04631da@hookshot-fe-dfcc362.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 30453057e88de4274d6d4e7532eb89da723d4825
      https://github.com/pytest-dev/pytest/commit/30453057e88de4274d6d4e7532eb89da723d4825
  Author: Maik Figura <maik at maikfigura.de>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M _pytest/logging.py
    A changelog/3209.doc
    M doc/en/plugins.rst

  Log Message:
  -----------
  Add logging plugin to plugins list


  Commit: 46f5d7a1bb7edc6883e6141d1d272a4db4be8cc0
      https://github.com/pytest-dev/pytest/commit/46f5d7a1bb7edc6883e6141d1d272a4db4be8cc0
  Author: Maik Figura <maik at maikfigura.de>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    R changelog/3209.doc
    A changelog/3209.doc.rst

  Log Message:
  -----------
  Add filetype to changelog fragment


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

  Changed paths:
    M _pytest/logging.py
    A changelog/3209.doc.rst
    M doc/en/plugins.rst

  Log Message:
  -----------
  Merge pull request #3275 from maiksensi/docs/3209-add-logging-plugin

Add logging plugin to plugins list


Compare: https://github.com/pytest-dev/pytest/compare/3b757b1b8ca1...07e768ab68ad

From nicoddemus at gmail.com  Sun Mar  4 08:49:27 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 04 Mar 2018 05:49:27 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 056d9e: Use `isdir` instead of
 `exists`
Message-ID: <5a9bf967838ae_2bcc2ad4d5d23c1c166f8@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 056d9e8dc232229fc9c0e86b26d43f9c000656fa
      https://github.com/pytest-dev/pytest/commit/056d9e8dc232229fc9c0e86b26d43f9c000656fa
  Author: Maik Figura <maik at maikfigura.de>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

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

  Log Message:
  -----------
  Use `isdir` instead of `exists`


  Commit: 9a2e0c061d0a51c6a4f08c8b8f609fd04ac10ce7
      https://github.com/pytest-dev/pytest/commit/9a2e0c061d0a51c6a4f08c8b8f609fd04ac10ce7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M changelog/3241.bugfix.rst

  Log Message:
  -----------
  Update 3241.bugfix.rst


  Commit: e980fbbe391aca04c448d2ac9670396da4e8105e
      https://github.com/pytest-dev/pytest/commit/e980fbbe391aca04c448d2ac9670396da4e8105e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

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

  Log Message:
  -----------
  Merge pull request #3277 from maiksensi/bug/3241-check-if-dir-exists

Use `isdir` instead of `exists`


Compare: https://github.com/pytest-dev/pytest/compare/07e768ab68ad...e980fbbe391a

From nicoddemus at gmail.com  Sun Mar  4 14:33:33 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 04 Mar 2018 11:33:33 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 655346: Revert introduction of
 more_itertools
Message-ID: <5a9c4a0d6a62c_5a0b2ab9b5e75c18443d3@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 65534682aaa659354efda5c582015066e92bd4db
      https://github.com/pytest-dev/pytest/commit/65534682aaa659354efda5c582015066e92bd4db
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M _pytest/python_api.py
    R changelog/3265.trivial.rst
    M setup.py

  Log Message:
  -----------
  Revert introduction of more_itertools

This was merged on master but really should be on features: we should not
add new dependencies in bug-fix releases

This reverts commits:

* cfaf3600c1d9ea2b45d9b801a47379304fd7e455
* 14a9b1ec838fc1b2bb530458757c0bb9a67f164d


  Commit: 51abdb80db6927a1373b49ee44fa8f31c560b28d
      https://github.com/pytest-dev/pytest/commit/51abdb80db6927a1373b49ee44fa8f31c560b28d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M _pytest/python_api.py
    R changelog/3265.trivial.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3278 from nicoddemus/revert-more_itertools-master

Revert introduction of more_itertools on master


Compare: https://github.com/pytest-dev/pytest/compare/e980fbbe391a...51abdb80db69

From nicoddemus at gmail.com  Sun Mar  4 14:34:00 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 04 Mar 2018 11:34:00 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] cfaf36: Consolidate behavior by
 using filterfalse and alwa...
Message-ID: <5a9c4a2822a54_3d4e2acbeb507c1056565@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: cfaf3600c1d9ea2b45d9b801a47379304fd7e455
      https://github.com/pytest-dev/pytest/commit/cfaf3600c1d9ea2b45d9b801a47379304fd7e455
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M _pytest/python_api.py
    M setup.py

  Log Message:
  -----------
  Consolidate behavior by using filterfalse and always_iterable


  Commit: 14a9b1ec838fc1b2bb530458757c0bb9a67f164d
      https://github.com/pytest-dev/pytest/commit/14a9b1ec838fc1b2bb530458757c0bb9a67f164d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    A changelog/3265.trivial.rst

  Log Message:
  -----------
  Add CHANGELOG for #3265


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

  Changed paths:
    M _pytest/python_api.py
    A changelog/3265.trivial.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3265 from pytest-dev/feature/always-iterable-refactor

Consolidate behavior by using filterfalse and always_iterable


  Commit: 30453057e88de4274d6d4e7532eb89da723d4825
      https://github.com/pytest-dev/pytest/commit/30453057e88de4274d6d4e7532eb89da723d4825
  Author: Maik Figura <maik at maikfigura.de>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M _pytest/logging.py
    A changelog/3209.doc
    M doc/en/plugins.rst

  Log Message:
  -----------
  Add logging plugin to plugins list


  Commit: 46f5d7a1bb7edc6883e6141d1d272a4db4be8cc0
      https://github.com/pytest-dev/pytest/commit/46f5d7a1bb7edc6883e6141d1d272a4db4be8cc0
  Author: Maik Figura <maik at maikfigura.de>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    R changelog/3209.doc
    A changelog/3209.doc.rst

  Log Message:
  -----------
  Add filetype to changelog fragment


  Commit: 056d9e8dc232229fc9c0e86b26d43f9c000656fa
      https://github.com/pytest-dev/pytest/commit/056d9e8dc232229fc9c0e86b26d43f9c000656fa
  Author: Maik Figura <maik at maikfigura.de>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

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

  Log Message:
  -----------
  Use `isdir` instead of `exists`


  Commit: 9a2e0c061d0a51c6a4f08c8b8f609fd04ac10ce7
      https://github.com/pytest-dev/pytest/commit/9a2e0c061d0a51c6a4f08c8b8f609fd04ac10ce7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M changelog/3241.bugfix.rst

  Log Message:
  -----------
  Update 3241.bugfix.rst


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

  Changed paths:
    M _pytest/logging.py
    A changelog/3209.doc.rst
    M doc/en/plugins.rst

  Log Message:
  -----------
  Merge pull request #3275 from maiksensi/docs/3209-add-logging-plugin

Add logging plugin to plugins list


  Commit: e980fbbe391aca04c448d2ac9670396da4e8105e
      https://github.com/pytest-dev/pytest/commit/e980fbbe391aca04c448d2ac9670396da4e8105e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

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

  Log Message:
  -----------
  Merge pull request #3277 from maiksensi/bug/3241-check-if-dir-exists

Use `isdir` instead of `exists`


  Commit: 65534682aaa659354efda5c582015066e92bd4db
      https://github.com/pytest-dev/pytest/commit/65534682aaa659354efda5c582015066e92bd4db
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M _pytest/python_api.py
    R changelog/3265.trivial.rst
    M setup.py

  Log Message:
  -----------
  Revert introduction of more_itertools

This was merged on master but really should be on features: we should not
add new dependencies in bug-fix releases

This reverts commits:

* cfaf3600c1d9ea2b45d9b801a47379304fd7e455
* 14a9b1ec838fc1b2bb530458757c0bb9a67f164d


  Commit: 54884b8c870b53e5171ceb7762079a86214e63ee
      https://github.com/pytest-dev/pytest/commit/54884b8c870b53e5171ceb7762079a86214e63ee
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M _pytest/logging.py
    M _pytest/main.py
    A changelog/3209.doc.rst
    A changelog/3241.bugfix.rst
    M doc/en/plugins.rst

  Log Message:
  -----------
  Merge branch 'revert-more_itertools-master' into introduce-more_itertools


  Commit: 25399da9047d044174f090f1315f9a4244b91135
      https://github.com/pytest-dev/pytest/commit/25399da9047d044174f090f1315f9a4244b91135
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M _pytest/python_api.py
    A changelog/3265.trivial.rst
    M setup.py

  Log Message:
  -----------
  Reintroduce more_itertools dependency

Reintroduce more_itertools that was added in #3265, now in the features branch


  Commit: 9879ac5911c06c867d62c29fa498d8cd3248a085
      https://github.com/pytest-dev/pytest/commit/9879ac5911c06c867d62c29fa498d8cd3248a085
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/python_api.py
    A changelog/3209.doc.rst
    A changelog/3241.bugfix.rst
    A changelog/3265.trivial.rst
    M doc/en/plugins.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3279 from nicoddemus/introduce-more_itertools

Re-Introduce more_itertools


Compare: https://github.com/pytest-dev/pytest/compare/08831396a55d...9879ac5911c0

From nicoddemus at gmail.com  Mon Mar  5 16:57:29 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 05 Mar 2018 13:57:29 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] fac820: Preparing release
 version 3.4.2
Message-ID: <5a9dbd49b88d7_16912adc589d1c1410438f@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/tags/3.4.2
  Home:   https://github.com/pytest-dev/pytest
  Commit: fac8208e8f13a94299670d91b2e981e4b2ba35c5
      https://github.com/pytest-dev/pytest/commit/fac8208e8f13a94299670d91b2e981e4b2ba35c5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3203.bugfix.rst
    R changelog/3209.doc.rst
    R changelog/3241.bugfix.rst
    R changelog/3247.bugfix.rst
    R changelog/3249.bugfix.rst
    R changelog/3259.trivial
    R changelog/3260.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.2.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.4.2


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix duplicated link in CHANGELOG


Compare: https://github.com/pytest-dev/pytest/compare/fac8208e8f13^...e8368e6c2ea1

From nicoddemus at gmail.com  Mon Mar  5 17:43:00 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 05 Mar 2018 14:43:00 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] fac820: Preparing release
 version 3.4.2
Message-ID: <5a9dc7f4ee934_3d2a2b0905a67c08998b0@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: fac8208e8f13a94299670d91b2e981e4b2ba35c5
      https://github.com/pytest-dev/pytest/commit/fac8208e8f13a94299670d91b2e981e4b2ba35c5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3203.bugfix.rst
    R changelog/3209.doc.rst
    R changelog/3241.bugfix.rst
    R changelog/3247.bugfix.rst
    R changelog/3249.bugfix.rst
    R changelog/3259.trivial
    R changelog/3260.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.2.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.4.2


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix duplicated link in CHANGELOG


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/3203.bugfix.rst
    R changelog/3209.doc.rst
    R changelog/3241.bugfix.rst
    R changelog/3247.bugfix.rst
    R changelog/3249.bugfix.rst
    R changelog/3259.trivial
    R changelog/3260.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.2.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Merge pull request #3281 from nicoddemus/release-3.4.2

Preparing release version 3.4.2


Compare: https://github.com/pytest-dev/pytest/compare/51abdb80db69...27c4de242f65

From nicoddemus at gmail.com  Mon Mar  5 18:31:11 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 05 Mar 2018 15:31:11 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 51abdb: Merge pull request
 #3278 from nicoddemus/revert-mo...
Message-ID: <5a9dd33f9e656_11042ae931625bfc9448e@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 51abdb80db6927a1373b49ee44fa8f31c560b28d
      https://github.com/pytest-dev/pytest/commit/51abdb80db6927a1373b49ee44fa8f31c560b28d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M _pytest/python_api.py
    R changelog/3265.trivial.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3278 from nicoddemus/revert-more_itertools-master

Revert introduction of more_itertools on master


  Commit: fac8208e8f13a94299670d91b2e981e4b2ba35c5
      https://github.com/pytest-dev/pytest/commit/fac8208e8f13a94299670d91b2e981e4b2ba35c5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3203.bugfix.rst
    R changelog/3209.doc.rst
    R changelog/3241.bugfix.rst
    R changelog/3247.bugfix.rst
    R changelog/3249.bugfix.rst
    R changelog/3259.trivial
    R changelog/3260.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.2.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.4.2


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix duplicated link in CHANGELOG


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/3203.bugfix.rst
    R changelog/3209.doc.rst
    R changelog/3241.bugfix.rst
    R changelog/3247.bugfix.rst
    R changelog/3249.bugfix.rst
    R changelog/3259.trivial
    R changelog/3260.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.2.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Merge pull request #3281 from nicoddemus/release-3.4.2

Preparing release version 3.4.2


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/3203.bugfix.rst
    R changelog/3209.doc.rst
    R changelog/3241.bugfix.rst
    R changelog/3247.bugfix.rst
    R changelog/3249.bugfix.rst
    R changelog/3259.trivial
    R changelog/3260.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.2.rst
    M doc/en/example/reportingdemo.rst

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


Compare: https://github.com/pytest-dev/pytest/compare/9879ac5911c0...ade7ad25c77b

From nicoddemus at gmail.com  Tue Mar  6 17:22:50 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 06 Mar 2018 14:22:50 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] fbf01b: enhance skip except
 clause by directly using the S...
Message-ID: <5a9f14baedb83_675b2b26496e1c089833f@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: fbf01bd31a49e41b0fb2a1e3f874c5c1bfa433c9
      https://github.com/pytest-dev/pytest/commit/fbf01bd31a49e41b0fb2a1e3f874c5c1bfa433c9
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-06 (Tue, 06 Mar 2018)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  enhance skip except clause by directly using the Skipped exception


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

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  extract _warn_about_missing_assertion into freestanding function


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

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Merge pull request #3285 from RonnyPfannschmidt/minor-refactor

Minor refactors


Compare: https://github.com/pytest-dev/pytest/compare/ade7ad25c77b...d6ddeb395bbf

From nicoddemus at gmail.com  Tue Mar  6 17:22:57 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 06 Mar 2018 14:22:57 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] e42fe5: Add doc to
 norecursedirs in tox.ini
Message-ID: <5a9f14c13e668_16912adc589d1c14111196@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: e42fe5f0f93f2f5849c26360971ff9eb900c69c3
      https://github.com/pytest-dev/pytest/commit/e42fe5f0f93f2f5849c26360971ff9eb900c69c3
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    A changelog/3245.trivial.rst
    M tox.ini

  Log Message:
  -----------
  Add doc to norecursedirs in tox.ini


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

  Changed paths:
    A changelog/3245.trivial.rst
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3283 from jeffreyrack/3245-doc-test-failures

3245: Add doc to norecursedirs in tox.ini


Compare: https://github.com/pytest-dev/pytest/compare/27c4de242f65...28df322500fa

From nicoddemus at gmail.com  Tue Mar  6 18:40:20 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 06 Mar 2018 15:40:20 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 87c80d: Add environment
 variables
Message-ID: <5a9f26e474512_283e2ab555e47c141111da@hookshot-fe-265448d.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: 87c80dce8cfd5444b0aa3557d7c3387888d5f1d8
      https://github.com/pytest-dev/pytest/commit/87c80dce8cfd5444b0aa3557d7c3387888d5f1d8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-06 (Tue, 06 Mar 2018)

  Changed paths:
    M _pytest/config.py
    M doc/en/example/simple.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Add environment variables



From nicoddemus at gmail.com  Tue Mar  6 18:41:30 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 06 Mar 2018 15:41:30 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] d4c385: Create reference and
 moved Objects and Hooks refer...
Message-ID: <5a9f272a419d4_4eb92afa4c8dfc1841741@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: d4c38502312ee13991d05dfc5709f825a77ed6a7
      https://github.com/pytest-dev/pytest/commit/d4c38502312ee13991d05dfc5709f825a77ed6a7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-06 (Tue, 06 Mar 2018)

  Changed paths:
    M doc/en/_templates/globaltoc.html
    M doc/en/contents.rst
    A doc/en/reference.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Create reference and moved Objects and Hooks reference from writing_plugins


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

  Changed paths:
    M doc/en/plugins.rst

  Log Message:
  -----------
  Remove internal plugin list

This gets out of sync and shows internal plugins which don't make
much sense


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

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

  Log Message:
  -----------
  Cleanup the links section to only external links

Internal links should be displayed in the side-bar


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

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

  Log Message:
  -----------
  Reorder the global toc and include 'contributing' section


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

  Changed paths:
    M doc/en/builtin.rst
    M doc/en/conf.py
    M doc/en/requirements.txt
    M tox.ini

  Log Message:
  -----------
  Use sphinxcontrib-trio extension

This adds some more capabilities to sphinx, like marking
functions as decorators or with contexts


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

  Changed paths:
    M _pytest/capture.py
    M _pytest/fixtures.py
    M doc/en/cache.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Add reference docs to cache and capture fixtures


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

  Changed paths:
    M _pytest/doctest.py
    M doc/en/doctest.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Add reference docs to doctest_namespace


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Use :no-auto-options: in capsys fixtures

Otherwise they are recognized as iterators


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

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Remove basepython from testenv:docs so it can be built with Python 3


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add local table of contents in reference.rst


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

  Changed paths:
    M doc/en/builtin.rst
    M doc/en/contents.rst
    M doc/en/getting-started.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Move most of 'builtin' to 'reference'


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add sections to pytest's builtin API


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add :with: modifier to raises() and deprecated_call()


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add pytestconfig fixture


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Use ``pytest.`` prefix for outcomes


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

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M doc/en/reference.rst

  Log Message:
  -----------
  Improve pytestconfig and add record_xml_property


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

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

  Log Message:
  -----------
  Add caplog to reference


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

  Changed paths:
    M _pytest/python_api.py
    M doc/en/monkeypatch.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Add Monkeypatch and tutorial links for logging


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

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

  Log Message:
  -----------
  Add tutorial links to all references


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add testdir fixture to reference


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

  Changed paths:
    M _pytest/recwarn.py
    M _pytest/tmpdir.py
    M doc/en/reference.rst
    M doc/en/tmpdir.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Add recwarn and tmpdir fixtures to the reference docs


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

  Changed paths:
    A changelog/1713.doc.rst

  Log Message:
  -----------
  Add a CHANGELOG entry for the reference docs

Fix #1713


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

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    M doc/en/mark.rst
    M doc/en/parametrize.rst
    M doc/en/reference.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Add documentation for marks


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Sort objects by name


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Reorder top level: functions, marks, fixtures, hooks and objects


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

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

  Log Message:
  -----------
  Add register_assert_rewrite and improve signature of other functions


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

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

  Log Message:
  -----------
  Add pytest_addhooks


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Improve fixture reference a bit


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

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

  Log Message:
  -----------
  Add pytest_plugins and pytestmark special variables


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

  Changed paths:
    M _pytest/capture.py
    M doc/en/reference.rst

  Log Message:
  -----------
  Add docs for CaptureFixture


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

  Changed paths:
    M _pytest/config.py
    M doc/en/example/simple.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Add environment variables


Compare: https://github.com/pytest-dev/pytest/compare/87c80dce8cfd...c0fe4d483d63

From nicoddemus at gmail.com  Wed Mar  7 18:48:21 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 07 Mar 2018 15:48:21 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 824390: Move definition of ini
 options to reference
Message-ID: <5aa07a453c7b1_58722aff530cbc1426819@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: 8243900960b23e54623e2aaf2b8a3f7e529f6366
      https://github.com/pytest-dev/pytest/commit/8243900960b23e54623e2aaf2b8a3f7e529f6366
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

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

  Log Message:
  -----------
  Move definition of ini options to reference



From nicoddemus at gmail.com  Mon Mar 12 11:16:20 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 12 Mar 2018 08:16:20 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] e71d90: Typo in example,
 os.getcwd does not take any param...
Message-ID: <5aa699c4cd531_10e92b27f9693c185904c@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: e71d907d3471e5cc10ab7de9a07f1706a30aca29
      https://github.com/pytest-dev/pytest/commit/e71d907d3471e5cc10ab7de9a07f1706a30aca29
  Author: Julien Palard <julien at palard.fr>
  Date:   2018-03-12 (Mon, 12 Mar 2018)

  Changed paths:
    M _pytest/monkeypatch.py

  Log Message:
  -----------
  Typo in example, os.getcwd does not take any parameter.


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

  Changed paths:
    M _pytest/monkeypatch.py

  Log Message:
  -----------
  Merge pull request #3300 from JulienPalard/typo

Typo in example, os.getcwd does not take any parameter.


Compare: https://github.com/pytest-dev/pytest/compare/28df322500fa...3909225bf908

From nicoddemus at gmail.com  Mon Mar 12 17:49:16 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 12 Mar 2018 14:49:16 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 09ce84: remove unneeded commas
Message-ID: <5aa6f5dc12ed5_43eb2aee7785bc141366f@hookshot-fe-b0febf1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 09ce84e64e153a5a23c59fd89dbe2302b73fc422
      https://github.com/pytest-dev/pytest/commit/09ce84e64e153a5a23c59fd89dbe2302b73fc422
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-09 (Fri, 09 Mar 2018)

  Changed paths:
    M _pytest/terminal.py

  Log Message:
  -----------
  remove unneeded commas


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

  Changed paths:
    M _pytest/nodes.py

  Log Message:
  -----------
  remove dead code


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

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

  Log Message:
  -----------
  move nodekeywords to the mark structures


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

  Changed paths:
    M _pytest/main.py
    M _pytest/nodes.py
    M testing/test_resultlog.py

  Log Message:
  -----------
  make nodeids precalculated, there is no sane reason to commpute lazyly


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

  Changed paths:
    A changelog/3291.feature

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


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

  Changed paths:
    M _pytest/mark/structures.py

  Log Message:
  -----------
  makr strutures: lint fixings, removal of shadowing


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

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

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


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

  Changed paths:
    M _pytest/main.py
    M _pytest/mark/structures.py
    M _pytest/nodes.py
    M _pytest/terminal.py
    A changelog/3291.trivial.rst
    M testing/test_resultlog.py

  Log Message:
  -----------
  Merge pull request #3291 from RonnyPfannschmidt/small-moves

move some code and make nodeid computed early


Compare: https://github.com/pytest-dev/pytest/compare/d6ddeb395bbf...0557ab431f3f

From nicoddemus at gmail.com  Mon Mar 12 19:09:52 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 12 Mar 2018 16:09:52 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 61b8ea: Add doctest_encoding
 and junit_suite_name ini opti...
Message-ID: <5aa708c0a6f6a_2ef72b18f206dc007181e@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: 61b8ea8656c6cc3577c9cd5178a105a450cb0252
      https://github.com/pytest-dev/pytest/commit/61b8ea8656c6cc3577c9cd5178a105a450cb0252
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-12 (Mon, 12 Mar 2018)

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add doctest_encoding and junit_suite_name ini options


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Sort ini options


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

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

  Log Message:
  -----------
  Add missing ini options: markers, usefixtures and xfail_strict


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

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

  Log Message:
  -----------
  Add ini options for logging


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Remove redundant "# content of pytest.ini" headers from examples


Compare: https://github.com/pytest-dev/pytest/compare/8243900960b2...4459aa3d8b82

From nicoddemus at gmail.com  Mon Mar 12 19:54:53 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 12 Mar 2018 16:54:53 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] c67f45: simplify a few imports
 in _pytest._code.source
Message-ID: <5aa7134dc94e0_aeb2ab0090d1c0c2706b@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: c67f45b7166dd74c3cc8e52bf5fb86b2098456c7
      https://github.com/pytest-dev/pytest/commit/c67f45b7166dd74c3cc8e52bf5fb86b2098456c7
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-09 (Fri, 09 Mar 2018)

  Changed paths:
    M _pytest/_code/source.py

  Log Message:
  -----------
  simplify a few imports in _pytest._code.source


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

  Changed paths:
    M _pytest/_code/code.py

  Log Message:
  -----------
  turn FormattedExcinfo into a attrs class


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

  Changed paths:
    M _pytest/_code/source.py

  Log Message:
  -----------
  remove getstatementrange_old - its documented for python <= 2.4


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

  Changed paths:
    M _pytest/_code/source.py

  Log Message:
  -----------
  readline generator no longer needs to yield empty strings


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

  Changed paths:
    M _pytest/_code/source.py

  Log Message:
  -----------
  remove unused  assertion parameter in source and minor cleanups


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

  Changed paths:
    M _pytest/_code/source.py

  Log Message:
  -----------
  fix if-chain in _code.source


  Commit: 5f9bc557ea7be9e38badf098890efbdc571ff944
      https://github.com/pytest-dev/pytest/commit/5f9bc557ea7be9e38badf098890efbdc571ff944
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-09 (Fri, 09 Mar 2018)

  Changed paths:
    M _pytest/_code/source.py

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


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

  Changed paths:
    A changelog/3292.trivial.rst

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


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

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    A changelog/3292.trivial.rst

  Log Message:
  -----------
  Merge pull request #3292 from RonnyPfannschmidt/exception-attrs

internal refactor port exc FOrmattedExcinfo to attrs, remove old code


Compare: https://github.com/pytest-dev/pytest/compare/0557ab431f3f...f8791c9246ce

From nicoddemus at gmail.com  Mon Mar 12 19:58:03 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 12 Mar 2018 16:58:03 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 51c025: Remove :py:mod: ref
 from changelog: fails our lint...
Message-ID: <5aa7140bce855_2ac22b0ead8a3c0c9118@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: 51c0256cd4f069449651b82a35a98e8f54c73b4b
      https://github.com/pytest-dev/pytest/commit/51c0256cd4f069449651b82a35a98e8f54c73b4b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-12 (Mon, 12 Mar 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Remove :py:mod: ref from changelog: fails our linting check



From nicoddemus at gmail.com  Tue Mar 13 16:38:43 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 13 Mar 2018 13:38:43 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 37a526: unify cli verbosity
 handling
Message-ID: <5aa836d366ece_72d62ae2666f5c0c985bd@hookshot-fe-da92815.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 37a52607c2f496340caea6936c3e24e9863b3558
      https://github.com/pytest-dev/pytest/commit/37a52607c2f496340caea6936c3e24e9863b3558
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-13 (Tue, 13 Mar 2018)

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

  Log Message:
  -----------
  unify cli verbosity handling

based on https://github.com/pytest-dev/pytest/issues/3294#issuecomment-372190084

we really shouldnt have N options we post mortem hack together to determine verbosity
this change starts by unifying the data, we still need to handle deprecation/removal of config.quiet


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

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

  Log Message:
  -----------
  Merge pull request #3296 from RonnyPfannschmidt/verbosity-actions

unify cli verbosity handling


Compare: https://github.com/pytest-dev/pytest/compare/f8791c9246ce...4175ed8b431a

From nicoddemus at gmail.com  Tue Mar 13 16:48:23 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 13 Mar 2018 13:48:23 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 87f200: remove CmdOptions since
 we can use argparse.Namesp...
Message-ID: <5aa839174f954_370b2af9834ddc10596e3@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 87f200324506d09a819b66d3af06ac4c9777480f
      https://github.com/pytest-dev/pytest/commit/87f200324506d09a819b66d3af06ac4c9777480f
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-13 (Tue, 13 Mar 2018)

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

  Log Message:
  -----------
  remove CmdOptions since we can use argparse.Namespace()


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

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

  Log Message:
  -----------
  Merge pull request #3304 from RonnyPfannschmidt/cmdoptions-removal

remove CmdOptions since we can use argparse.Namespace()


Compare: https://github.com/pytest-dev/pytest/compare/4175ed8b431a...cbb2c55dea05

From nicoddemus at gmail.com  Thu Mar 15 11:04:36 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 15 Mar 2018 08:04:36 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d4c385: Create reference and
 moved Objects and Hooks refer...
Message-ID: <5aaa8b84ea024_3e2f2ac68ace1c08869ab@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d4c38502312ee13991d05dfc5709f825a77ed6a7
      https://github.com/pytest-dev/pytest/commit/d4c38502312ee13991d05dfc5709f825a77ed6a7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-06 (Tue, 06 Mar 2018)

  Changed paths:
    M doc/en/_templates/globaltoc.html
    M doc/en/contents.rst
    A doc/en/reference.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Create reference and moved Objects and Hooks reference from writing_plugins


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

  Changed paths:
    M doc/en/plugins.rst

  Log Message:
  -----------
  Remove internal plugin list

This gets out of sync and shows internal plugins which don't make
much sense


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

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

  Log Message:
  -----------
  Cleanup the links section to only external links

Internal links should be displayed in the side-bar


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

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

  Log Message:
  -----------
  Reorder the global toc and include 'contributing' section


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

  Changed paths:
    M doc/en/builtin.rst
    M doc/en/conf.py
    M doc/en/requirements.txt
    M tox.ini

  Log Message:
  -----------
  Use sphinxcontrib-trio extension

This adds some more capabilities to sphinx, like marking
functions as decorators or with contexts


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

  Changed paths:
    M _pytest/capture.py
    M _pytest/fixtures.py
    M doc/en/cache.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Add reference docs to cache and capture fixtures


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

  Changed paths:
    M _pytest/doctest.py
    M doc/en/doctest.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Add reference docs to doctest_namespace


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Use :no-auto-options: in capsys fixtures

Otherwise they are recognized as iterators


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

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Remove basepython from testenv:docs so it can be built with Python 3


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add local table of contents in reference.rst


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

  Changed paths:
    M doc/en/builtin.rst
    M doc/en/contents.rst
    M doc/en/getting-started.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Move most of 'builtin' to 'reference'


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add sections to pytest's builtin API


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add :with: modifier to raises() and deprecated_call()


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add pytestconfig fixture


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Use ``pytest.`` prefix for outcomes


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

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M doc/en/reference.rst

  Log Message:
  -----------
  Improve pytestconfig and add record_xml_property


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

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

  Log Message:
  -----------
  Add caplog to reference


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

  Changed paths:
    M _pytest/python_api.py
    M doc/en/monkeypatch.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Add Monkeypatch and tutorial links for logging


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

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

  Log Message:
  -----------
  Add tutorial links to all references


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add testdir fixture to reference


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

  Changed paths:
    M _pytest/recwarn.py
    M _pytest/tmpdir.py
    M doc/en/reference.rst
    M doc/en/tmpdir.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Add recwarn and tmpdir fixtures to the reference docs


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

  Changed paths:
    A changelog/1713.doc.rst

  Log Message:
  -----------
  Add a CHANGELOG entry for the reference docs

Fix #1713


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

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    M doc/en/mark.rst
    M doc/en/parametrize.rst
    M doc/en/reference.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Add documentation for marks


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Sort objects by name


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Reorder top level: functions, marks, fixtures, hooks and objects


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

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

  Log Message:
  -----------
  Add register_assert_rewrite and improve signature of other functions


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

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

  Log Message:
  -----------
  Add pytest_addhooks


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Improve fixture reference a bit


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

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

  Log Message:
  -----------
  Add pytest_plugins and pytestmark special variables


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

  Changed paths:
    M _pytest/capture.py
    M doc/en/reference.rst

  Log Message:
  -----------
  Add docs for CaptureFixture


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

  Changed paths:
    M _pytest/config.py
    M doc/en/example/simple.rst
    M doc/en/reference.rst

  Log Message:
  -----------
  Add environment variables


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

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

  Log Message:
  -----------
  Move definition of ini options to reference


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Add doctest_encoding and junit_suite_name ini options


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Sort ini options


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

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

  Log Message:
  -----------
  Add missing ini options: markers, usefixtures and xfail_strict


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

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

  Log Message:
  -----------
  Add ini options for logging


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

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Remove redundant "# content of pytest.ini" headers from examples


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Remove :py:mod: ref from changelog: fails our linting check


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

  Changed paths:
    M CHANGELOG.rst
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/mark.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/tmpdir.py
    A changelog/1713.doc.rst
    M doc/en/_templates/globaltoc.html
    M doc/en/_templates/links.html
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/conf.py
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/doctest.rst
    M doc/en/example/simple.rst
    M doc/en/getting-started.rst
    M doc/en/logging.rst
    M doc/en/mark.rst
    M doc/en/monkeypatch.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    A doc/en/reference.rst
    M doc/en/requirements.txt
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3193 from pytest-dev/ref-docs

Reference docs


Compare: https://github.com/pytest-dev/pytest/compare/1b535387bfc6...fbcf1a90c9ff

From nicoddemus at gmail.com  Thu Mar 15 11:04:39 2018
From: nicoddemus at gmail.com (nicoddemus)
Date: Thu, 15 Mar 2018 08:04:39 -0700
Subject: [Pytest-commit] [pytest-dev/pytest]
Message-ID: <5aaa8b8756566_24ec2adf281a3c041307e7@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest

From nicoddemus at gmail.com  Thu Mar 15 23:04:55 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 15 Mar 2018 20:04:55 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 17468f: Fix caplog docstring:
 indentation caused errors du...
Message-ID: <5aab345771c7d_7b82b09b6907c08972da@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

  Branch: refs/heads/issue/3314
  Home:   https://github.com/pytest-dev/pytest
  Commit: 17468fc99c0bee8efaffb7dfb506f23e3b30145f
      https://github.com/pytest-dev/pytest/commit/17468fc99c0bee8efaffb7dfb506f23e3b30145f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Fix caplog docstring: indentation caused errors during docs build



From nicoddemus at gmail.com  Thu Mar 15 23:06:34 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 15 Mar 2018 20:06:34 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 278d8a: Fix caplog docstring:
 indentation caused errors du...
Message-ID: <5aab34ba21b06_2a8f2acde917dc0c135978@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

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

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Fix caplog docstring: indentation caused errors during docs build



From nicoddemus at gmail.com  Fri Mar 16 09:05:56 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 16 Mar 2018 06:05:56 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 3c3fc3: Add test capturing new
 expectation. Ref #3314.
Message-ID: <5aabc134d8633_208bb2adc0cec5c0862254@hookshot-fe-dfcc362.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 3c3fc3bb9dcd4ba9902e59c8160163d0c962dbe1
      https://github.com/pytest-dev/pytest/commit/3c3fc3bb9dcd4ba9902e59c8160163d0c962dbe1
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-03-15 (Thu, 15 Mar 2018)

  Changed paths:
    M testing/test_capture.py

  Log Message:
  -----------
  Add test capturing new expectation. Ref #3314.


  Commit: 2f47624b19d53db7667c54dd6bcf2232e1dc24e3
      https://github.com/pytest-dev/pytest/commit/2f47624b19d53db7667c54dd6bcf2232e1dc24e3
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-03-15 (Thu, 15 Mar 2018)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  Allow DontReadFromInput to produce iterator without error. Fixes #3314.


  Commit: 965a030564be02f5926c1a579ff59dabf5702e37
      https://github.com/pytest-dev/pytest/commit/965a030564be02f5926c1a579ff59dabf5702e37
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-03-15 (Thu, 15 Mar 2018)

  Changed paths:
    A changelog/3314.bugfix.rst

  Log Message:
  -----------
  Add changelog. Ref #3314.


  Commit: b66019202ec389d5430434ace3068a8eb405402a
      https://github.com/pytest-dev/pytest/commit/b66019202ec389d5430434ace3068a8eb405402a
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-03-15 (Thu, 15 Mar 2018)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  Fix test failure on Python 2. Ref #3314.


  Commit: 17468fc99c0bee8efaffb7dfb506f23e3b30145f
      https://github.com/pytest-dev/pytest/commit/17468fc99c0bee8efaffb7dfb506f23e3b30145f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Fix caplog docstring: indentation caused errors during docs build


  Commit: 93847bfeb412637bb2781a6a75bb99253734f5f8
      https://github.com/pytest-dev/pytest/commit/93847bfeb412637bb2781a6a75bb99253734f5f8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

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

  Log Message:
  -----------
  Merge pull request #3315 from pytest-dev/issue/3314

Allow DontReadFromInput to produce iterator without error.


Compare: https://github.com/pytest-dev/pytest/compare/278d8ac74e6e...93847bfeb412

From nicoddemus at gmail.com  Fri Mar 16 09:05:59 2018
From: nicoddemus at gmail.com (nicoddemus)
Date: Fri, 16 Mar 2018 06:05:59 -0700
Subject: [Pytest-commit] [pytest-dev/pytest]
Message-ID: <5aabc1373ca00_185e92ae662d49c0c10359@hookshot-fe-dfcc362.cp1-iad.github.net.mail>

  Branch: refs/heads/issue/3314
  Home:   https://github.com/pytest-dev/pytest

From nicoddemus at gmail.com  Tue Mar 20 17:45:59 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 20 Mar 2018 14:45:59 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a4cf38: Fix tests to not fail
 when running from root.
Message-ID: <5ab18117200e_7b912abd4700fbfc82566@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: a4cf3803438670bcc1e51141017173a9ac861fbd
      https://github.com/pytest-dev/pytest/commit/a4cf3803438670bcc1e51141017173a9ac861fbd
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    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 tox.ini

  Log Message:
  -----------
  Fix tests to not fail when running from root.


  Commit: c1d73bb535dc54ec86a5c900dde9215cc1d28619
      https://github.com/pytest-dev/pytest/commit/c1d73bb535dc54ec86a5c900dde9215cc1d28619
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M changelog/3245.trivial.rst

  Log Message:
  -----------
  Modifying changelog to reflect new changes for 3245


  Commit: 9b449eee15a28cdd8e04423f6341a8930dd4d445
      https://github.com/pytest-dev/pytest/commit/9b449eee15a28cdd8e04423f6341a8930dd4d445
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add self to authors


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

  Changed paths:
    M AUTHORS
    M changelog/3245.trivial.rst
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    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 tox.ini

  Log Message:
  -----------
  Merge pull request #3321 from jeffreyrack/'test_from_base_fix'

3245: Fix tests to not fail when running from base directory


Compare: https://github.com/pytest-dev/pytest/compare/93847bfeb412...672239b1497a

From nicoddemus at gmail.com  Tue Mar 20 18:17:26 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 20 Mar 2018 15:17:26 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d2e533: implemented
 --last-failed-no-failures
Message-ID: <5ab18876f2885_37a62ae001d39bfc94018@hookshot-fe-265448d.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: d2e533b8a3636f29d8999b90fed1072ac4b5ee1b
      https://github.com/pytest-dev/pytest/commit/d2e533b8a3636f29d8999b90fed1072ac4b5ee1b
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-03-10 (Sat, 10 Mar 2018)

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/3139.feature
    M doc/en/cache.rst
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  implemented --last-failed-no-failures


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

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/3139.feature
    M doc/en/cache.rst
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #3295 from brianmaissy/feature/last-failed-no-failures-behavior

implemented --last-failed-no-failures


Compare: https://github.com/pytest-dev/pytest/compare/f61d0525a53d...d03e38941b26

From nicoddemus at gmail.com  Wed Mar 21 16:37:07 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 21 Mar 2018 13:37:07 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 9e24b0: Use re_match_lines in
 test_class_ordering
Message-ID: <5ab2c27325c84_25772aef1953fc0459115@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 9e24b09a9f96908534e7bfb313df4a2c136b5094
      https://github.com/pytest-dev/pytest/commit/9e24b09a9f96908534e7bfb313df4a2c136b5094
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Use re_match_lines in test_class_ordering

"[1-a]" works fine using fnmatch_lines, but "[a-1]" breaks horribly
inside `re`.


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

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2405.feature.rst
    M doc/en/fixture.rst
    M testing/acceptance_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Sort fixtures by scope when determining fixture closure

Fix #2405


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

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2405.feature.rst
    M doc/en/fixture.rst
    M testing/acceptance_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3306 from nicoddemus/2405-scope-fixture-order

Instantiate fixtures by scope order in test function requests


Compare: https://github.com/pytest-dev/pytest/compare/add5ce0fb865...6f95189cf757

From nicoddemus at gmail.com  Thu Mar 22 19:22:27 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 22 Mar 2018 16:22:27 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f3c87a: Merge remote-tracking
 branch 'upstream/master' int...
Message-ID: <5ab43ab32e30d_33942b0d9f045c18915e2@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/tags/3.5.0
  Home:   https://github.com/pytest-dev/pytest
  Commit: f3c87a77a74089d4f285576ee5e7e7d1b8a26717
      https://github.com/pytest-dev/pytest/commit/f3c87a77a74089d4f285576ee5e7e7d1b8a26717
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-21 (Wed, 21 Mar 2018)

  Changed paths:
    M AUTHORS
    M changelog/3245.trivial.rst
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    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 tox.ini

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


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

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Fix example in usage.rst


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

  Changed paths:
    M CHANGELOG.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Preparing release version 3.5.0


Compare: https://github.com/pytest-dev/pytest/compare/f3c87a77a740^...beacecf29ba0

From nicoddemus at gmail.com  Thu Mar 22 19:58:16 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 22 Mar 2018 16:58:16 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a4cf38: Fix tests to not fail
 when running from root.
Message-ID: <5ab44318b3949_15232ac2a566fc002311e@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: a4cf3803438670bcc1e51141017173a9ac861fbd
      https://github.com/pytest-dev/pytest/commit/a4cf3803438670bcc1e51141017173a9ac861fbd
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    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 tox.ini

  Log Message:
  -----------
  Fix tests to not fail when running from root.


  Commit: c1d73bb535dc54ec86a5c900dde9215cc1d28619
      https://github.com/pytest-dev/pytest/commit/c1d73bb535dc54ec86a5c900dde9215cc1d28619
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M changelog/3245.trivial.rst

  Log Message:
  -----------
  Modifying changelog to reflect new changes for 3245


  Commit: 9b449eee15a28cdd8e04423f6341a8930dd4d445
      https://github.com/pytest-dev/pytest/commit/9b449eee15a28cdd8e04423f6341a8930dd4d445
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add self to authors


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

  Changed paths:
    M AUTHORS
    M changelog/3245.trivial.rst
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    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 tox.ini

  Log Message:
  -----------
  Merge pull request #3321 from jeffreyrack/'test_from_base_fix'

3245: Fix tests to not fail when running from base directory


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

  Changed paths:
    M AUTHORS
    M changelog/3245.trivial.rst
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    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 tox.ini

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


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

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Fix example in usage.rst


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

  Changed paths:
    M CHANGELOG.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Preparing release version 3.5.0


  Commit: 5ecff652853b09e9616bc0984e4d88ab3286f562
      https://github.com/pytest-dev/pytest/commit/5ecff652853b09e9616bc0984e4d88ab3286f562
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-22 (Thu, 22 Mar 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M changelog/3245.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    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/markers.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3327 from nicoddemus/release-3.5.0

Release 3.5.0


Compare: https://github.com/pytest-dev/pytest/compare/d7d4afea17c1...5ecff652853b

From nicoddemus at gmail.com  Thu Mar 22 20:06:32 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 22 Mar 2018 17:06:32 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d78415: #1642 Add rootdir option
Message-ID: <5ab4450867888_c932b16b3571c105868d@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d784155fd2d306157bca115cb87c8eb3c488b746
      https://github.com/pytest-dev/pytest/commit/d784155fd2d306157bca115cb87c8eb3c488b746
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-01-17 (Wed, 17 Jan 2018)

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

  Log Message:
  -----------
  #1642 Add rootdir option


  Commit: 86f01967e160550468cfb4a5efce8a2d744ccabc
      https://github.com/pytest-dev/pytest/commit/86f01967e160550468cfb4a5efce8a2d744ccabc
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-01-17 (Wed, 17 Jan 2018)

  Changed paths:
    A changelog/1642.trivial

  Log Message:
  -----------
  #1642 Added changelog entry


  Commit: 4a18d7616078fa4a0c99b67501ac5e041faf5f21
      https://github.com/pytest-dev/pytest/commit/4a18d7616078fa4a0c99b67501ac5e041faf5f21
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-01-17 (Wed, 17 Jan 2018)

  Changed paths:
    M testing/test_session.py

  Log Message:
  -----------
  #1642 remove print


  Commit: a7c39c894b5b51f3efa9eb48de421b34bd069c26
      https://github.com/pytest-dev/pytest/commit/a7c39c894b5b51f3efa9eb48de421b34bd069c26
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-01-17 (Wed, 17 Jan 2018)

  Changed paths:
    M changelog/1642.trivial

  Log Message:
  -----------
  #1642 fix flake8


  Commit: 83034bbd489aa3b5bfcf3efadc63c883b046ba1a
      https://github.com/pytest-dev/pytest/commit/83034bbd489aa3b5bfcf3efadc63c883b046ba1a
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-01-20 (Sat, 20 Jan 2018)

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

  Log Message:
  -----------
  #1642 Fix rootdir option


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

  Changed paths:
    M changelog/1642.trivial

  Log Message:
  -----------
  Update formatting in the CHANGELOG


  Commit: 0cfa975930f450537543e8d8334f4518f63fba56
      https://github.com/pytest-dev/pytest/commit/0cfa975930f450537543e8d8334f4518f63fba56
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-01-25 (Thu, 25 Jan 2018)

  Changed paths:
    M testing/test_session.py

  Log Message:
  -----------
  #1642 Fix tests


  Commit: 503e00f7ffca1b2805abe97b4a9f63870a98eaaa
      https://github.com/pytest-dev/pytest/commit/503e00f7ffca1b2805abe97b4a9f63870a98eaaa
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-01-25 (Thu, 25 Jan 2018)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  #1642 Remove adding rootdir to sys path


  Commit: 3a004a4507e57aa199884183ab735e501121130d
      https://github.com/pytest-dev/pytest/commit/3a004a4507e57aa199884183ab735e501121130d
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-01-25 (Thu, 25 Jan 2018)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  added rootdir description to customize.rst


  Commit: ace772c7433b7bf38c2e2908a2535cae6ea4a175
      https://github.com/pytest-dev/pytest/commit/ace772c7433b7bf38c2e2908a2535cae6ea4a175
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-01-25 (Thu, 25 Jan 2018)

  Changed paths:
    M changelog/1642.trivial

  Log Message:
  -----------
  Merge branch '1642-add-rootdir-option' of github.com:feuillemorte/pytest into 1642-add-rootdir-option


  Commit: 949a620d3a182d469f8c6bb14498e5ec6802c6e6
      https://github.com/pytest-dev/pytest/commit/949a620d3a182d469f8c6bb14498e5ec6802c6e6
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-01-31 (Wed, 31 Jan 2018)

  Changed paths:
    M _pytest/terminal.py
    A changelog/1478.trivial
    M testing/test_terminal.py

  Log Message:
  -----------
  #1478 Added --no-stdout option


  Commit: 741b571f3b6cd1bcfec6db7ba90f112cd5bbc8d1
      https://github.com/pytest-dev/pytest/commit/741b571f3b6cd1bcfec6db7ba90f112cd5bbc8d1
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-01 (Thu, 01 Feb 2018)

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

  Log Message:
  -----------
  #1642 fix tests and config.py


  Commit: 9f1772e679712a2cb2ece5c6c0a8cbe5fa46bdc7
      https://github.com/pytest-dev/pytest/commit/9f1772e679712a2cb2ece5c6c0a8cbe5fa46bdc7
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-01 (Thu, 01 Feb 2018)

  Changed paths:
    M .gitignore
    M AUTHORS
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    R changelog/2976.trivial
    R changelog/3016.bugfix
    R changelog/3038.feature
    R changelog/3074.bugfix
    R changelog/3076.doc
    R changelog/3088.bugfix
    R changelog/3092.doc
    R changelog/3101.feature
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.0.rst
    M doc/en/backwards-compatibility.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/customize.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/logging.rst
    M doc/en/parametrize.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M extra/get_issues.py
    M tasks/requirements.txt
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/logging/test_fixture.py
    A testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_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_config.py
    M testing/test_conftest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_parseopt.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_terminal.py

  Log Message:
  -----------
  #1642 Resolve conflicts


  Commit: 936651702bc14ed785dc40e364feed7f48892f1a
      https://github.com/pytest-dev/pytest/commit/936651702bc14ed785dc40e364feed7f48892f1a
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-01 (Thu, 01 Feb 2018)

  Changed paths:
    M testing/test_session.py

  Log Message:
  -----------
  #1642 Fix tests


  Commit: 3eb6cad222b3c5eb5d060f19faf94d046b95dfde
      https://github.com/pytest-dev/pytest/commit/3eb6cad222b3c5eb5d060f19faf94d046b95dfde
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-01 (Thu, 01 Feb 2018)

  Changed paths:
    M _pytest/config.py
    M doc/en/customize.rst
    M testing/test_session.py

  Log Message:
  -----------
  #1642 Fix comments


  Commit: 37d836d754eb8e20540ff1a16da76edee9a7adda
      https://github.com/pytest-dev/pytest/commit/37d836d754eb8e20540ff1a16da76edee9a7adda
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-01 (Thu, 01 Feb 2018)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  Reword docs slightly


  Commit: c0ef4a4d3544b103921946f66ef8c26fe6d192b5
      https://github.com/pytest-dev/pytest/commit/c0ef4a4d3544b103921946f66ef8c26fe6d192b5
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2018-02-03 (Sat, 03 Feb 2018)

  Changed paths:
    M _pytest/junitxml.py
    M _pytest/runner.py
    A changelog/3156.feature
    M testing/test_junitxml.py

  Log Message:
  -----------
  Add captured log msgs to junit xml file

For each test this adds the captured log msgs to a system-* tag in the junit
xml output file. The destination of the system-* tag is specified by
junit_logging ini option.


  Commit: 2d0c1e941ef096f4c6a82ee84c659112bf2f9da0
      https://github.com/pytest-dev/pytest/commit/2d0c1e941ef096f4c6a82ee84c659112bf2f9da0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-05 (Mon, 05 Feb 2018)

  Changed paths:
    M _pytest/runner.py

  Log Message:
  -----------
  Fix versionadded tag in caplog function


  Commit: 67558e0e22042e8f46fb3e31248e547225782487
      https://github.com/pytest-dev/pytest/commit/67558e0e22042e8f46fb3e31248e547225782487
  Author: Pedro Algarvio <pedro at algarvio.me>
  Date:   2018-02-06 (Tue, 06 Feb 2018)

  Changed paths:
    M _pytest/logging.py
    A changelog/3189.feature
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Additionally handle logstart and logfinish hooks


  Commit: 00d8787bb85996a185370ea424d3b216d5265bc9
      https://github.com/pytest-dev/pytest/commit/00d8787bb85996a185370ea424d3b216d5265bc9
  Author: Pedro Algarvio <pedro at algarvio.me>
  Date:   2018-02-06 (Tue, 06 Feb 2018)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add name to AUTHORS


  Commit: ea06c1345fb800396fc0ba7c83dc4a75c4a1fb73
      https://github.com/pytest-dev/pytest/commit/ea06c1345fb800396fc0ba7c83dc4a75c4a1fb73
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-06 (Tue, 06 Feb 2018)

  Changed paths:
    M changelog/3189.feature

  Log Message:
  -----------
  Update changelog wording slightly


  Commit: 1a650a9eb9b301fd2f47f627868fbabcfb65f37e
      https://github.com/pytest-dev/pytest/commit/1a650a9eb9b301fd2f47f627868fbabcfb65f37e
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-06 (Tue, 06 Feb 2018)

  Changed paths:
    M _pytest/terminal.py
    A changelog/1478.feature
    R changelog/1478.trivial
    M testing/test_terminal.py

  Log Message:
  -----------
  #1478 Added --show-capture option


  Commit: 29a074eae30c605e3243a3127c6a51b4843ab46b
      https://github.com/pytest-dev/pytest/commit/29a074eae30c605e3243a3127c6a51b4843ab46b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-06 (Tue, 06 Feb 2018)

  Changed paths:
    M _pytest/junitxml.py
    M _pytest/runner.py
    A changelog/3156.feature
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #3156 from thisch/junit_xml_log_fix

Add captured log msgs to junit xml file


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

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

  Log Message:
  -----------
  Merge pull request #3189 from s0undt3ch/feature/logstart-logfinish

Additionally handle logstart and logfinish hooks


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

  Changed paths:
    M AUTHORS
    M _pytest/config.py
    M _pytest/main.py
    A changelog/1642.trivial
    M doc/en/customize.rst
    M testing/test_session.py

  Log Message:
  -----------
  Merge pull request #3127 from feuillemorte/1642-add-rootdir-option

#1642 add rootdir option


  Commit: 0b71255ddaea1b31c52c52454e0adc81a395577c
      https://github.com/pytest-dev/pytest/commit/0b71255ddaea1b31c52c52454e0adc81a395577c
  Author: Pedro Algarvio <pedro at algarvio.me>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M _pytest/logging.py
    A changelog/3190.feature
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Expose `log_cli` as a CLI parser option.


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

  Changed paths:
    M _pytest/logging.py

  Log Message:
  -----------
  Rename _stream_logs_enabled to _log_cli_enabled and remove _stream_logs


  Commit: 71367881ed14eb1cbdfee47a0cf8e0aa431f161c
      https://github.com/pytest-dev/pytest/commit/71367881ed14eb1cbdfee47a0cf8e0aa431f161c
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M _pytest/terminal.py
    M changelog/1478.feature
    M testing/test_terminal.py

  Log Message:
  -----------
  #1478 Added --show-capture=both option (fix comments)


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

  Changed paths:
    M _pytest/logging.py

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


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

  Changed paths:
    M _pytest/logging.py
    A changelog/3190.feature
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Merge pull request #3190 from s0undt3ch/feature/logs-stream

Expose `log_cli` as a CLI parser option.


  Commit: d776e5610e163665dddc1322c49f16c70cb7a3f5
      https://github.com/pytest-dev/pytest/commit/d776e5610e163665dddc1322c49f16c70cb7a3f5
  Author: Pedro Algarvio <pedro at algarvio.me>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

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

  Log Message:
  -----------
  Fix issue where a new line was always written for the live log finish section


  Commit: da5882c2d5607174128f4618020a1ff26adc8316
      https://github.com/pytest-dev/pytest/commit/da5882c2d5607174128f4618020a1ff26adc8316
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

  Changed paths:
    M _pytest/terminal.py
    M doc/en/capture.rst

  Log Message:
  -----------
  #1478 Add doc and remove print


  Commit: 063e2da967a715b06b912586ba7eb50464984ac7
      https://github.com/pytest-dev/pytest/commit/063e2da967a715b06b912586ba7eb50464984ac7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

  Changed paths:
    M _pytest/terminal.py
    A changelog/1478.feature
    M doc/en/capture.rst
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #3176 from feuillemorte/1478_no_stdout_option

#1478 Added --no-stdout option


  Commit: dff0500114971b30a7bb9043acb0d0fb6a9e01c4
      https://github.com/pytest-dev/pytest/commit/dff0500114971b30a7bb9043acb0d0fb6a9e01c4
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/3034.feature
    M doc/en/cache.rst
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  #3034 Added new option "--new-first"


  Commit: 6496131b799afc711b96fc0464ec0f8c0c9ba785
      https://github.com/pytest-dev/pytest/commit/6496131b799afc711b96fc0464ec0f8c0c9ba785
  Author: Thomas Hisch <t.hisch at gmail.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M _pytest/terminal.py
    A changelog/3213.feature
    M testing/test_cacheprovider.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Show deselection count before tests are exectued

Fixes #1527


  Commit: 82cdc487cefbbbd1848705427fed6276461835e6
      https://github.com/pytest-dev/pytest/commit/82cdc487cefbbbd1848705427fed6276461835e6
  Author: Thomas Hisch <thomas.hisch at ims.co.at>
  Date:   2018-02-15 (Thu, 15 Feb 2018)

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

  Log Message:
  -----------
  Fix raised warning when attrs 17.4.0 is used

Related: #3223


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

  Changed paths:
    M changelog/3213.feature

  Log Message:
  -----------
  Slight rewording in the CHANGELOG


  Commit: 774c539f1a03b75b7b6c9b5188c5beeae9638640
      https://github.com/pytest-dev/pytest/commit/774c539f1a03b75b7b6c9b5188c5beeae9638640
  Author: Jordan Speicher <jordan at jspeicher.com>
  Date:   2018-02-16 (Fri, 16 Feb 2018)

  Changed paths:
    M AUTHORS
    M _pytest/main.py
    A changelog/3198.feature.rst
    M doc/en/example/pythoncollection.rst
    M testing/test_session.py

  Log Message:
  -----------
  Add --deselect command line option

Fixes #3198


  Commit: b1abe5db2318feb3b29f471680653ac057a40e9c
      https://github.com/pytest-dev/pytest/commit/b1abe5db2318feb3b29f471680653ac057a40e9c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-16 (Fri, 16 Feb 2018)

  Changed paths:
    M AUTHORS
    M _pytest/main.py
    A changelog/3198.feature.rst
    M doc/en/example/pythoncollection.rst
    M testing/test_session.py

  Log Message:
  -----------
  Merge pull request #3201 from uSpike/deselect_cli

Add "--deselect" command line option


  Commit: 05faa69c379d735c71084ad151fd4edaaa521e14
      https://github.com/pytest-dev/pytest/commit/05faa69c379d735c71084ad151fd4edaaa521e14
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-16 (Fri, 16 Feb 2018)

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

  Log Message:
  -----------
  Merge pull request #3194 from s0undt3ch/feature/logstart-logfinish

Fix issue where a new line was always written for the live log finish section


  Commit: fa8354e872077336a4d814c82ccf13176472c89b
      https://github.com/pytest-dev/pytest/commit/fa8354e872077336a4d814c82ccf13176472c89b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M _pytest/terminal.py
    A changelog/3213.feature
    M testing/test_cacheprovider.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #3213 from thisch/collection_deselection

Show deselection count before tests are executed


  Commit: dfbaa20240bd1178496db117450aaaba7c0a913a
      https://github.com/pytest-dev/pytest/commit/dfbaa20240bd1178496db117450aaaba7c0a913a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Bring test_live_logs_unknown_sections directly due to merge conflicts


  Commit: 69d608aec39c45de898f434b03d49bc112f0499f
      https://github.com/pytest-dev/pytest/commit/69d608aec39c45de898f434b03d49bc112f0499f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .travis.yml
    M AUTHORS
    M _pytest/compat.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/logging.py
    M _pytest/mark.py
    M _pytest/python.py
    M _pytest/python_api.py
    A changelog/1810.bugfix.rst
    A changelog/3052.bugfix
    A changelog/3161.bugfix.rst
    A changelog/3166.trivial.rst
    A changelog/3184.bugfix
    A changelog/3202.doc.rst
    A changelog/3206.bugfix.rst
    A changelog/985.trivial.rst
    A changelog/README.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/test_pdb.py
    M testing/test_recwarn.py

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


  Commit: f263932883904345299d8ec25a908ff320ff9b5b
      https://github.com/pytest-dev/pytest/commit/f263932883904345299d8ec25a908ff320ff9b5b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .travis.yml
    M AUTHORS
    M _pytest/compat.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/logging.py
    M _pytest/mark.py
    M _pytest/python.py
    M _pytest/python_api.py
    A changelog/1810.bugfix.rst
    A changelog/3052.bugfix
    A changelog/3161.bugfix.rst
    A changelog/3166.trivial.rst
    A changelog/3184.bugfix
    A changelog/3202.doc.rst
    A changelog/3206.bugfix.rst
    A changelog/985.trivial.rst
    A changelog/README.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M testing/logging/test_reporting.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/test_pdb.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  Merge pull request #3232 from nicoddemus/merge-upstream

Merge master into features


  Commit: 069f32a8c452e7dbd4d10d4da2c142dd24bb5953
      https://github.com/pytest-dev/pytest/commit/069f32a8c452e7dbd4d10d4da2c142dd24bb5953
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M _pytest/debugging.py
    A changelog/3204.feature
    M testing/test_pdb.py

  Log Message:
  -----------
  print captured logs before entering pdb


  Commit: 81fa547fa8efddbf3665c7c5a4a6a6146239e3ab
      https://github.com/pytest-dev/pytest/commit/81fa547fa8efddbf3665c7c5a4a6a6146239e3ab
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    A changelog/3228.trivial.rst

  Log Message:
  -----------
  Add CHANGELOG entry about changed attrs req


  Commit: 3bc8b50a0de13d91cf762a1a566ba23b3eeddf88
      https://github.com/pytest-dev/pytest/commit/3bc8b50a0de13d91cf762a1a566ba23b3eeddf88
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/3228.trivial.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3228 from thisch/update_attr

Update minimal attrs library to v17.4.0


  Commit: 51ece00923885fa41107e7469d510cb2233406af
      https://github.com/pytest-dev/pytest/commit/51ece00923885fa41107e7469d510cb2233406af
  Author: Thomas Hisch <thomas.hisch at ims.co.at>
  Date:   2018-02-18 (Sun, 18 Feb 2018)

  Changed paths:
    M _pytest/debugging.py
    M _pytest/terminal.py
    M changelog/1478.feature
    M testing/test_pdb.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Add captured-log support to --show-capture

Fixes: #3233


  Commit: ac7eb63a6b9899250ebd58f61f348ef69bf55875
      https://github.com/pytest-dev/pytest/commit/ac7eb63a6b9899250ebd58f61f348ef69bf55875
  Author: Thomas Hisch <thomas.hisch at ims.co.at>
  Date:   2018-02-18 (Sun, 18 Feb 2018)

  Changed paths:
    M _pytest/logging.py
    M doc/en/logging.rst
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Remove --no-print-logs option

This option is superseded by the --show-capture option. With --no-print-logs
it was possible to only disable the reporting of captured logs, which is no
longer possible with --show-capture. If --show-capture=no is used, no
captured content (stdout, stderr and logs) is reported for failed tests.


  Commit: acda6c46fb188514738bbb90f17279c11daa0510
      https://github.com/pytest-dev/pytest/commit/acda6c46fb188514738bbb90f17279c11daa0510
  Author: Thomas Hisch <thomas.hisch at ims.co.at>
  Date:   2018-02-19 (Mon, 19 Feb 2018)

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

  Log Message:
  -----------
  Partially revert "Remove --no-print-logs option"

We'll deprecate --no-print-logs beginning with pytest-4.0.

This reverts commit ac7eb63a6b9899250ebd58f61f348ef69bf55875.


  Commit: 97bb6abcfa4d78f5bd9d0478d4aecd32d4910974
      https://github.com/pytest-dev/pytest/commit/97bb6abcfa4d78f5bd9d0478d4aecd32d4910974
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-19 (Mon, 19 Feb 2018)

  Changed paths:
    M _pytest/debugging.py
    M _pytest/terminal.py
    M changelog/1478.feature
    A changelog/3204.feature
    M doc/en/logging.rst
    M testing/test_pdb.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #3234 from thisch/showcapture_log_support

Add captured-log support to --show-capture


  Commit: 8b49ddfa585e8dee77ba3aeef654598e0052237e
      https://github.com/pytest-dev/pytest/commit/8b49ddfa585e8dee77ba3aeef654598e0052237e
  Author: Carlos Jenkins <carlos at jenkins.co.cr>
  Date:   2018-02-20 (Tue, 20 Feb 2018)

  Changed paths:
    M AUTHORS
    M _pytest/deprecated.py
    M _pytest/junitxml.py
    M _pytest/nodes.py
    M _pytest/runner.py
    A changelog/2770.feature
    M doc/en/builtin.rst
    M doc/en/example/simple.rst
    M doc/en/usage.rst
    M testing/test_junitxml.py

  Log Message:
  -----------
  Renamed the fixture record_xml_property to record_property and adapted logic so that the properties are passed to the TestReport object and thus allow compatibility with pytest-xdist.


  Commit: 7a62619a75693ed7ec6c74841a423ea07e50dfa7
      https://github.com/pytest-dev/pytest/commit/7a62619a75693ed7ec6c74841a423ea07e50dfa7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M _pytest/doctest.py
    M _pytest/python_api.py
    R changelog/1810.bugfix.rst
    R changelog/3052.bugfix
    R changelog/3161.bugfix.rst
    R changelog/3166.trivial.rst
    R changelog/3184.bugfix
    R changelog/3202.doc.rst
    R changelog/3206.bugfix.rst
    R changelog/985.trivial.rst
    M changelog/README.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.1.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M tasks/generate.py
    M tasks/requirements.txt
    M testing/python/raises.py
    M testing/test_pdb.py

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


  Commit: 3d4d0a261468e9f354b86f5149fe4dc2e8a85c7e
      https://github.com/pytest-dev/pytest/commit/3d4d0a261468e9f354b86f5149fe4dc2e8a85c7e
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    A changelog/3246.trival.rst
    M testing/test_terminal.py

  Log Message:
  -----------
  remove addcall in the terminal tests


  Commit: d844ad18c2c5cc7241278e7ecb4f764c81baca53
      https://github.com/pytest-dev/pytest/commit/d844ad18c2c5cc7241278e7ecb4f764c81baca53
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M changelog/3246.trival.rst

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


  Commit: d838193d2db7f9644c7f7959c3f9cf66033b5dfa
      https://github.com/pytest-dev/pytest/commit/d838193d2db7f9644c7f7959c3f9cf66033b5dfa
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M _pytest/junitxml.py
    A changelog/2770.removal.rst

  Log Message:
  -----------
  Add note about deprecating record_xml_property

Also make record_xml_property return record_property directly


  Commit: 567b1ea7a137757d32d5b187abe744bd4ee27b85
      https://github.com/pytest-dev/pytest/commit/567b1ea7a137757d32d5b187abe744bd4ee27b85
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M _pytest/runner.py

  Log Message:
  -----------
  Move user_properties to the end of parameter list for backward compatibility


  Commit: 7336dbb979ea7e8c0e325ab0caeba00754a01c57
      https://github.com/pytest-dev/pytest/commit/7336dbb979ea7e8c0e325ab0caeba00754a01c57
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    A changelog/3246.trival.rst
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #3246 from RonnyPfannschmidt/remove-addcall-in-tests

remove addcall in the terminal tests


  Commit: 54e63b7dd5344c8f9af3615fd5464fb28bfa463c
      https://github.com/pytest-dev/pytest/commit/54e63b7dd5344c8f9af3615fd5464fb28bfa463c
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M AUTHORS
    M _pytest/deprecated.py
    M _pytest/junitxml.py
    M _pytest/nodes.py
    M _pytest/runner.py
    A changelog/2770.feature
    A changelog/2770.removal.rst
    M doc/en/builtin.rst
    M doc/en/example/simple.rst
    M doc/en/usage.rst
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #2770 from HPENetworking/master

Make record_xml_property generic and compatible with xdist and markers.


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

  Changed paths:
    R _pytest/mark.py
    A _pytest/mark/__init__.py

  Log Message:
  -----------
  turn mark into a package


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

  Changed paths:
    A _pytest/mark/evaluate.py
    M _pytest/skipping.py

  Log Message:
  -----------
  move mark evaluator into mark package


  Commit: 25a3e9296adb3b29483895ec94f2a88616819207
      https://github.com/pytest-dev/pytest/commit/25a3e9296adb3b29483895ec94f2a88616819207
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M _pytest/skipping.py

  Log Message:
  -----------
  reduce the complexity of skipping terminal summary


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

  Changed paths:
    M setup.py

  Log Message:
  -----------
  update setup.py for the mark package


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

  Changed paths:
    M _pytest/mark/__init__.py
    A _pytest/mark/legacy.py

  Log Message:
  -----------
  move the keyword/mark matching to the "legacy" module


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

  Changed paths:
    M _pytest/mark/legacy.py

  Log Message:
  -----------
  remove complexity from match_keywords


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

  Changed paths:
    M _pytest/mark/__init__.py
    A _pytest/mark/structures.py
    M _pytest/python.py

  Log Message:
  -----------
  move current mark datastructures to own module


  Commit: 935dd3aaa5368f3a61f2e4996a09deed6c524406
      https://github.com/pytest-dev/pytest/commit/935dd3aaa5368f3a61f2e4996a09deed6c524406
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M _pytest/mark/__init__.py

  Log Message:
  -----------
  simplify complexyity in mark plugin modifyitems


  Commit: 2cd69cf632801ac975b55881d7cb3d3c17a09b0a
      https://github.com/pytest-dev/pytest/commit/2cd69cf632801ac975b55881d7cb3d3c17a09b0a
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

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

  Log Message:
  -----------
  sort out import misstake


  Commit: 0f58fc881b795478d3f93f8f2bbd6b73a11b4c57
      https://github.com/pytest-dev/pytest/commit/0f58fc881b795478d3f93f8f2bbd6b73a11b4c57
  Author: Thomas Hisch <thomas.hisch at ims.co.at>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Add pdb test with disabled logging plugin

Implement the test from #3210, which was not merged yet, because the PR was
abandoned in favor or #3234.


  Commit: 60358b6db8ef4ff082090103d095d9886e199c9f
      https://github.com/pytest-dev/pytest/commit/60358b6db8ef4ff082090103d095d9886e199c9f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M _pytest/mark/evaluate.py

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


  Commit: 9959164c9ac919d3be56776509b569accc50289a
      https://github.com/pytest-dev/pytest/commit/9959164c9ac919d3be56776509b569accc50289a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    A changelog/3250.trivial.rst

  Log Message:
  -----------
  Add CHANGELOG entry for #3250


  Commit: 0a3c80e959f5120148d297db17394456f840e6ae
      https://github.com/pytest-dev/pytest/commit/0a3c80e959f5120148d297db17394456f840e6ae
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #3253 from thisch/nolooggingtest

Add pdb test with disabled logging plugin


  Commit: fbc45be83f279f936121355649728f7aeec6e6a6
      https://github.com/pytest-dev/pytest/commit/fbc45be83f279f936121355649728f7aeec6e6a6
  Author: William Lee <wl1012 at yahoo.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M AUTHORS
    M _pytest/doctest.py
    M testing/test_doctest.py

  Log Message:
  -----------
  Fixed #3149 where doctest does not continue to run when there is a failure


  Commit: 14cd1e9d9438e86b0c0af9a9437abe578072aedc
      https://github.com/pytest-dev/pytest/commit/14cd1e9d9438e86b0c0af9a9437abe578072aedc
  Author: William Lee <wl1012 at yahoo.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    A changelog/3149.feature

  Log Message:
  -----------
  Added the feature in change log for #3149


  Commit: 8d90591b3305a245df318e2c78dd3fa27839ecad
      https://github.com/pytest-dev/pytest/commit/8d90591b3305a245df318e2c78dd3fa27839ecad
  Author: William Lee <wl1012 at yahoo.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M AUTHORS
    M _pytest/deprecated.py
    M _pytest/junitxml.py
    M _pytest/nodes.py
    M _pytest/runner.py
    A changelog/2770.feature
    A changelog/2770.removal.rst
    M doc/en/builtin.rst
    M doc/en/example/simple.rst
    M doc/en/usage.rst
    M testing/test_junitxml.py
    M testing/test_pdb.py

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


  Commit: e865f2a2358a8cbbf33018167a33c44598b9da55
      https://github.com/pytest-dev/pytest/commit/e865f2a2358a8cbbf33018167a33c44598b9da55
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-23 (Fri, 23 Feb 2018)

  Changed paths:
    M _pytest/cacheprovider.py
    M changelog/3034.feature
    M doc/en/cache.rst
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  #3034 Fix comments


  Commit: c032d4c5d57460f5bd4212bd1404c420359dcca3
      https://github.com/pytest-dev/pytest/commit/c032d4c5d57460f5bd4212bd1404c420359dcca3
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-23 (Fri, 23 Feb 2018)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M _pytest/compat.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/nodes.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M changelog/1478.feature
    A changelog/2770.feature
    A changelog/2770.removal.rst
    A changelog/3198.feature.rst
    A changelog/3204.feature
    A changelog/3213.feature
    A changelog/3228.trivial.rst
    A changelog/3246.trival.rst
    A changelog/README.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.1.rst
    M doc/en/builtin.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/logging.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M tasks/generate.py
    M tasks/requirements.txt
    M testing/logging/test_reporting.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/raises.py
    M testing/test_cacheprovider.py
    M testing/test_junitxml.py
    M testing/test_pdb.py
    M testing/test_recwarn.py
    M testing/test_session.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge branch 'features' of https://github.com/feuillemorte/pytest into 3034-new-tests-first


  Commit: 7f2dd74ae9ba23cc8c8a33e933b87df9bf708be0
      https://github.com/pytest-dev/pytest/commit/7f2dd74ae9ba23cc8c8a33e933b87df9bf708be0
  Author: William Lee <wl1012 at yahoo.com>
  Date:   2018-02-23 (Fri, 23 Feb 2018)

  Changed paths:
    M _pytest/doctest.py
    M testing/test_doctest.py

  Log Message:
  -----------
  Fixed test for the continue run


  Commit: f4cc45bb41b29f1aeab61dc3c3219d1e1baadc66
      https://github.com/pytest-dev/pytest/commit/f4cc45bb41b29f1aeab61dc3c3219d1e1baadc66
  Author: William Lee <wl1012 at yahoo.com>
  Date:   2018-02-23 (Fri, 23 Feb 2018)

  Changed paths:
    M _pytest/doctest.py
    M testing/test_doctest.py

  Log Message:
  -----------
  Turn on the continue on failure only when the flag is given


  Commit: c21eb7292451aa53b5fd24bc7e8f2ea9fb7ab912
      https://github.com/pytest-dev/pytest/commit/c21eb7292451aa53b5fd24bc7e8f2ea9fb7ab912
  Author: William Lee <wl1012 at yahoo.com>
  Date:   2018-02-23 (Fri, 23 Feb 2018)

  Changed paths:
    M doc/en/doctest.rst

  Log Message:
  -----------
  Added documentation for the continue-on-failure flag


  Commit: da3f4045e72cb46c91ede957081918a4f2293ec3
      https://github.com/pytest-dev/pytest/commit/da3f4045e72cb46c91ede957081918a4f2293ec3
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-02-24 (Sat, 24 Feb 2018)

  Changed paths:
    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/python.py
    M _pytest/skipping.py
    A changelog/3250.trivial.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3250 from RonnyPfannschmidt/mark-package

Mark package


  Commit: 307cd6630f6a6b39228dd21bd15ca478fd612a0d
      https://github.com/pytest-dev/pytest/commit/307cd6630f6a6b39228dd21bd15ca478fd612a0d
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M _pytest/mark/evaluate.py
    A changelog/3236.trivial.rst
    M testing/test_skipping.py

  Log Message:
  -----------
  Add the ability to use platform in pytest.mark.skipif


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

  Changed paths:
    M changelog/3149.feature

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


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

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

  Log Message:
  -----------
  Change 1642 entry from "trivial" to "feature"


  Commit: 4e405dd9f96e69cdd53901db930a2d79bc4f7e58
      https://github.com/pytest-dev/pytest/commit/4e405dd9f96e69cdd53901db930a2d79bc4f7e58
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    M _pytest/hookspec.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    A changelog/3255.feature.rst
    M testing/test_skipping.py

  Log Message:
  -----------
  Show "short test summary info" after tracebacks and warnings


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

  Changed paths:
    M testing/test_skipping.py

  Log Message:
  -----------
  Update test_skipping to test that platform can be used in xfail


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

  Changed paths:
    M changelog/3236.trivial.rst
    M testing/test_skipping.py

  Log Message:
  -----------
  Fixing grammar.


  Commit: 9479bda39215505562b5fd65512d8833ccffc273
      https://github.com/pytest-dev/pytest/commit/9479bda39215505562b5fd65512d8833ccffc273
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M changelog/3236.trivial.rst

  Log Message:
  -----------
  Adjust the CHANGELOG


  Commit: 94050a8aaf63f7890e3599bf10f43e1e2a31e8b7
      https://github.com/pytest-dev/pytest/commit/94050a8aaf63f7890e3599bf10f43e1e2a31e8b7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M _pytest/hookspec.py
    M _pytest/terminal.py

  Log Message:
  -----------
  Remove config paramter from pytest_terminal_summary as discussed during review


  Commit: 5cb72b6188be423288a8cf8653eafc6cd831271a
      https://github.com/pytest-dev/pytest/commit/5cb72b6188be423288a8cf8653eafc6cd831271a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M AUTHORS
    M _pytest/doctest.py
    A changelog/3149.feature
    M doc/en/doctest.rst
    M testing/test_doctest.py

  Log Message:
  -----------
  Merge pull request #3257 from will133/continue-on-failure

Continue on doctest failure


  Commit: a968c0fa0518d6c4c34ca7ee61eb9cec4d7012c1
      https://github.com/pytest-dev/pytest/commit/a968c0fa0518d6c4c34ca7ee61eb9cec4d7012c1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M _pytest/mark/evaluate.py
    A changelog/3236.trivial.rst
    M testing/test_skipping.py

  Log Message:
  -----------
  Merge pull request #3264 from jeffreyrack/3236-skipif-using-platform

#3236 Use platform module in pytest.mark


  Commit: dab96cbf278adc63c2119b884e9d2ae48b044368
      https://github.com/pytest-dev/pytest/commit/dab96cbf278adc63c2119b884e9d2ae48b044368
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M _pytest/hookspec.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    A changelog/3255.feature.rst
    M testing/test_skipping.py

  Log Message:
  -----------
  Merge pull request #3255 from nicoddemus/post-summary

Show "short test summary info" after tracebacks and warnings


  Commit: a2a64546ebdfc4ec16710eda12511910dbe7948b
      https://github.com/pytest-dev/pytest/commit/a2a64546ebdfc4ec16710eda12511910dbe7948b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M AUTHORS
    M README.rst
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/python_api.py
    M _pytest/terminal.py
    A changelog/3203.bugfix.rst
    A changelog/3247.bugfix.rst
    A changelog/3249.bugfix.rst
    A changelog/3259.trivial
    A changelog/3260.bugfix.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/writing_plugins.rst
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/test_config.py
    M testing/test_terminal.py

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


  Commit: 8239103aa95f18b10ea204aa22ca7967522d63fd
      https://github.com/pytest-dev/pytest/commit/8239103aa95f18b10ea204aa22ca7967522d63fd
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M testing/test_skipping.py

  Log Message:
  -----------
  Fix typo with test_summary_list_after_errors


  Commit: 90638b661d2f3159b3284020601eef3d25ebb9b5
      https://github.com/pytest-dev/pytest/commit/90638b661d2f3159b3284020601eef3d25ebb9b5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M testing/test_skipping.py

  Log Message:
  -----------
  Merge pull request #3270 from pytest-dev/blueyed-patch-1

Fix typo with test_summary_list_after_errors


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

  Changed paths:
    M AUTHORS
    M README.rst
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/python_api.py
    M _pytest/terminal.py
    A changelog/3203.bugfix.rst
    A changelog/3247.bugfix.rst
    A changelog/3249.bugfix.rst
    A changelog/3259.trivial
    A changelog/3260.bugfix.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/writing_plugins.rst
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/test_config.py
    M testing/test_terminal.py

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

Merge master into features


  Commit: ea854086e172b4738680894817453a386aa1081c
      https://github.com/pytest-dev/pytest/commit/ea854086e172b4738680894817453a386aa1081c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

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

  Log Message:
  -----------
  Rename 3236.trivial.rst to 3236.feature.rst


  Commit: 99aab2c3f532fa128257f79852078292001b5247
      https://github.com/pytest-dev/pytest/commit/99aab2c3f532fa128257f79852078292001b5247
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M _pytest/config.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  #3268 Added deprecation to custom configs


  Commit: a506052d12e28562f92bf6c07fac58c6c593e9aa
      https://github.com/pytest-dev/pytest/commit/a506052d12e28562f92bf6c07fac58c6c593e9aa
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    A changelog/3268.trivial

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


  Commit: f501d0021c3a86a46da928cf0fc3d806fd5ac03d
      https://github.com/pytest-dev/pytest/commit/f501d0021c3a86a46da928cf0fc3d806fd5ac03d
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

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

  Log Message:
  -----------
  #3268 Fix warning variable


  Commit: 1549d613792f2d861d29e8696e954c8dd3505025
      https://github.com/pytest-dev/pytest/commit/1549d613792f2d861d29e8696e954c8dd3505025
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M _pytest/config.py
    M _pytest/deprecated.py
    A changelog/3268.trivial
    M testing/deprecated_test.py

  Log Message:
  -----------
  Merge pull request #3274 from feuillemorte/3268-add-deprecation

Added warning when "[pytest]" section is used in a ".cfg" file passed with "-c"


  Commit: 08831396a55dae6f2f8816770448cf9e57b03976
      https://github.com/pytest-dev/pytest/commit/08831396a55dae6f2f8816770448cf9e57b03976
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/3034.feature
    M doc/en/cache.rst
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #3218 from feuillemorte/3034-new-tests-first

#3034 Added new option "--new-first"


  Commit: 54884b8c870b53e5171ceb7762079a86214e63ee
      https://github.com/pytest-dev/pytest/commit/54884b8c870b53e5171ceb7762079a86214e63ee
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M _pytest/logging.py
    M _pytest/main.py
    A changelog/3209.doc.rst
    A changelog/3241.bugfix.rst
    M doc/en/plugins.rst

  Log Message:
  -----------
  Merge branch 'revert-more_itertools-master' into introduce-more_itertools


  Commit: 25399da9047d044174f090f1315f9a4244b91135
      https://github.com/pytest-dev/pytest/commit/25399da9047d044174f090f1315f9a4244b91135
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M _pytest/python_api.py
    A changelog/3265.trivial.rst
    M setup.py

  Log Message:
  -----------
  Reintroduce more_itertools dependency

Reintroduce more_itertools that was added in #3265, now in the features branch


  Commit: 9879ac5911c06c867d62c29fa498d8cd3248a085
      https://github.com/pytest-dev/pytest/commit/9879ac5911c06c867d62c29fa498d8cd3248a085
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/python_api.py
    A changelog/3209.doc.rst
    A changelog/3241.bugfix.rst
    A changelog/3265.trivial.rst
    M doc/en/plugins.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3279 from nicoddemus/introduce-more_itertools

Re-Introduce more_itertools


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/3203.bugfix.rst
    R changelog/3209.doc.rst
    R changelog/3241.bugfix.rst
    R changelog/3247.bugfix.rst
    R changelog/3249.bugfix.rst
    R changelog/3259.trivial
    R changelog/3260.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.2.rst
    M doc/en/example/reportingdemo.rst

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


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

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  enhance skip except clause by directly using the Skipped exception


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

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  extract _warn_about_missing_assertion into freestanding function


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

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Merge pull request #3285 from RonnyPfannschmidt/minor-refactor

Minor refactors


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

  Changed paths:
    M _pytest/terminal.py

  Log Message:
  -----------
  remove unneeded commas


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

  Changed paths:
    M _pytest/nodes.py

  Log Message:
  -----------
  remove dead code


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

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

  Log Message:
  -----------
  move nodekeywords to the mark structures


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

  Changed paths:
    M _pytest/main.py
    M _pytest/nodes.py
    M testing/test_resultlog.py

  Log Message:
  -----------
  make nodeids precalculated, there is no sane reason to commpute lazyly


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

  Changed paths:
    A changelog/3291.feature

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


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

  Changed paths:
    M _pytest/_code/source.py

  Log Message:
  -----------
  simplify a few imports in _pytest._code.source


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

  Changed paths:
    M _pytest/_code/code.py

  Log Message:
  -----------
  turn FormattedExcinfo into a attrs class


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

  Changed paths:
    M _pytest/mark/structures.py

  Log Message:
  -----------
  makr strutures: lint fixings, removal of shadowing


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

  Changed paths:
    M _pytest/_code/source.py

  Log Message:
  -----------
  remove getstatementrange_old - its documented for python <= 2.4


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

  Changed paths:
    M _pytest/_code/source.py

  Log Message:
  -----------
  readline generator no longer needs to yield empty strings


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

  Changed paths:
    M _pytest/_code/source.py

  Log Message:
  -----------
  remove unused  assertion parameter in source and minor cleanups


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

  Changed paths:
    M _pytest/_code/source.py

  Log Message:
  -----------
  fix if-chain in _code.source


  Commit: 5f9bc557ea7be9e38badf098890efbdc571ff944
      https://github.com/pytest-dev/pytest/commit/5f9bc557ea7be9e38badf098890efbdc571ff944
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-09 (Fri, 09 Mar 2018)

  Changed paths:
    M _pytest/_code/source.py

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


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

  Changed paths:
    A changelog/3292.trivial.rst

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


  Commit: 54b15f5826438a311c22c693bdb248ed5f379e97
      https://github.com/pytest-dev/pytest/commit/54b15f5826438a311c22c693bdb248ed5f379e97
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-03-10 (Sat, 10 Mar 2018)

  Changed paths:
    M _pytest/config.py
    M _pytest/deprecated.py
    A changelog/3084.removal
    M doc/en/plugins.rst
    M doc/en/writing_plugins.rst
    M testing/deprecated_test.py

  Log Message:
  -----------
  deprecated pytest_plugins in non-top-level conftest


  Commit: d2e533b8a3636f29d8999b90fed1072ac4b5ee1b
      https://github.com/pytest-dev/pytest/commit/d2e533b8a3636f29d8999b90fed1072ac4b5ee1b
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-03-10 (Sat, 10 Mar 2018)

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/3139.feature
    M doc/en/cache.rst
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  implemented --last-failed-no-failures


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

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

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


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

  Changed paths:
    M doc/en/plugins.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Fix typo in docs


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

  Changed paths:
    M _pytest/main.py
    M _pytest/mark/structures.py
    M _pytest/nodes.py
    M _pytest/terminal.py
    A changelog/3291.trivial.rst
    M testing/test_resultlog.py

  Log Message:
  -----------
  Merge pull request #3291 from RonnyPfannschmidt/small-moves

move some code and make nodeid computed early


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

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    A changelog/3292.trivial.rst

  Log Message:
  -----------
  Merge pull request #3292 from RonnyPfannschmidt/exception-attrs

internal refactor port exc FOrmattedExcinfo to attrs, remove old code


  Commit: 37a52607c2f496340caea6936c3e24e9863b3558
      https://github.com/pytest-dev/pytest/commit/37a52607c2f496340caea6936c3e24e9863b3558
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-13 (Tue, 13 Mar 2018)

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

  Log Message:
  -----------
  unify cli verbosity handling

based on https://github.com/pytest-dev/pytest/issues/3294#issuecomment-372190084

we really shouldnt have N options we post mortem hack together to determine verbosity
this change starts by unifying the data, we still need to handle deprecation/removal of config.quiet


  Commit: 87f200324506d09a819b66d3af06ac4c9777480f
      https://github.com/pytest-dev/pytest/commit/87f200324506d09a819b66d3af06ac4c9777480f
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-03-13 (Tue, 13 Mar 2018)

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

  Log Message:
  -----------
  remove CmdOptions since we can use argparse.Namespace()


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

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

  Log Message:
  -----------
  Merge pull request #3296 from RonnyPfannschmidt/verbosity-actions

unify cli verbosity handling


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

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

  Log Message:
  -----------
  Merge pull request #3304 from RonnyPfannschmidt/cmdoptions-removal

remove CmdOptions since we can use argparse.Namespace()


  Commit: c34dde7a3f582ddb57560ea08cfe00b84be31e16
      https://github.com/pytest-dev/pytest/commit/c34dde7a3f582ddb57560ea08cfe00b84be31e16
  Author: Tadeu Manoel <e.tadeu at gmail.com>
  Date:   2018-03-14 (Wed, 14 Mar 2018)

  Changed paths:
    M _pytest/python_api.py
    A changelog/3312.feature
    M testing/python/approx.py

  Log Message:
  -----------
  Add support for pytest.approx comparisons between array and scalar


  Commit: 161d4e5fe4730f46e1fb803595198068b20c94c5
      https://github.com/pytest-dev/pytest/commit/161d4e5fe4730f46e1fb803595198068b20c94c5
  Author: Tadeu Manoel <e.tadeu at gmail.com>
  Date:   2018-03-14 (Wed, 14 Mar 2018)

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

  Log Message:
  -----------
  Add support for pytest.approx comparisons between scalar and array (inverted order)


  Commit: 97f9a8bfdf25e051fbe58b3d645afbc6d9141fbd
      https://github.com/pytest-dev/pytest/commit/97f9a8bfdf25e051fbe58b3d645afbc6d9141fbd
  Author: Tadeu Manoel <e.tadeu at gmail.com>
  Date:   2018-03-14 (Wed, 14 Mar 2018)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Add fixes to make `numpy.approx` array-scalar comparisons work with older numpy versions


  Commit: 42c84f4f30725e42b4ba3e0aa7480549666e2f01
      https://github.com/pytest-dev/pytest/commit/42c84f4f30725e42b4ba3e0aa7480549666e2f01
  Author: Tadeu Manoel <e.tadeu at gmail.com>
  Date:   2018-03-15 (Thu, 15 Mar 2018)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Add fixes to `numpy.approx` array-scalar comparisons (from PR suggestions)


  Commit: a754f00ae7e815786ef917654c4106c7f39dad69
      https://github.com/pytest-dev/pytest/commit/a754f00ae7e815786ef917654c4106c7f39dad69
  Author: Tadeu Manoel <e.tadeu at gmail.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Improve `numpy.approx` array-scalar comparisons

So that `self.expected` in ApproxNumpy is always a numpy array.


  Commit: 1fff81e21d4145e501d618bced645cbfaa5f5afc
      https://github.com/pytest-dev/pytest/commit/1fff81e21d4145e501d618bced645cbfaa5f5afc
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/mark/__init__.py
    M _pytest/monkeypatch.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/tmpdir.py
    A changelog/1713.doc.rst
    A changelog/2370.bugfix.rst
    A changelog/3245.trivial.rst
    A changelog/3297.bugfix.rst
    A changelog/3308.trivial.rst
    A changelog/3314.bugfix.rst
    M doc/en/_templates/globaltoc.html
    M doc/en/_templates/links.html
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/conf.py
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/doctest.rst
    M doc/en/example/simple.rst
    M doc/en/getting-started.rst
    M doc/en/logging.rst
    M doc/en/mark.rst
    M doc/en/monkeypatch.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    A doc/en/reference.rst
    M doc/en/requirements.txt
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M testing/logging/test_fixture.py
    M testing/test_capture.py
    M tox.ini

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


  Commit: 86d6804e60ecfcdb0a2b7a73e2e274ffea00d0fb
      https://github.com/pytest-dev/pytest/commit/86d6804e60ecfcdb0a2b7a73e2e274ffea00d0fb
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M _pytest/python_api.py
    A changelog/3312.feature
    M testing/python/approx.py

  Log Message:
  -----------
  Merge pull request #3313 from tadeu/approx-array-scalar

Add support for `pytest.approx` comparisons between array and scalar


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

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/mark/__init__.py
    M _pytest/monkeypatch.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/tmpdir.py
    A changelog/1713.doc.rst
    A changelog/2370.bugfix.rst
    A changelog/3245.trivial.rst
    A changelog/3297.bugfix.rst
    A changelog/3308.trivial.rst
    A changelog/3314.bugfix.rst
    M doc/en/_templates/globaltoc.html
    M doc/en/_templates/links.html
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/conf.py
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/doctest.rst
    M doc/en/example/simple.rst
    M doc/en/getting-started.rst
    M doc/en/logging.rst
    M doc/en/mark.rst
    M doc/en/monkeypatch.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    A doc/en/reference.rst
    M doc/en/requirements.txt
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M testing/logging/test_fixture.py
    M testing/test_capture.py
    M tox.ini

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

Merge master into features


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

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/3139.feature
    M doc/en/cache.rst
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #3295 from brianmaissy/feature/last-failed-no-failures-behavior

implemented --last-failed-no-failures


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

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Use re_match_lines in test_class_ordering

"[1-a]" works fine using fnmatch_lines, but "[a-1]" breaks horribly
inside `re`.


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

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2405.feature.rst
    M doc/en/fixture.rst
    M testing/acceptance_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Sort fixtures by scope when determining fixture closure

Fix #2405


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

  Changed paths:
    M _pytest/config.py
    M _pytest/deprecated.py
    A changelog/3084.removal
    M doc/en/plugins.rst
    M doc/en/writing_plugins.rst
    M testing/deprecated_test.py

  Log Message:
  -----------
  Merge pull request #3230 from brianmaissy/features

deprecate pytest_plugins in non-top-level conftest


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

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2405.feature.rst
    M doc/en/fixture.rst
    M testing/acceptance_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3306 from nicoddemus/2405-scope-fixture-order

Instantiate fixtures by scope order in test function requests


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

  Changed paths:
    M AUTHORS
    M changelog/3245.trivial.rst
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    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 tox.ini

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


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

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Fix example in usage.rst


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

  Changed paths:
    M CHANGELOG.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Preparing release version 3.5.0


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

  Changed paths:
    M _pytest/terminal.py

  Log Message:
  -----------
  Remove `terminal.flatten` function in favor of collapse from more_itertools


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

  Changed paths:
    A changelog/3330.trivial.rst

  Log Message:
  -----------
  Add CHANGELOG for #3330


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

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

  Log Message:
  -----------
  Merge pull request #3330 from nicoddemus/remove-custom-flatten

Remove terminal.flatten function in favor of collapse from more_itertools


  Commit: 5ecff652853b09e9616bc0984e4d88ab3286f562
      https://github.com/pytest-dev/pytest/commit/5ecff652853b09e9616bc0984e4d88ab3286f562
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-22 (Thu, 22 Mar 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M changelog/3245.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    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/markers.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3327 from nicoddemus/release-3.5.0

Release 3.5.0


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

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/cacheprovider.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _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/nodes.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    A changelog/1478.feature
    A changelog/1642.feature.rst
    A changelog/2405.feature.rst
    A changelog/2770.feature
    A changelog/2770.removal.rst
    A changelog/3034.feature
    A changelog/3084.removal
    A changelog/3139.feature
    A changelog/3149.feature
    A changelog/3156.feature
    A changelog/3189.feature
    A changelog/3190.feature
    A changelog/3198.feature.rst
    A changelog/3204.feature
    A changelog/3213.feature
    A changelog/3228.trivial.rst
    A changelog/3236.feature.rst
    A changelog/3246.trival.rst
    A changelog/3250.trivial.rst
    A changelog/3255.feature.rst
    A changelog/3265.trivial.rst
    A changelog/3268.trivial
    A changelog/3291.trivial.rst
    A changelog/3292.trivial.rst
    A changelog/3296.feature
    A changelog/3296.trivial
    A changelog/3304.trivial
    A changelog/3312.feature
    A changelog/3330.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/customize.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.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/logging.rst
    M doc/en/plugins.rst
    M doc/en/reference.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/test_cacheprovider.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_pdb.py
    M testing/test_resultlog.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

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


Compare: https://github.com/pytest-dev/pytest/compare/fc4f769888f2...ed118d7f2051

From nicoddemus at gmail.com  Thu Mar 22 20:09:40 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 22 Mar 2018 17:09:40 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f78953: Add missing reference
 doc for filterwarnings mark
Message-ID: <5ab445c4e4ef7_58a72ac5e9559c0c98499@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: f78953fd815f3c8b0faa48bd0bb202ac492a4d05
      https://github.com/pytest-dev/pytest/commit/f78953fd815f3c8b0faa48bd0bb202ac492a4d05
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-22 (Thu, 22 Mar 2018)

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

  Log Message:
  -----------
  Add missing reference doc for filterwarnings mark


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

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

  Log Message:
  -----------
  Merge pull request #3336 from nicoddemus/filter-warnings-ref-doc

Add missing reference doc for filterwarnings mark


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

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/cacheprovider.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _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/nodes.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    A changelog/1478.feature
    A changelog/1642.feature.rst
    A changelog/2405.feature.rst
    A changelog/2770.feature
    A changelog/2770.removal.rst
    A changelog/3034.feature
    A changelog/3084.removal
    A changelog/3139.feature
    A changelog/3149.feature
    A changelog/3156.feature
    A changelog/3189.feature
    A changelog/3190.feature
    A changelog/3198.feature.rst
    A changelog/3204.feature
    A changelog/3213.feature
    A changelog/3228.trivial.rst
    A changelog/3236.feature.rst
    A changelog/3246.trival.rst
    A changelog/3250.trivial.rst
    A changelog/3255.feature.rst
    A changelog/3265.trivial.rst
    A changelog/3268.trivial
    A changelog/3291.trivial.rst
    A changelog/3292.trivial.rst
    A changelog/3296.feature
    A changelog/3296.trivial
    A changelog/3304.trivial
    A changelog/3312.feature
    A changelog/3330.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/customize.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.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/logging.rst
    M doc/en/plugins.rst
    M doc/en/reference.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/test_cacheprovider.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_pdb.py
    M testing/test_resultlog.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

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


Compare: https://github.com/pytest-dev/pytest/compare/5ecff652853b...ed118d7f2051

From nicoddemus at gmail.com  Mon Mar 26 10:20:36 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 26 Mar 2018 07:20:36 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] ff3d13: Update typo in
 fixture.rst
Message-ID: <5ab901b470aa_727c2b04db3b3c14370c2@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: ff3d13ed0efab6692a07059b1d61c53eec6e0412
      https://github.com/pytest-dev/pytest/commit/ff3d13ed0efab6692a07059b1d61c53eec6e0412
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Update typo in fixture.rst



From nicoddemus at gmail.com  Tue Mar 27 17:03:23 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 27 Mar 2018 14:03:23 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d895f5: logging.py: Don't
 change log level of the root log...
Message-ID: <5abab19bc9ec6_2ab532ac302ee5c1080569@hookshot-fe-dfcc362.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/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: 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


Compare: https://github.com/pytest-dev/pytest/compare/ed118d7f2051...2962c7367cff

From flub at devork.be  Fri Mar 30 08:19:40 2018
From: flub at devork.be (Floris Bruynooghe)
Date: Fri, 30 Mar 2018 05:19:40 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] e5eba8: Remove stale CHANGELOG
 entries
Message-ID: <5abe2b5c1f1c9_12542b09106b5c1c34776@hookshot-fe-265448d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: e5eba8419accaedcd4585b499d838ef3d93a1763
      https://github.com/pytest-dev/pytest/commit/e5eba8419accaedcd4585b499d838ef3d93a1763
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    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

  Log Message:
  -----------
  Remove stale CHANGELOG entries

Those were not removed in the last release because of a bug in
towncrier; I was about to fallback to don't use the .rst extension
for entries but just noticed that this was fixed in towncrier 17.8.0
so it should no longer be a problem.


  Commit: 77128ee2dcc44b7d95ee850bab3e29b2bc430c68
      https://github.com/pytest-dev/pytest/commit/77128ee2dcc44b7d95ee850bab3e29b2bc430c68
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    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

  Log Message:
  -----------
  Merge pull request #3356 from nicoddemus/remove-stale-changelog-entries

Remove stale CHANGELOG entries


Compare: https://github.com/pytest-dev/pytest/compare/f1c9efc358b4...77128ee2dcc4