From nicoddemus at gmail.com  Fri Feb  2 14:13:03 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 02 Feb 2018 11:13:03 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 90a8fa: Fix test for py37
Message-ID: <5a74b83f1799f_13c22b07da669c18118524@hookshot-fe-265448d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 90a8faabbaf22ca376af71cc49d3ab81c510e736
      https://github.com/pytest-dev/pytest/commit/90a8faabbaf22ca376af71cc49d3ab81c510e736
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-01-30 (Tue, 30 Jan 2018)

  Changed paths:
    M testing/test_recwarn.py

  Log Message:
  -----------
  Fix test for py37

In previous Python versions, the list of warnigns appears like:

	... list of emitted warnings is: [UserWarning('user',)].

In Python 3.7 apparently the string representation has been improved to:

	... list of emitted warnings is: [UserWarning('user')].

Fix #3011


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

  Changed paths:
    M testing/test_recwarn.py

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

Fix test for py37


Compare: https://github.com/pytest-dev/pytest/compare/89a55d85a9d3...8c81722a0c82

From nicoddemus at gmail.com  Sat Feb  3 20:35:41 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 03 Feb 2018 17:35:41 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 746338: skip failing
 pdb/doctest test on mac
Message-ID: <5a76636db4b6c_6d012ae3f0a6dc144669@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 74633815aa55f6e38ca2ac4072cc02fb247b43f5
      https://github.com/pytest-dev/pytest/commit/74633815aa55f6e38ca2ac4072cc02fb247b43f5
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-02-03 (Sat, 03 Feb 2018)

  Changed paths:
    A changelog/985.bugfix
    M testing/test_pdb.py

  Log Message:
  -----------
  skip failing pdb/doctest test on mac


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

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  xfail is better than skip


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

  Changed paths:
    A changelog/985.bugfix
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #3187 from brianmaissy/bugfix/skip_failing_pdb_doctest_test_on_mac

skip failing pdb/doctest test on mac


Compare: https://github.com/pytest-dev/pytest/compare/8c81722a0c82...9202ba91cf1f

From nicoddemus at gmail.com  Tue Feb  6 05:54:46 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 06 Feb 2018 02:54:46 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 715270: Update changelog entry
 to "trivial" as it is a tem...
Message-ID: <5a7989766acf_63872ab6a0f01c0873340@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

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

  Changed paths:
    R changelog/985.bugfix
    A changelog/985.trivial

  Log Message:
  -----------
  Update changelog entry to "trivial" as it is a temporary workaround

I think this is a more appropriate category given that the underlying problem still exists



From nicoddemus at gmail.com  Tue Feb  6 18:42:13 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 06 Feb 2018 15:42:13 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] c0ef4a: Add captured log msgs
 to junit xml file
Message-ID: <5a7a3d553ebda_2dc12b068ad69c1c1775e@hookshot-fe-265448d.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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


Compare: https://github.com/pytest-dev/pytest/compare/f2fb841b2982...29a074eae30c

From nicoddemus at gmail.com  Wed Feb  7 15:09:47 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 07 Feb 2018 12:09:47 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 67558e: Additionally handle
 logstart and logfinish hooks
Message-ID: <5a7b5d0bb1ba4_7cc62afd3f137c046353e@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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


Compare: https://github.com/pytest-dev/pytest/compare/29a074eae30c...ed12cf3fb385

From nicoddemus at gmail.com  Wed Feb  7 15:15:43 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 07 Feb 2018 12:15:43 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 4458e6: Fix ordering of tests
 to minimize fixture creating
Message-ID: <5a7b5e6f3f79_71d02b0587603bfc1138cc@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 4458e65fe757ee34eddcf79c50e060018d327803
      https://github.com/pytest-dev/pytest/commit/4458e65fe757ee34eddcf79c50e060018d327803
  Author: Aaron <aaron at insight-engines.com>
  Date:   2018-02-01 (Thu, 01 Feb 2018)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/3161.bugfix
    M testing/python/fixture.py

  Log Message:
  -----------
  Fix ordering of tests to minimize fixture creating


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

  Changed paths:
    M changelog/3161.bugfix

  Log Message:
  -----------
  Reword changelog a bit


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

  Changed paths:
    M _pytest/fixtures.py
    A changelog/3161.bugfix
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3183 from cheezman34/master

Fix ordering of tests to minimize fixture creating


Compare: https://github.com/pytest-dev/pytest/compare/71527072801b...f72182977d93

From nicoddemus at gmail.com  Wed Feb  7 15:16:18 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 07 Feb 2018 12:16:18 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 653aba: Mention
 outcome.force_result() and add link to plu...
Message-ID: <5a7b5e92143aa_70022aae9e8a5bfc945f2@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 653abad27bbef8cdc28dd9e3a9393fbf0e0b2606
      https://github.com/pytest-dev/pytest/commit/653abad27bbef8cdc28dd9e3a9393fbf0e0b2606
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-01-31 (Wed, 31 Jan 2018)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Mention outcome.force_result() and add link to pluggy's docs

Related to #3169


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

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #3177 from nicoddemus/mention-force-result

Mention outcome.force_result() and add link to pluggy's docs


Compare: https://github.com/pytest-dev/pytest/compare/f72182977d93...16c52f05f14d

From nicoddemus at gmail.com  Wed Feb  7 15:19:01 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 07 Feb 2018 12:19:01 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] d78415: #1642 Add rootdir option
Message-ID: <5a7b5f356126b_57bd2b0102e3fc1435168@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  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: 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: 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


Compare: https://github.com/pytest-dev/pytest/compare/ed12cf3fb385...ce0a9aadec04

From nicoddemus at gmail.com  Thu Feb  8 14:07:49 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 08 Feb 2018 11:07:49 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 0b7125: Expose `log_cli` as a
 CLI parser option.
Message-ID: <5a7ca005de023_3792ac905777c04119291@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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.


Compare: https://github.com/pytest-dev/pytest/compare/ce0a9aadec04...bba258aa5eb3

From nicoddemus at gmail.com  Thu Feb  8 17:10:11 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 08 Feb 2018 14:10:11 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] d03087: Create reference and
 moved Objects and Hooks refer...
Message-ID: <5a7ccac34314_79fe2b09666dbc0457778@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: d03087c249ed6af8d3089e0224d6163a2ecc296a
      https://github.com/pytest-dev/pytest/commit/d03087c249ed6af8d3089e0224d6163a2ecc296a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-07 (Wed, 07 Feb 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: 48fbf87e6d53248bb2f924443cc8471b885f327c
      https://github.com/pytest-dev/pytest/commit/48fbf87e6d53248bb2f924443cc8471b885f327c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-07 (Wed, 07 Feb 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: a855338697b1f205648b40875eda8d793690d411
      https://github.com/pytest-dev/pytest/commit/a855338697b1f205648b40875eda8d793690d411
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-07 (Wed, 07 Feb 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: 7a13341c9c6bc9c89d093895fac87ad15e01149a
      https://github.com/pytest-dev/pytest/commit/7a13341c9c6bc9c89d093895fac87ad15e01149a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-07 (Wed, 07 Feb 2018)

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

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


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

  Changed paths:
    M doc/en/builtin.rst
    M doc/en/conf.py
    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: 5b72728e93db52f76610c4d293c9dbad170ffc03
      https://github.com/pytest-dev/pytest/commit/5b72728e93db52f76610c4d293c9dbad170ffc03
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-08 (Thu, 08 Feb 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: d64403b28dd2ff77d7a17a113479ec974e29746b
      https://github.com/pytest-dev/pytest/commit/d64403b28dd2ff77d7a17a113479ec974e29746b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-08 (Thu, 08 Feb 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


Compare: https://github.com/pytest-dev/pytest/compare/d03087c249ed^...d64403b28dd2

From nicoddemus at gmail.com  Thu Feb  8 17:13:53 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 08 Feb 2018 14:13:53 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 380872: Create reference and
 moved Objects and Hooks refer...
Message-ID: <5a7ccba1285b5_49932b1f6f9f1c0851032@hookshot-fe-7191cb1.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: 3808728b314da3a88bf25d721e9b803903d74b06
      https://github.com/pytest-dev/pytest/commit/3808728b314da3a88bf25d721e9b803903d74b06
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-08 (Thu, 08 Feb 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: 1a5ba03b5f225ccd440f6f6d3e5168859bb078ec
      https://github.com/pytest-dev/pytest/commit/1a5ba03b5f225ccd440f6f6d3e5168859bb078ec
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-08 (Thu, 08 Feb 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: 55ad09b56ffeffc5c510dbab6b624cabe0dc228e
      https://github.com/pytest-dev/pytest/commit/55ad09b56ffeffc5c510dbab6b624cabe0dc228e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-08 (Thu, 08 Feb 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: fa6e0760f942d7fa07b4dbf870ad9baa25a73739
      https://github.com/pytest-dev/pytest/commit/fa6e0760f942d7fa07b4dbf870ad9baa25a73739
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

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

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


  Commit: e7281843db4f271bed73d0551c37e4d893d28cda
      https://github.com/pytest-dev/pytest/commit/e7281843db4f271bed73d0551c37e4d893d28cda
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-08 (Thu, 08 Feb 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: cd652827a407e467eee7952772677b9891006bf3
      https://github.com/pytest-dev/pytest/commit/cd652827a407e467eee7952772677b9891006bf3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-08 (Thu, 08 Feb 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: 82f97980a8d64d754d0674383942f3b70c276e69
      https://github.com/pytest-dev/pytest/commit/82f97980a8d64d754d0674383942f3b70c276e69
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-08 (Thu, 08 Feb 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


Compare: https://github.com/pytest-dev/pytest/compare/d64403b28dd2...82f97980a8d6

From nicoddemus at gmail.com  Thu Feb  8 17:29:54 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 08 Feb 2018 14:29:54 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] b1668f: Use :no-auto-options:
 in capsys fixtures
Message-ID: <5a7ccf62f3cad_5932b15f5961c0810364b@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

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

  Changed paths:
    M doc/en/reference.rst

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

Otherwise they are recognized as iterators



From nicoddemus at gmail.com  Fri Feb  9 11:06:25 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 09 Feb 2018 08:06:25 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] c04e24: Rename 3161.bugfix to
 3161.bugfix.rst
Message-ID: <5a7dc701a1771_71ff2ae9615bdc0c37856@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: c04e248de54741b39f93d4ad07bd81e6bc6a2b3e
      https://github.com/pytest-dev/pytest/commit/c04e248de54741b39f93d4ad07bd81e6bc6a2b3e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

  Changed paths:
    R changelog/3161.bugfix
    A changelog/3161.bugfix.rst

  Log Message:
  -----------
  Rename 3161.bugfix to 3161.bugfix.rst



From nicoddemus at gmail.com  Fri Feb  9 15:36:37 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 09 Feb 2018 12:36:37 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 949a62: #1478 Added --no-stdout
 option
Message-ID: <5a7e0655a2990_5b0b2aeaa2063c10405c8@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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: 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: 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


Compare: https://github.com/pytest-dev/pytest/compare/bba258aa5eb3...063e2da967a7

From nicoddemus at gmail.com  Fri Feb  9 23:32:58 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 09 Feb 2018 20:32:58 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] e5b527: Add Sphinx parameter
 docs for `match` and `message...
Message-ID: <5a7e75fab9145_72e12ada88edbc04897e2@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: e5b527d0e3d72cf8e2cac4a4f7fb7b9a2d2f6e06
      https://github.com/pytest-dev/pytest/commit/e5b527d0e3d72cf8e2cac4a4f7fb7b9a2d2f6e06
  Author: Andy Freeland <andy at andyfreeland.net>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

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

  Log Message:
  -----------
  Add Sphinx parameter docs for `match` and `message` args to `pytest.raises()`


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

  Changed paths:
    A changelog/3202.doc.rst
    R changelog/3202.trivial.rst

  Log Message:
  -----------
  Update and rename 3202.trivial.rst to 3202.doc.rst


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

  Changed paths:
    M _pytest/python_api.py
    A changelog/3202.doc.rst

  Log Message:
  -----------
  Merge pull request #3202 from rouge8/pytest-raises-sphinx-parameters

Add Sphinx parameter docs for `match` and `message` args to `pytest.raises()`


Compare: https://github.com/pytest-dev/pytest/compare/c04e248de547...e7bcc854d975

From nicoddemus at gmail.com  Thu Feb 15 16:35:46 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 15 Feb 2018 13:35:46 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] b6166d: Fix mock patchings
 detection when both mock and un...
Message-ID: <5a85fd32583d_296b2b2726049c1455893@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: b6166dccb4d2b48173aa7e7739be52db9d2d56a0
      https://github.com/pytest-dev/pytest/commit/b6166dccb4d2b48173aa7e7739be52db9d2d56a0
  Author: Marcin Bachry <hegel666 at gmail.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M _pytest/compat.py
    A changelog/3206.bugfix.rst
    M testing/python/integration.py

  Log Message:
  -----------
  Fix mock patchings detection when both mock and unittest.mock are present


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

  Changed paths:
    M _pytest/compat.py
    A changelog/3206.bugfix.rst
    M testing/python/integration.py

  Log Message:
  -----------
  Merge pull request #3206 from mbachry/fix-unittest-mock

Fix mock patchings detection when both mock and unittest.mock are present


Compare: https://github.com/pytest-dev/pytest/compare/e7bcc854d975...371eb8c6af8d

From nicoddemus at gmail.com  Thu Feb 15 16:38:24 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 15 Feb 2018 13:38:24 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 7656fc: Added printing of
 captured stdout and stderr befor...
Message-ID: <5a85fdd0b5335_38d62ab1c2573c14909fa@hookshot-fe-da92815.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7656fc8320b5920d860e9028f322475a021e7666
      https://github.com/pytest-dev/pytest/commit/7656fc8320b5920d860e9028f322475a021e7666
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M AUTHORS
    M _pytest/debugging.py
    A changelog/3052.bugfix
    M testing/test_pdb.py

  Log Message:
  -----------
  Added printing of captured stdout and stderr before entering pdb


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

  Changed paths:
    M AUTHORS
    M _pytest/debugging.py
    A changelog/3052.bugfix
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #3186 from brianmaissy/bugfix/print_captured_stdout_before_entering_pdb

Added printing of captured stdout before entering pdb


Compare: https://github.com/pytest-dev/pytest/compare/371eb8c6af8d...6bc45d158d1b

From nicoddemus at gmail.com  Fri Feb 16 17:50:25 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 16 Feb 2018 14:50:25 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 774c53: Add --deselect command
 line option
Message-ID: <5a8760317db11_2af212ab0a6dcbc08790ce@hookshot-fe-dfcc362.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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


Compare: https://github.com/pytest-dev/pytest/compare/063e2da967a7...b1abe5db2318

From nicoddemus at gmail.com  Fri Feb 16 18:19:40 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 16 Feb 2018 15:19:40 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] d776e5: Fix issue where a new
 line was always written for ...
Message-ID: <5a87670c701dd_7f3d2ac025095c08957aa@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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


Compare: https://github.com/pytest-dev/pytest/compare/b1abe5db2318...05faa69c379d

From nicoddemus at gmail.com  Sat Feb 17 06:02:45 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 17 Feb 2018 03:02:45 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 0d15a4: Don't traceback on
 unkown sections.
Message-ID: <5a880bd5974ea_76482b2a6c41fc00855d6@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0d15a4686352ee2e6b8a2842fe47e1cd6d86e4f7
      https://github.com/pytest-dev/pytest/commit/0d15a4686352ee2e6b8a2842fe47e1cd6d86e4f7
  Author: Pedro Algarvio <pedro at algarvio.me>
  Date:   2018-02-05 (Mon, 05 Feb 2018)

  Changed paths:
    M _pytest/logging.py
    A changelog/3184.bugfix
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Don't traceback on unkown sections.


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

  Changed paths:
    M changelog/3184.bugfix

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


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

  Changed paths:
    M _pytest/logging.py
    A changelog/3184.bugfix
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Merge pull request #3188 from s0undt3ch/issues/3184

Don't traceback on unkown sections.


Compare: https://github.com/pytest-dev/pytest/compare/6bc45d158d1b...00d3001138b3

From nicoddemus at gmail.com  Sat Feb 17 06:03:28 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 17 Feb 2018 03:03:28 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 649613: Show deselection count
 before tests are exectued
Message-ID: <5a880c002e937_5df02af3d593dc0014562a@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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: 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


Compare: https://github.com/pytest-dev/pytest/compare/05faa69c379d...fa8354e87207

From nicoddemus at gmail.com  Sat Feb 17 07:20:42 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 17 Feb 2018 04:20:42 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 0f6879: Small update to
 changelog/README.rst
Message-ID: <5a881e1acf5f6_36b2aecc1c77bfc1544fd@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0f6879bf5e55ea2dd323c25dba975ab8c864435f
      https://github.com/pytest-dev/pytest/commit/0f6879bf5e55ea2dd323c25dba975ab8c864435f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M changelog/README.rst

  Log Message:
  -----------
  Small update to changelog/README.rst



From nicoddemus at gmail.com  Sat Feb 17 09:59:57 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 17 Feb 2018 06:59:57 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 2a1b11: If we fail to import
 doctest.UnexpectedException d...
Message-ID: <5a88436d6c71a_5aa2aee47e5fc0815146@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 2a1b1107c5395560e7335ab0ef775343b3f65566
      https://github.com/pytest-dev/pytest/commit/2a1b1107c5395560e7335ab0ef775343b3f65566
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-01-25 (Thu, 25 Jan 2018)

  Changed paths:
    M _pytest/debugging.py
    A changelog/1810.bugfix

  Log Message:
  -----------
  If we fail to import doctest.UnexpectedException during postmortem, fail quietly and continue


  Commit: 547070e2d83617988ce07f2de6240f3ba3705d9c
      https://github.com/pytest-dev/pytest/commit/547070e2d83617988ce07f2de6240f3ba3705d9c
  Author: Alan Velasco <AlanVelasco.A at gmail.com>
  Date:   2018-01-30 (Tue, 30 Jan 2018)

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

  Log Message:
  -----------
  Switch `for_parameterize` to `for_parametrize`


  Commit: e12a588c394d2f96e89b6e348133589d72e2bf2e
      https://github.com/pytest-dev/pytest/commit/e12a588c394d2f96e89b6e348133589d72e2bf2e
  Author: Alan Velasco <AlanVelasco.A at gmail.com>
  Date:   2018-01-30 (Tue, 30 Jan 2018)

  Changed paths:
    M .gitignore
    M AUTHORS
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M _pytest/_argcomplete.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/nodes.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    R changelog/2022.bugfix
    R changelog/2423.doc
    R changelog/2457.doc
    R changelog/2698.doc
    R changelog/3067.trivial
    R changelog/3074.bugfix
    R changelog/3076.doc
    R changelog/3092.doc
    R changelog/3129.trivial
    R changelog/3131.doc
    R changelog/3143.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.0.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/logging.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M pytest.py
    M tasks/requirements.txt
    M testing/acceptance_test.py
    M testing/deprecated_test.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
    R testing/test_cache.py
    A testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_pytester.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M tox.ini

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


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

  Changed paths:
    M testing/test_recwarn.py

  Log Message:
  -----------
  Fix test for py37

In previous Python versions, the list of warnigns appears like:

	... list of emitted warnings is: [UserWarning('user',)].

In Python 3.7 apparently the string representation has been improved to:

	... list of emitted warnings is: [UserWarning('user')].

Fix #3011


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

  Changed paths:
    M changelog/3166.trivial

  Log Message:
  -----------
  Small update to CHANGELOG


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

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

  Log Message:
  -----------
  Merge pull request #3166 from alanbato/typo_for_parametrize

Switch `for_parameterize` to `for_parametrize`


  Commit: 653abad27bbef8cdc28dd9e3a9393fbf0e0b2606
      https://github.com/pytest-dev/pytest/commit/653abad27bbef8cdc28dd9e3a9393fbf0e0b2606
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-01-31 (Wed, 31 Jan 2018)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Mention outcome.force_result() and add link to pluggy's docs

Related to #3169


  Commit: 4458e65fe757ee34eddcf79c50e060018d327803
      https://github.com/pytest-dev/pytest/commit/4458e65fe757ee34eddcf79c50e060018d327803
  Author: Aaron <aaron at insight-engines.com>
  Date:   2018-02-01 (Thu, 01 Feb 2018)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/3161.bugfix
    M testing/python/fixture.py

  Log Message:
  -----------
  Fix ordering of tests to minimize fixture creating


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

  Changed paths:
    M changelog/3161.bugfix

  Log Message:
  -----------
  Reword changelog a bit


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

  Changed paths:
    M testing/test_recwarn.py

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

Fix test for py37


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

  Changed paths:
    M .travis.yml
    M setup.py

  Log Message:
  -----------
  Support py37 officially

Python 3.7.0b1 has been released:

	https://www.python.org/downloads/release/python-370b1/

Fix #3168


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

  Changed paths:
    A changelog/985.bugfix
    M testing/test_pdb.py

  Log Message:
  -----------
  skip failing pdb/doctest test on mac


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

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  xfail is better than skip


  Commit: 867344d0d72cfe79bb5ff316b065621f12627f40
      https://github.com/pytest-dev/pytest/commit/867344d0d72cfe79bb5ff316b065621f12627f40
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-02-04 (Sun, 04 Feb 2018)

  Changed paths:
    M _pytest/debugging.py
    M changelog/1810.bugfix

  Log Message:
  -----------
  move import to top


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

  Changed paths:
    M changelog/1810.bugfix

  Log Message:
  -----------
  Update wording in CHANGELOG


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

  Changed paths:
    A changelog/985.bugfix
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #3187 from brianmaissy/bugfix/skip_failing_pdb_doctest_test_on_mac

skip failing pdb/doctest test on mac


  Commit: 7c80c81433a379ccba3dcebb00906d68d1aabea3
      https://github.com/pytest-dev/pytest/commit/7c80c81433a379ccba3dcebb00906d68d1aabea3
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-02-05 (Mon, 05 Feb 2018)

  Changed paths:
    M _pytest/debugging.py
    A changelog/1810.bugfix

  Log Message:
  -----------
  Merge pull request #3152 from brianmaissy/silently_fail_to_import_during_postmortem

If we fail to import doctest.UnexpectedException during postmortem, fail quietly


  Commit: 570edb466b90795845b71795e87b4b6186cd85c6
      https://github.com/pytest-dev/pytest/commit/570edb466b90795845b71795e87b4b6186cd85c6
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-02-05 (Mon, 05 Feb 2018)

  Changed paths:
    M .travis.yml
    M setup.py

  Log Message:
  -----------
  Merge pull request #3185 from nicoddemus/remove-ignore-py37

Support py37 officially


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

  Changed paths:
    M _pytest/logging.py
    A changelog/3184.bugfix
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Don't traceback on unkown sections.


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

  Changed paths:
    M changelog/3184.bugfix

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


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

  Changed paths:
    R changelog/985.bugfix
    A changelog/985.trivial

  Log Message:
  -----------
  Update changelog entry to "trivial" as it is a temporary workaround

I think this is a more appropriate category given that the underlying problem still exists


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

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    R changelog/1810.bugfix
    A changelog/1810.bugfix.rst
    R changelog/3166.trivial
    A changelog/3166.trivial.rst
    R changelog/985.trivial
    A changelog/985.trivial.rst
    A changelog/README.rst

  Log Message:
  -----------
  Add changelog/README.rst and streamline our PR template text

This streamlines the PR template text and adds a more in-depth explanation
about how the changelog entries work because this topic is a common source of
confusion:

- How to name the files.
- Which formatting to use (people in general assume it is Markdown).
- Recommend adding `.rst` extension to changelog files to help with the
  above (`towncrier` doesn't care).

This was heavily inspired by the excellent python-trio/trio docs.


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

  Changed paths:
    M _pytest/fixtures.py
    A changelog/3161.bugfix
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3183 from cheezman34/master

Fix ordering of tests to minimize fixture creating


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

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #3177 from nicoddemus/mention-force-result

Mention outcome.force_result() and add link to pluggy's docs


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

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M changelog/README.rst

  Log Message:
  -----------
  Code review suggestions


  Commit: 3685c1bc019cb119378ebfb31993a1748548e731
      https://github.com/pytest-dev/pytest/commit/3685c1bc019cb119378ebfb31993a1748548e731
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    R changelog/1810.bugfix
    A changelog/1810.bugfix.rst
    R changelog/3166.trivial
    A changelog/3166.trivial.rst
    R changelog/985.trivial
    A changelog/985.trivial.rst
    A changelog/README.rst

  Log Message:
  -----------
  Merge pull request #3192 from nicoddemus/pr-template

Add changelog/README.rst and streamline our PR template text


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

  Changed paths:
    R changelog/3161.bugfix
    A changelog/3161.bugfix.rst

  Log Message:
  -----------
  Rename 3161.bugfix to 3161.bugfix.rst


  Commit: e5b527d0e3d72cf8e2cac4a4f7fb7b9a2d2f6e06
      https://github.com/pytest-dev/pytest/commit/e5b527d0e3d72cf8e2cac4a4f7fb7b9a2d2f6e06
  Author: Andy Freeland <andy at andyfreeland.net>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

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

  Log Message:
  -----------
  Add Sphinx parameter docs for `match` and `message` args to `pytest.raises()`


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

  Changed paths:
    A changelog/3202.doc.rst
    R changelog/3202.trivial.rst

  Log Message:
  -----------
  Update and rename 3202.trivial.rst to 3202.doc.rst


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

  Changed paths:
    M _pytest/python_api.py
    A changelog/3202.doc.rst

  Log Message:
  -----------
  Merge pull request #3202 from rouge8/pytest-raises-sphinx-parameters

Add Sphinx parameter docs for `match` and `message` args to `pytest.raises()`


  Commit: b6166dccb4d2b48173aa7e7739be52db9d2d56a0
      https://github.com/pytest-dev/pytest/commit/b6166dccb4d2b48173aa7e7739be52db9d2d56a0
  Author: Marcin Bachry <hegel666 at gmail.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M _pytest/compat.py
    A changelog/3206.bugfix.rst
    M testing/python/integration.py

  Log Message:
  -----------
  Fix mock patchings detection when both mock and unittest.mock are present


  Commit: 7656fc8320b5920d860e9028f322475a021e7666
      https://github.com/pytest-dev/pytest/commit/7656fc8320b5920d860e9028f322475a021e7666
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M AUTHORS
    M _pytest/debugging.py
    A changelog/3052.bugfix
    M testing/test_pdb.py

  Log Message:
  -----------
  Added printing of captured stdout and stderr before entering pdb


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

  Changed paths:
    M _pytest/compat.py
    A changelog/3206.bugfix.rst
    M testing/python/integration.py

  Log Message:
  -----------
  Merge pull request #3206 from mbachry/fix-unittest-mock

Fix mock patchings detection when both mock and unittest.mock are present


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

  Changed paths:
    M AUTHORS
    M _pytest/debugging.py
    A changelog/3052.bugfix
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #3186 from brianmaissy/bugfix/print_captured_stdout_before_entering_pdb

Added printing of captured stdout before entering pdb


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

  Changed paths:
    M _pytest/logging.py
    A changelog/3184.bugfix
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Merge pull request #3188 from s0undt3ch/issues/3184

Don't traceback on unkown sections.


  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


Compare: https://github.com/pytest-dev/pytest/compare/fa8354e87207...f26393288390

From nicoddemus at gmail.com  Sat Feb 17 15:39:33 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 17 Feb 2018 12:39:33 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 391553: Disable output
 capturing in doctest to avoid losin...
Message-ID: <5a889305f0a0f_6f7f2afc2a3ddc081210fc@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

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

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  Disable output capturing in doctest to avoid losing reference to stdout. Fixes #985.


  Commit: d845af7b2405438a3f1b46f9ed65293543bc2cc7
      https://github.com/pytest-dev/pytest/commit/d845af7b2405438a3f1b46f9ed65293543bc2cc7
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    A changelog/985.bugfix

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


  Commit: ce1872e7e87fd97a3e8e9daf2797f38dd8aff985
      https://github.com/pytest-dev/pytest/commit/ce1872e7e87fd97a3e8e9daf2797f38dd8aff985
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .travis.yml
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/mark.py
    M _pytest/python.py
    M _pytest/python_api.py
    A changelog/1810.bugfix.rst
    A changelog/3161.bugfix.rst
    A changelog/3166.trivial.rst
    A changelog/3202.doc.rst
    A changelog/985.trivial.rst
    A changelog/README.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M tasks/requirements.txt
    M testing/python/fixture.py
    M testing/test_pdb.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  Merge branch 'master' into bugfix/985/disable-output-capturing-in-doctest


  Commit: 247cdb835a404f9668022984bb688496b48e5809
      https://github.com/pytest-dev/pytest/commit/247cdb835a404f9668022984bb688496b48e5809
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Remove xfail; tests now pass on macOS. Ref #985.


  Commit: 18c84a1904e96d5a4fc265b0fde56765ca36c7c3
      https://github.com/pytest-dev/pytest/commit/18c84a1904e96d5a4fc265b0fde56765ca36c7c3
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  Restrict fix to macOS only. Ref #3215.


  Commit: 435b8ddc7c681a4ba4490388756c7d49666ee8bf
      https://github.com/pytest-dev/pytest/commit/435b8ddc7c681a4ba4490388756c7d49666ee8bf
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-15 (Thu, 15 Feb 2018)

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  Rename method for additional clarity.


  Commit: 254e357076a8826d19219a769ea909c28c1d6f35
      https://github.com/pytest-dev/pytest/commit/254e357076a8826d19219a769ea909c28c1d6f35
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  Correct the broken indentation.


  Commit: 4131d3f300196da059f5abe6d36f4870459692ad
      https://github.com/pytest-dev/pytest/commit/4131d3f300196da059f5abe6d36f4870459692ad
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  Probably it's best to write the err stream to stderr.


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

  Changed paths:
    M _pytest/doctest.py
    A changelog/985.bugfix
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #3215 from pytest-dev/bugfix/985/disable-output-capturing-in-doctest

Disable output capturing in doctest


Compare: https://github.com/pytest-dev/pytest/compare/0f6879bf5e55...9d879bee360d

From nicoddemus at gmail.com  Sat Feb 17 15:39:36 2018
From: nicoddemus at gmail.com (nicoddemus)
Date: Sat, 17 Feb 2018 12:39:36 -0800
Subject: [Pytest-commit] [pytest-dev/pytest]
Message-ID: <5a889308194af_44482adbdbd57c08136121@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/bugfix/985/disable-output-capturing-in-doctest
  Home:   https://github.com/pytest-dev/pytest

From nicoddemus at gmail.com  Sat Feb 17 17:19:08 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 17 Feb 2018 14:19:08 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 82cdc4: Fix raised warning when
 attrs 17.4.0 is used
Message-ID: <5a88aa5cd823a_7c4c2ac43b2ddc0814226a@hookshot-fe-cace476.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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


Compare: https://github.com/pytest-dev/pytest/compare/f26393288390...3bc8b50a0de1

From nicoddemus at gmail.com  Sat Feb 17 18:18:07 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 17 Feb 2018 15:18:07 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 984902: Remove "matching '...'"
 part from the pytest.raise...
Message-ID: <5a88b82f1ef33_26ea2ab6ca10dc081032b3@hookshot-fe-265448d.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 9849022eb2421c9e468609cbbbedf63a8a042702
      https://github.com/pytest-dev/pytest/commit/9849022eb2421c9e468609cbbbedf63a8a042702
  Author: Florian Bruhin <git at the-compiler.org>
  Date:   2018-02-14 (Wed, 14 Feb 2018)

  Changed paths:
    M _pytest/python_api.py
    A changelog/3222.trivial

  Log Message:
  -----------
  Remove "matching '...'" part from the pytest.raises message

When a test with pytest.raises(ValueError, match='foo') doesn't raise, the
following error is printed:

    Failed: DID NOT RAISE <class 'ValueError'> matching 'foo'

This error message is confusing as it implies a ValueError was raised, but the
message wasn't matching 'foo'.

I first considered rewording it somehow to preserve the match pattern in it, but
I don't think that's worthwhile as the pattern should usually be apparent from
the stacktrace anyways (hard-coded, as parametrization, or with --showlocals for
more sophisticated cases).


  Commit: 3cbf0c8ec028e4fdba2e66327a2d4f01025804c4
      https://github.com/pytest-dev/pytest/commit/3cbf0c8ec028e4fdba2e66327a2d4f01025804c4
  Author: Florian Bruhin <git at the-compiler.org>
  Date:   2018-02-15 (Thu, 15 Feb 2018)

  Changed paths:
    M _pytest/python_api.py
    A changelog/3222.bugfix
    R changelog/3222.trivial
    M testing/python/raises.py

  Log Message:
  -----------
  Raise unexpected exceptions with pytest.raises() using match=


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

  Changed paths:
    M _pytest/python_api.py
    A changelog/3222.bugfix
    M testing/python/raises.py

  Log Message:
  -----------
  Merge pull request #3222 from The-Compiler/match-msg

Remove "matching '...'" part from the pytest.raises message


Compare: https://github.com/pytest-dev/pytest/compare/9d879bee360d...b486e1294b92

From nicoddemus at gmail.com  Mon Feb 19 18:46:52 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 19 Feb 2018 15:46:52 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 069f32: print captured logs
 before entering pdb
Message-ID: <5a8b61ec70a0_f9b2aba25d6dc10444b2@hookshot-fe-da92815.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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


Compare: https://github.com/pytest-dev/pytest/compare/3bc8b50a0de1...97bb6abcfa4d

From nicoddemus at gmail.com  Mon Feb 19 20:34:37 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 19 Feb 2018 17:34:37 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] bfe2cb: Implement publishing to
 PyPI by pushing a tag
Message-ID: <5a8b7b2d2f073_3e232adcb3637c1013055@hookshot-fe-da92815.cp1-iad.github.net.mail>

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

  Changed paths:
    M .travis.yml
    M HOWTORELEASE.rst
    A changelog/3060.trivial.rst
    M tasks/generate.py
    M tasks/requirements.txt

  Log Message:
  -----------
  Implement publishing to PyPI by pushing a tag

Fix #3060


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

  Changed paths:
    M .travis.yml
    M HOWTORELEASE.rst
    A changelog/3060.trivial.rst
    M tasks/generate.py
    M tasks/requirements.txt

  Log Message:
  -----------
  Merge pull request #3199 from nicoddemus/publish-tag-3060

Implement deploying to PyPI by pushing a tag


Compare: https://github.com/pytest-dev/pytest/compare/b486e1294b92...053fc118b7af

From nicoddemus at gmail.com  Tue Feb 20 15:37:16 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 20 Feb 2018 12:37:16 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] f8fdf0: Add --yes to towncrier
 to automatically remove fil...
Message-ID: <5a8c86fceb90e_3692ad490233c0c9324d@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

  Branch: refs/tags/3.4.1
  Home:   https://github.com/pytest-dev/pytest
  Commit: f8fdf0ae915e3798c876e780fb15263ec18caf97
      https://github.com/pytest-dev/pytest/commit/f8fdf0ae915e3798c876e780fb15263ec18caf97
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-20 (Tue, 20 Feb 2018)

  Changed paths:
    M tasks/generate.py

  Log Message:
  -----------
  Add --yes to towncrier to automatically remove files


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

  Changed paths:
    M CHANGELOG.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

  Log Message:
  -----------
  Preparing release version 3.4.1


Compare: https://github.com/pytest-dev/pytest/compare/f8fdf0ae915e^...b3193755927d

From nicoddemus at gmail.com  Tue Feb 20 16:08:48 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 20 Feb 2018 13:08:48 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] f8fdf0: Add --yes to towncrier
 to automatically remove fil...
Message-ID: <5a8c8e6053273_7c5e2b09d436fc00120128@hookshot-fe-d2afb11.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: f8fdf0ae915e3798c876e780fb15263ec18caf97
      https://github.com/pytest-dev/pytest/commit/f8fdf0ae915e3798c876e780fb15263ec18caf97
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-20 (Tue, 20 Feb 2018)

  Changed paths:
    M tasks/generate.py

  Log Message:
  -----------
  Add --yes to towncrier to automatically remove files


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

  Changed paths:
    M CHANGELOG.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

  Log Message:
  -----------
  Preparing release version 3.4.1


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

  Changed paths:
    M CHANGELOG.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

  Log Message:
  -----------
  Merge pull request #3239 from nicoddemus/release-3.4.1

Release 3.4.1


Compare: https://github.com/pytest-dev/pytest/compare/053fc118b7af...9361d48b6189

From nicoddemus at gmail.com  Wed Feb 21 08:38:56 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 21 Feb 2018 05:38:56 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 2a99e5: Delete changelog
 entries for 3.4.1 release
Message-ID: <5a8d767042e1a_1eda2ac8cd0ffbfc3491a@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 2a99e5dd2ab2a828064f5389fc1c9ca236463ac5
      https://github.com/pytest-dev/pytest/commit/2a99e5dd2ab2a828064f5389fc1c9ca236463ac5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-20 (Tue, 20 Feb 2018)

  Changed paths:
    R changelog/1810.bugfix.rst
    R changelog/3052.bugfix
    R changelog/3060.trivial.rst
    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/3222.bugfix
    R changelog/985.bugfix
    R changelog/985.trivial.rst

  Log Message:
  -----------
  Delete changelog entries for 3.4.1 release

Unfortunately due to hawkowl/towncrier#99 those news fragments were
not deleted at the time of CHANGELOG generation.


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

  Changed paths:
    R changelog/1810.bugfix.rst
    R changelog/3052.bugfix
    R changelog/3060.trivial.rst
    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/3222.bugfix
    R changelog/985.bugfix
    R changelog/985.trivial.rst

  Log Message:
  -----------
  Merge pull request #3242 from nicoddemus/delete-changelog-3.4.1

Delete changelog entries for 3.4.1 release


Compare: https://github.com/pytest-dev/pytest/compare/9361d48b6189...dae74b674ecb

From nicoddemus at gmail.com  Wed Feb 21 10:11:41 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 21 Feb 2018 07:11:41 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 391553: Disable output
 capturing in doctest to avoid losin...
Message-ID: <5a8d8c2d5a00b_4942acd977b3c18452b4@hookshot-fe-2cc8887.cp1-iad.github.net.mail>

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

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  Disable output capturing in doctest to avoid losing reference to stdout. Fixes #985.


  Commit: d845af7b2405438a3f1b46f9ed65293543bc2cc7
      https://github.com/pytest-dev/pytest/commit/d845af7b2405438a3f1b46f9ed65293543bc2cc7
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    A changelog/985.bugfix

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


  Commit: ce1872e7e87fd97a3e8e9daf2797f38dd8aff985
      https://github.com/pytest-dev/pytest/commit/ce1872e7e87fd97a3e8e9daf2797f38dd8aff985
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .travis.yml
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/mark.py
    M _pytest/python.py
    M _pytest/python_api.py
    A changelog/1810.bugfix.rst
    A changelog/3161.bugfix.rst
    A changelog/3166.trivial.rst
    A changelog/3202.doc.rst
    A changelog/985.trivial.rst
    A changelog/README.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M tasks/requirements.txt
    M testing/python/fixture.py
    M testing/test_pdb.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  Merge branch 'master' into bugfix/985/disable-output-capturing-in-doctest


  Commit: 247cdb835a404f9668022984bb688496b48e5809
      https://github.com/pytest-dev/pytest/commit/247cdb835a404f9668022984bb688496b48e5809
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Remove xfail; tests now pass on macOS. Ref #985.


  Commit: 18c84a1904e96d5a4fc265b0fde56765ca36c7c3
      https://github.com/pytest-dev/pytest/commit/18c84a1904e96d5a4fc265b0fde56765ca36c7c3
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  Restrict fix to macOS only. Ref #3215.


  Commit: 9849022eb2421c9e468609cbbbedf63a8a042702
      https://github.com/pytest-dev/pytest/commit/9849022eb2421c9e468609cbbbedf63a8a042702
  Author: Florian Bruhin <git at the-compiler.org>
  Date:   2018-02-14 (Wed, 14 Feb 2018)

  Changed paths:
    M _pytest/python_api.py
    A changelog/3222.trivial

  Log Message:
  -----------
  Remove "matching '...'" part from the pytest.raises message

When a test with pytest.raises(ValueError, match='foo') doesn't raise, the
following error is printed:

    Failed: DID NOT RAISE <class 'ValueError'> matching 'foo'

This error message is confusing as it implies a ValueError was raised, but the
message wasn't matching 'foo'.

I first considered rewording it somehow to preserve the match pattern in it, but
I don't think that's worthwhile as the pattern should usually be apparent from
the stacktrace anyways (hard-coded, as parametrization, or with --showlocals for
more sophisticated cases).


  Commit: 3cbf0c8ec028e4fdba2e66327a2d4f01025804c4
      https://github.com/pytest-dev/pytest/commit/3cbf0c8ec028e4fdba2e66327a2d4f01025804c4
  Author: Florian Bruhin <git at the-compiler.org>
  Date:   2018-02-15 (Thu, 15 Feb 2018)

  Changed paths:
    M _pytest/python_api.py
    A changelog/3222.bugfix
    R changelog/3222.trivial
    M testing/python/raises.py

  Log Message:
  -----------
  Raise unexpected exceptions with pytest.raises() using match=


  Commit: 435b8ddc7c681a4ba4490388756c7d49666ee8bf
      https://github.com/pytest-dev/pytest/commit/435b8ddc7c681a4ba4490388756c7d49666ee8bf
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-15 (Thu, 15 Feb 2018)

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  Rename method for additional clarity.


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

  Changed paths:
    M .travis.yml
    M HOWTORELEASE.rst
    A changelog/3060.trivial.rst
    M tasks/generate.py
    M tasks/requirements.txt

  Log Message:
  -----------
  Implement publishing to PyPI by pushing a tag

Fix #3060


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

  Changed paths:
    M changelog/README.rst

  Log Message:
  -----------
  Small update to changelog/README.rst


  Commit: 254e357076a8826d19219a769ea909c28c1d6f35
      https://github.com/pytest-dev/pytest/commit/254e357076a8826d19219a769ea909c28c1d6f35
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  Correct the broken indentation.


  Commit: 4131d3f300196da059f5abe6d36f4870459692ad
      https://github.com/pytest-dev/pytest/commit/4131d3f300196da059f5abe6d36f4870459692ad
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M _pytest/doctest.py

  Log Message:
  -----------
  Probably it's best to write the err stream to stderr.


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

  Changed paths:
    M _pytest/doctest.py
    A changelog/985.bugfix
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #3215 from pytest-dev/bugfix/985/disable-output-capturing-in-doctest

Disable output capturing in doctest


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

  Changed paths:
    M _pytest/python_api.py
    A changelog/3222.bugfix
    M testing/python/raises.py

  Log Message:
  -----------
  Merge pull request #3222 from The-Compiler/match-msg

Remove "matching '...'" part from the pytest.raises message


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

  Changed paths:
    M .travis.yml
    M HOWTORELEASE.rst
    A changelog/3060.trivial.rst
    M tasks/generate.py
    M tasks/requirements.txt

  Log Message:
  -----------
  Merge pull request #3199 from nicoddemus/publish-tag-3060

Implement deploying to PyPI by pushing a tag


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

  Changed paths:
    M tasks/generate.py

  Log Message:
  -----------
  Add --yes to towncrier to automatically remove files


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

  Changed paths:
    M CHANGELOG.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

  Log Message:
  -----------
  Preparing release version 3.4.1


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

  Changed paths:
    M CHANGELOG.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

  Log Message:
  -----------
  Merge pull request #3239 from nicoddemus/release-3.4.1

Release 3.4.1


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

  Changed paths:
    R changelog/1810.bugfix.rst
    R changelog/3052.bugfix
    R changelog/3060.trivial.rst
    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/3222.bugfix
    R changelog/985.bugfix
    R changelog/985.trivial.rst

  Log Message:
  -----------
  Delete changelog entries for 3.4.1 release

Unfortunately due to hawkowl/towncrier#99 those news fragments were
not deleted at the time of CHANGELOG generation.


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

  Changed paths:
    R changelog/1810.bugfix.rst
    R changelog/3052.bugfix
    R changelog/3060.trivial.rst
    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/3222.bugfix
    R changelog/985.bugfix
    R changelog/985.trivial.rst

  Log Message:
  -----------
  Merge pull request #3242 from nicoddemus/delete-changelog-3.4.1

Delete changelog entries for 3.4.1 release


  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


Compare: https://github.com/pytest-dev/pytest/compare/97bb6abcfa4d...7a62619a7569

From nicoddemus at gmail.com  Wed Feb 21 17:42:54 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 21 Feb 2018 14:42:54 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 3d4d0a: remove addcall in the
 terminal tests
Message-ID: <5a8df5eed6de3_51472ab61bc89c0893422@hookshot-fe-da92815.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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


Compare: https://github.com/pytest-dev/pytest/compare/7a62619a7569...7336dbb979ea

From nicoddemus at gmail.com  Thu Feb 22 17:14:48 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 22 Feb 2018 14:14:48 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] b5ac61: Correct docs to
 config.pluginmanager.get_plugin()
Message-ID: <5a8f40d8df5c1_7bd62b28ff15fc041449c@hookshot-fe-cace476.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: b5ac61657a74e2224f2534b7c3663b351bfe2506
      https://github.com/pytest-dev/pytest/commit/b5ac61657a74e2224f2534b7c3663b351bfe2506
  Author: Kyle Altendorf <sda at fstab.net>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Correct docs to config.pluginmanager.get_plugin()

`getplugin()` is deprecated in favor of `get_plugin()`.

https://github.com/pytest-dev/pytest/blob/dd97c940359079fd874795a731d54d1abb7d4c8e/_pytest/config.py#L261


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

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #3254 from altendky/patch-1

Correct docs to config.pluginmanager.get_plugin()


Compare: https://github.com/pytest-dev/pytest/compare/dd97c9403590...1127d519db0b

From nicoddemus at gmail.com  Thu Feb 22 17:23:58 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 22 Feb 2018 14:23:58 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 75f11f: Fix reference cycle
 caused by PseudoFixtureDef.
Message-ID: <5a8f42fe4c89_111c2af99d847c105224@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 75f11f0b6576a7bd60927e3425a679c20c40f261
      https://github.com/pytest-dev/pytest/commit/75f11f0b6576a7bd60927e3425a679c20c40f261
  Author: Allan Feldman <allan.d.feldman at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Fix reference cycle caused by PseudoFixtureDef.

Python types have reference cycles to themselves when they are created. This is
partially caused by descriptors which get / set values from the __dict__
attribute for getattr / setattr on classes.

This is not normally an issue since types tend to remain referenced for the
lifetime of the Python process (and thus never become garbage).

However, in the case of PseudoFixtureDef, the class is generated in
_get_active_fixturedef and later discarded when pytest_fixture_setup returns.
As a result, the generated PseudoFixtureDef type becomes garbage.

This is not really a performance issue but it can lead to some problems when
making tests and assertions about garbage when using pytest.

This garbage creation problem can be rectified by returning a namedtuple
instance which is functionally the same. In the modified code, the namedtuple
is allocated / deallocated using reference counting rather than having to use
the garbage collector.


  Commit: aa53e37fa255248c101f32dda876ad589bc68bb2
      https://github.com/pytest-dev/pytest/commit/aa53e37fa255248c101f32dda876ad589bc68bb2
  Author: Allan Feldman <allan.d.feldman at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Add a test to expose leaked PseudoFixtureDef types.


  Commit: 287c003cfd28cb2fc0bd4cba92b76333a8543ab7
      https://github.com/pytest-dev/pytest/commit/287c003cfd28cb2fc0bd4cba92b76333a8543ab7
  Author: Allan Feldman <allan.d.feldman at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add myself to AUTHORS.


  Commit: 7536e949b18aa6ab5c3594ce9c200aed9dcf8dcb
      https://github.com/pytest-dev/pytest/commit/7536e949b18aa6ab5c3594ce9c200aed9dcf8dcb
  Author: Allan Feldman <allan.d.feldman at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    A changelog/3249.bugfix.rst

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


  Commit: 48548767fcc1c65134309b649cf4d63f5b9cec65
      https://github.com/pytest-dev/pytest/commit/48548767fcc1c65134309b649cf4d63f5b9cec65
  Author: Allan Feldman <allan.d.feldman at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Use a frozen attr class for PseudoFixtureDef.


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

  Changed paths:
    M AUTHORS
    M _pytest/fixtures.py
    A changelog/3249.bugfix.rst
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3249 from a-feld/request-fixture-reference-cycle

Fix PseudoFixtureDef reference cycle.


Compare: https://github.com/pytest-dev/pytest/compare/1127d519db0b...bedceaacc46a

From nicoddemus at gmail.com  Thu Feb 22 20:19:49 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 22 Feb 2018 17:19:49 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 0f58fc: Add pdb test with
 disabled logging plugin
Message-ID: <5a8f6c35145ff_6732b039e92fc081426f0@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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


Compare: https://github.com/pytest-dev/pytest/compare/54e63b7dd534...0a3c80e959f5

From nicoddemus at gmail.com  Mon Feb 26 14:49:17 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 26 Feb 2018 11:49:17 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 39024a: Fix broken links in
 getting-started
Message-ID: <5a9464bdf2c3b_79f32ad121d1dc0c98773@hookshot-fe-da92815.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 39024a7536b09dd5cf7113f327142291fc8dd265
      https://github.com/pytest-dev/pytest/commit/39024a7536b09dd5cf7113f327142291fc8dd265
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

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

  Log Message:
  -----------
  Fix broken links in getting-started

Fix #3256


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

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

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

Fix broken links in getting-started


Compare: https://github.com/pytest-dev/pytest/compare/ae62ced08041...44fa5a77d454

From nicoddemus at gmail.com  Mon Feb 26 17:56:54 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 26 Feb 2018 14:56:54 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] d196ab: Change 1642 entry from
 "trivial" to "feature"
Message-ID: <5a9490b6407c3_192e2abc5abb7c041003a6@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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"



From nicoddemus at gmail.com  Mon Feb 26 18:50:30 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 26 Feb 2018 15:50:30 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] c36ce8: Remove basepython from
 testenv:docs so it can be b...
Message-ID: <5a949d46bd3f8_46c62b09bfb9bc189449f@hookshot-fe-88eb02d.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: c36ce85155130426950a13ccc6237f77dd106016
      https://github.com/pytest-dev/pytest/commit/c36ce85155130426950a13ccc6237f77dd106016
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    M tox.ini

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


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

  Changed paths:
    M doc/en/reference.rst

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


  Commit: a5203eb2a71b31edbd0a4073a1f82dd606a9c02d
      https://github.com/pytest-dev/pytest/commit/a5203eb2a71b31edbd0a4073a1f82dd606a9c02d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-26 (Mon, 26 Feb 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: a1c3c3dd5cb8e4608423c15a9825c0dd766740aa
      https://github.com/pytest-dev/pytest/commit/a1c3c3dd5cb8e4608423c15a9825c0dd766740aa
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    M doc/en/reference.rst

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


Compare: https://github.com/pytest-dev/pytest/compare/b1668fc77ed9...a1c3c3dd5cb8

From nicoddemus at gmail.com  Mon Feb 26 18:57:20 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 26 Feb 2018 15:57:20 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] c215ac: Add :with: modifier to
 raises() and deprecated_cal...
Message-ID: <5a949ee031f58_18982ac27ccc5c04444e7@hookshot-fe-32b5f5b.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: c215ac3dacdebb63a9034367391c7af1c9749a89
      https://github.com/pytest-dev/pytest/commit/c215ac3dacdebb63a9034367391c7af1c9749a89
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    M doc/en/reference.rst

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



From nicoddemus at gmail.com  Tue Feb 27 05:33:47 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 27 Feb 2018 02:33:47 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 46c5d5: #3203 Remove progress
 when no-capture
Message-ID: <5a95340b7f9ff_46952ac3a0c83c0810261c@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 46c5d5355ea5127695984b74342c77d23d8858e6
      https://github.com/pytest-dev/pytest/commit/46c5d5355ea5127695984b74342c77d23d8858e6
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    M _pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  #3203 Remove progress when no-capture


  Commit: 6200920dc388ac8d7822684610ebef7c544341fc
      https://github.com/pytest-dev/pytest/commit/6200920dc388ac8d7822684610ebef7c544341fc
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    A changelog/3203.trivial

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


  Commit: 31476c69abaf6f68a160084a6d4501e1535b0bb4
      https://github.com/pytest-dev/pytest/commit/31476c69abaf6f68a160084a6d4501e1535b0bb4
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    M testing/test_terminal.py

  Log Message:
  -----------
  #3203 Fix tests


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

  Changed paths:
    A changelog/3203.bugfix.rst
    R changelog/3203.trivial

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


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

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

  Log Message:
  -----------
  Merge pull request #3263 from feuillemorte/3203-remove-statistic-indicator

#3203 Remove progress when no-capture


Compare: https://github.com/pytest-dev/pytest/compare/44fa5a77d454...20085542e2d5

From nicoddemus at gmail.com  Tue Feb 27 05:45:42 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 27 Feb 2018 02:45:42 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] fbc45b: Fixed #3149 where
 doctest does not continue to run...
Message-ID: <5a9536d6923f9_6f382ac190d97c00285fe@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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: 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: 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


Compare: https://github.com/pytest-dev/pytest/compare/d196ab45d32c...5cb72b6188be

From nicoddemus at gmail.com  Tue Feb 27 07:44:54 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 27 Feb 2018 04:44:54 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 307cd6: Add the ability to use
 platform in pytest.mark.ski...
Message-ID: <5a9552c6f3e41_52102ac337eafc0c9329a@hookshot-fe-6b2eebc.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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: 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


Compare: https://github.com/pytest-dev/pytest/compare/5cb72b6188be...a968c0fa0518

From nicoddemus at gmail.com  Tue Feb 27 14:36:15 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 27 Feb 2018 11:36:15 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 4e405d: Show "short test
 summary info" after tracebacks an...
Message-ID: <5a95b32fb6018_f992ad71ba9dc0c9090@hookshot-fe-265448d.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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: 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: 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


Compare: https://github.com/pytest-dev/pytest/compare/a968c0fa0518...dab96cbf278a

From nicoddemus at gmail.com  Tue Feb 27 14:41:47 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 27 Feb 2018 11:41:47 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 3f7223: #3260 Fix pytest
 section in setup ini file
Message-ID: <5a95b47b7c853_7e622abbb0c87c1095157@hookshot-fe-da92815.cp1-iad.github.net.mail>

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

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  #3260 Fix pytest section in setup ini file


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

  Changed paths:
    A changelog/3260.bugfix

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


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

  Changed paths:
    M testing/test_config.py

  Log Message:
  -----------
  #3260 Added test


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

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  #3260 Fix config.py for py27


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

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  #3260 Remove deprecation


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

  Changed paths:
    R changelog/3260.bugfix
    A changelog/3260.bugfix.rst

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


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

  Changed paths:
    M _pytest/config.py
    A changelog/3260.bugfix.rst
    M testing/test_config.py

  Log Message:
  -----------
  Merge pull request #3267 from feuillemorte/3260-fix-pytest-section

#3260 fix pytest section


Compare: https://github.com/pytest-dev/pytest/compare/20085542e2d5...9fcbf5716360

From nicoddemus at gmail.com  Tue Feb 27 16:26:55 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 27 Feb 2018 13:26:55 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] de5322: Add pytestconfig fixture
Message-ID: <5a95cd1f8c101_497b2adcb330dc1052379@hookshot-fe-5a11256.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: de5322dc0960d5654a74e19ebf3735910f82fb7e
      https://github.com/pytest-dev/pytest/commit/de5322dc0960d5654a74e19ebf3735910f82fb7e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M doc/en/reference.rst

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


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

  Changed paths:
    M doc/en/reference.rst

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


  Commit: 402338a39c572ebf75b93a56e59b08297f718685
      https://github.com/pytest-dev/pytest/commit/402338a39c572ebf75b93a56e59b08297f718685
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 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: 623a4b117e533476137150d8e65433ab0d2aa3ca
      https://github.com/pytest-dev/pytest/commit/623a4b117e533476137150d8e65433ab0d2aa3ca
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

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

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


  Commit: 1d0fbdc662456f0b29432f2c59379f94c9af30b0
      https://github.com/pytest-dev/pytest/commit/1d0fbdc662456f0b29432f2c59379f94c9af30b0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 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: acaa2ea5a1141fd8b2cd6f517b7d72dccd3eae41
      https://github.com/pytest-dev/pytest/commit/acaa2ea5a1141fd8b2cd6f517b7d72dccd3eae41
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 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: 9cf1efd964d05023a829dd8f7ebc3b3e8d1f6452
      https://github.com/pytest-dev/pytest/commit/9cf1efd964d05023a829dd8f7ebc3b3e8d1f6452
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M doc/en/reference.rst

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


  Commit: 54d93802614478f549e38eb8e7e89336ac0ad390
      https://github.com/pytest-dev/pytest/commit/54d93802614478f549e38eb8e7e89336ac0ad390
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 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


Compare: https://github.com/pytest-dev/pytest/compare/c215ac3dacde...54d938026144

From nicoddemus at gmail.com  Tue Feb 27 16:27:32 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 27 Feb 2018 13:27:32 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 823910: Fix typo with
 test_summary_list_after_errors
Message-ID: <5a95cd4458f1f_4aba2b29f141dc14189ce@hookshot-fe-6e9b612.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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


Compare: https://github.com/pytest-dev/pytest/compare/dab96cbf278a...90638b661d2f

From nicoddemus at gmail.com  Tue Feb 27 16:27:34 2018
From: nicoddemus at gmail.com (nicoddemus)
Date: Tue, 27 Feb 2018 13:27:34 -0800
Subject: [Pytest-commit] [pytest-dev/pytest]
Message-ID: <5a95cd467ac90_15fd2b205f279c1473552@hookshot-fe-265448d.cp1-iad.github.net.mail>

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

From nicoddemus at gmail.com  Tue Feb 27 20:42:11 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 27 Feb 2018 17:42:11 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] ebddac: Add CodeTriage badge to
 pytest-dev/pytest
Message-ID: <5a9608f31ed9a_6f9a2b09da9e7c083698a@hookshot-fe-d252ca1.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: ebddac6a5c411cc650fa16382a8115af3aea7409
      https://github.com/pytest-dev/pytest/commit/ebddac6a5c411cc650fa16382a8115af3aea7409
  Author: codetriage-readme-bot <richard.schneeman+githubcodetriagereadme at gmail.com>
  Date:   2018-02-20 (Tue, 20 Feb 2018)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Add CodeTriage badge to pytest-dev/pytest

Adds a badge showing the number of people helping this repo on CodeTriage.

[![Open Source Helpers](https://www.codetriage.com/pytest-dev/pytest/badges/users.svg)](https://www.codetriage.com/pytest-dev/pytest)

## What is CodeTriage?

CodeTriage is an Open Source app that is designed to make contributing to Open Source projects easier. It works by sending subscribers a few open issues in their inbox. If subscribers get busy, there is an algorithm that backs off issue load so they do not get overwhelmed

[Read more about the CodeTriage project](https://www.codetriage.com/what).

## Why am I getting this PR?

Your project was picked by the human, @schneems. They selected it from the projects submitted to https://www.codetriage.com and hand edited the PR. How did your project get added to [CodeTriage](https://www.codetriage.com/what)? Roughly 11 months ago, [cacoze](https://github.com/cacoze) added this project to CodeTriage in order to start contributing. Since then, 32 people have subscribed to help this repo.

## What does adding a badge accomplish?

Adding a badge invites people to help contribute to your project. It also lets developers know that others are invested in the longterm success and maintainability of the project.

You can see an example of a CodeTriage badge on these popular OSS READMEs:

- [![](https://www.codetriage.com/rails/rails/badges/users.svg)](https://www.codetriage.com/rails/rails) https://github.com/rails/rails
- [![](https://www.codetriage.com/crystal-lang/crystal/badges/users.svg)](https://www.codetriage.com/crystal-lang/crystal) https://github.com/crystal-lang/crystal

## Have a question or comment?

While I am a bot, this PR was manually reviewed and monitored by a human - @schneems. My job is writing commit messages and handling PR logistics.

If you have any questions, you can reply back to this PR and they will be answered by @schneems. If you do not want a badge right now, no worries, close the PR, you will not hear from me again.

Thanks for making your project Open Source! Any feedback is greatly appreciated.


  Commit: 6e14585ca20d27db81f122d2c3a76135e4192fc4
      https://github.com/pytest-dev/pytest/commit/6e14585ca20d27db81f122d2c3a76135e4192fc4
  Author: mike <michael.durocher at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

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

  Log Message:
  -----------
  Fix approx default tolerances for Decimal


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

  Changed paths:
    M changelog/3247.bugfix.rst

  Log Message:
  -----------
  Small changelog tweak


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

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Fix README because of code triage badge


  Commit: 75f11f0b6576a7bd60927e3425a679c20c40f261
      https://github.com/pytest-dev/pytest/commit/75f11f0b6576a7bd60927e3425a679c20c40f261
  Author: Allan Feldman <allan.d.feldman at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Fix reference cycle caused by PseudoFixtureDef.

Python types have reference cycles to themselves when they are created. This is
partially caused by descriptors which get / set values from the __dict__
attribute for getattr / setattr on classes.

This is not normally an issue since types tend to remain referenced for the
lifetime of the Python process (and thus never become garbage).

However, in the case of PseudoFixtureDef, the class is generated in
_get_active_fixturedef and later discarded when pytest_fixture_setup returns.
As a result, the generated PseudoFixtureDef type becomes garbage.

This is not really a performance issue but it can lead to some problems when
making tests and assertions about garbage when using pytest.

This garbage creation problem can be rectified by returning a namedtuple
instance which is functionally the same. In the modified code, the namedtuple
is allocated / deallocated using reference counting rather than having to use
the garbage collector.


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

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

  Log Message:
  -----------
  Merge pull request #3248 from durocher/master

Fix approx default tolerances for Decimal


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

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Merge pull request #3240 from codetriage-readme-bot/codetriage-badge

Add CodeTriage badge to pytest-dev/pytest


  Commit: aa53e37fa255248c101f32dda876ad589bc68bb2
      https://github.com/pytest-dev/pytest/commit/aa53e37fa255248c101f32dda876ad589bc68bb2
  Author: Allan Feldman <allan.d.feldman at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Add a test to expose leaked PseudoFixtureDef types.


  Commit: 287c003cfd28cb2fc0bd4cba92b76333a8543ab7
      https://github.com/pytest-dev/pytest/commit/287c003cfd28cb2fc0bd4cba92b76333a8543ab7
  Author: Allan Feldman <allan.d.feldman at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add myself to AUTHORS.


  Commit: 7536e949b18aa6ab5c3594ce9c200aed9dcf8dcb
      https://github.com/pytest-dev/pytest/commit/7536e949b18aa6ab5c3594ce9c200aed9dcf8dcb
  Author: Allan Feldman <allan.d.feldman at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    A changelog/3249.bugfix.rst

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


  Commit: 48548767fcc1c65134309b649cf4d63f5b9cec65
      https://github.com/pytest-dev/pytest/commit/48548767fcc1c65134309b649cf4d63f5b9cec65
  Author: Allan Feldman <allan.d.feldman at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Use a frozen attr class for PseudoFixtureDef.


  Commit: b5ac61657a74e2224f2534b7c3663b351bfe2506
      https://github.com/pytest-dev/pytest/commit/b5ac61657a74e2224f2534b7c3663b351bfe2506
  Author: Kyle Altendorf <sda at fstab.net>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Correct docs to config.pluginmanager.get_plugin()

`getplugin()` is deprecated in favor of `get_plugin()`.

https://github.com/pytest-dev/pytest/blob/dd97c940359079fd874795a731d54d1abb7d4c8e/_pytest/config.py#L261


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

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #3254 from altendky/patch-1

Correct docs to config.pluginmanager.get_plugin()


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

  Changed paths:
    M AUTHORS
    M _pytest/fixtures.py
    A changelog/3249.bugfix.rst
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3249 from a-feld/request-fixture-reference-cycle

Fix PseudoFixtureDef reference cycle.


  Commit: 6166151ee454a7ee1af37db16b5a7909908af5ea
      https://github.com/pytest-dev/pytest/commit/6166151ee454a7ee1af37db16b5a7909908af5ea
  Author: joshm91 <joshmills8 at gmail.com>
  Date:   2018-02-24 (Sat, 24 Feb 2018)

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

  Log Message:
  -----------
  Fix minor typo in fixture.rst


  Commit: ae62ced08041cd057db1134ae6628d4d9c466448
      https://github.com/pytest-dev/pytest/commit/ae62ced08041cd057db1134ae6628d4d9c466448
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2018-02-24 (Sat, 24 Feb 2018)

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

  Log Message:
  -----------
  Merge pull request #3259 from joshm91/fix_typo

Fix minor typo in fixture.rst


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

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

  Log Message:
  -----------
  Fix broken links in getting-started

Fix #3256


  Commit: 46c5d5355ea5127695984b74342c77d23d8858e6
      https://github.com/pytest-dev/pytest/commit/46c5d5355ea5127695984b74342c77d23d8858e6
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    M _pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  #3203 Remove progress when no-capture


  Commit: 6200920dc388ac8d7822684610ebef7c544341fc
      https://github.com/pytest-dev/pytest/commit/6200920dc388ac8d7822684610ebef7c544341fc
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    A changelog/3203.trivial

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


  Commit: 31476c69abaf6f68a160084a6d4501e1535b0bb4
      https://github.com/pytest-dev/pytest/commit/31476c69abaf6f68a160084a6d4501e1535b0bb4
  Author: feuillemorte <fmorte at ya.ru>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    M testing/test_terminal.py

  Log Message:
  -----------
  #3203 Fix tests


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

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

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

Fix broken links in getting-started


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

  Changed paths:
    A changelog/3203.bugfix.rst
    R changelog/3203.trivial

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


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

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

  Log Message:
  -----------
  Merge pull request #3263 from feuillemorte/3203-remove-statistic-indicator

#3203 Remove progress when no-capture


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

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  #3260 Fix pytest section in setup ini file


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

  Changed paths:
    A changelog/3260.bugfix

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


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

  Changed paths:
    M testing/test_config.py

  Log Message:
  -----------
  #3260 Added test


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

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  #3260 Fix config.py for py27


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

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  #3260 Remove deprecation


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

  Changed paths:
    R changelog/3260.bugfix
    A changelog/3260.bugfix.rst

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


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

  Changed paths:
    M _pytest/config.py
    A changelog/3260.bugfix.rst
    M testing/test_config.py

  Log Message:
  -----------
  Merge pull request #3267 from feuillemorte/3260-fix-pytest-section

#3260 fix pytest section


  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: 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


Compare: https://github.com/pytest-dev/pytest/compare/90638b661d2f...0a5a6c19be49

From nicoddemus at gmail.com  Tue Feb 27 20:46:13 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 27 Feb 2018 17:46:13 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] ea8540: Rename 3236.trivial.rst
 to 3236.feature.rst
Message-ID: <5a9609e556ca8_1b7e22afcb1c3dc04746e0@hookshot-fe-dfcc362.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  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



From nicoddemus at gmail.com  Wed Feb 28 15:31:37 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 28 Feb 2018 12:31:37 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] 14a9b1: Add CHANGELOG for #3265
Message-ID: <5a9711a95687f_5a632ad24531bc0c83854@hookshot-fe-31feec6.cp1-iad.github.net.mail>

  Branch: refs/heads/feature/always-iterable-refactor
  Home:   https://github.com/pytest-dev/pytest
  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



From nicoddemus at gmail.com  Wed Feb 28 18:53:01 2018
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 28 Feb 2018 15:53:01 -0800
Subject: [Pytest-commit] [pytest-dev/pytest] a49dbf: Add a CHANGELOG entry
 for the reference docs
Message-ID: <5a9740dd6dce1_1abc2aecadc8bc1037038@hookshot-fe-cace476.cp1-iad.github.net.mail>

  Branch: refs/heads/ref-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: a49dbf0ea75cf4448bf9446f1cc073c18108d252
      https://github.com/pytest-dev/pytest/commit/a49dbf0ea75cf4448bf9446f1cc073c18108d252
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    A changelog/1713.doc.rst

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

Fix #1713


  Commit: 1f77706bacd20c6ec243a6069e3236ecda9641fb
      https://github.com/pytest-dev/pytest/commit/1f77706bacd20c6ec243a6069e3236ecda9641fb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-28 (Wed, 28 Feb 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: cc29d557d07ab1c9df7aa396b7fd27645349b669
      https://github.com/pytest-dev/pytest/commit/cc29d557d07ab1c9df7aa396b7fd27645349b669
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    M doc/en/reference.rst

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


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

  Changed paths:
    M doc/en/reference.rst

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


Compare: https://github.com/pytest-dev/pytest/compare/54d938026144...3ab1434664bd