[Pytest-commit] [pytest-dev/pytest] d78415: #1642 Add rootdir option

Bruno Oliveira nicoddemus at gmail.com
Thu Mar 22 20:06:32 EDT 2018


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

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

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


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

  Changed paths:
    A changelog/1642.trivial

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


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

  Changed paths:
    M testing/test_session.py

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


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

  Changed paths:
    M changelog/1642.trivial

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


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

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

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


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

  Changed paths:
    M changelog/1642.trivial

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


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

  Changed paths:
    M testing/test_session.py

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


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

  Changed paths:
    M _pytest/config.py

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


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

  Changed paths:
    M doc/en/customize.rst

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


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

  Changed paths:
    M changelog/1642.trivial

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


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

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

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


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

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

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


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

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

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


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

  Changed paths:
    M testing/test_session.py

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


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

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

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


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

  Changed paths:
    M doc/en/customize.rst

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


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

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

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

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


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

  Changed paths:
    M _pytest/runner.py

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


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

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

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


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

  Changed paths:
    M AUTHORS

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


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

  Changed paths:
    M changelog/3189.feature

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


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

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

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


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

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

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

Add captured log msgs to junit xml file


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

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

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

Additionally handle logstart and logfinish hooks


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

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

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

#1642 add rootdir option


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

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

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


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

  Changed paths:
    M _pytest/logging.py

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


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

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

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


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

  Changed paths:
    M _pytest/logging.py

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


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

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

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

Expose `log_cli` as a CLI parser option.


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

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

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


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

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

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


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

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

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

#1478 Added --no-stdout option


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

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

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


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

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

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

Fixes #1527


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

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

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

Related: #3223


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

  Changed paths:
    M changelog/3213.feature

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


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

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

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

Fixes #3198


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

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

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

Add "--deselect" command line option


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

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

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

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


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

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

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

Show deselection count before tests are executed


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

  Changed paths:
    M testing/logging/test_reporting.py

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


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

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

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


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

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

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

Merge master into features


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

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

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


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

  Changed paths:
    A changelog/3228.trivial.rst

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


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

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

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

Update minimal attrs library to v17.4.0


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

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

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

Fixes: #3233


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

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

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

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


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

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

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

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

This reverts commit ac7eb63a6b9899250ebd58f61f348ef69bf55875.


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

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

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

Add captured-log support to --show-capture


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

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

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


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

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

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


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

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

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


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

  Changed paths:
    M changelog/3246.trival.rst

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


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

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

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

Also make record_xml_property return record_property directly


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

  Changed paths:
    M _pytest/runner.py

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


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

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

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

remove addcall in the terminal tests


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

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

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

Make record_xml_property generic and compatible with xdist and markers.


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

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

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


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

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

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


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

  Changed paths:
    M _pytest/skipping.py

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


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

  Changed paths:
    M setup.py

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


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

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

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


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

  Changed paths:
    M _pytest/mark/legacy.py

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


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

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

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


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

  Changed paths:
    M _pytest/mark/__init__.py

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


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

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

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


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

  Changed paths:
    M testing/test_pdb.py

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

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


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

  Changed paths:
    M _pytest/mark/evaluate.py

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


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

  Changed paths:
    A changelog/3250.trivial.rst

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


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

  Changed paths:
    M testing/test_pdb.py

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

Add pdb test with disabled logging plugin


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

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

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


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

  Changed paths:
    A changelog/3149.feature

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

  Changed paths:
    M doc/en/doctest.rst

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


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

  Changed paths:
    R _pytest/mark.py
    A _pytest/mark/__init__.py
    A _pytest/mark/evaluate.py
    A _pytest/mark/legacy.py
    A _pytest/mark/structures.py
    M _pytest/python.py
    M _pytest/skipping.py
    A changelog/3250.trivial.rst
    M setup.py

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

Mark package


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

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

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


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

  Changed paths:
    M changelog/3149.feature

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


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

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

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


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

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

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


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

  Changed paths:
    M testing/test_skipping.py

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


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

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

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


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

  Changed paths:
    M changelog/3236.trivial.rst

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


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

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

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


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

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

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

Continue on doctest failure


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

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

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

#3236 Use platform module in pytest.mark


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

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

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

Show "short test summary info" after tracebacks and warnings


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

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

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


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

  Changed paths:
    M testing/test_skipping.py

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


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

  Changed paths:
    M testing/test_skipping.py

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

Fix typo with test_summary_list_after_errors


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

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

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

Merge master into features


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

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

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


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

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

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


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

  Changed paths:
    A changelog/3268.trivial

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


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

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

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


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

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

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

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


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

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

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

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


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

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

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


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

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

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

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


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

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

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

Re-Introduce more_itertools


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

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

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


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

  Changed paths:
    M _pytest/config.py

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


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

  Changed paths:
    M _pytest/config.py

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


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

  Changed paths:
    M _pytest/config.py

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

Minor refactors


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

  Changed paths:
    M _pytest/terminal.py

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


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

  Changed paths:
    M _pytest/nodes.py

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


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

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

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


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

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

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


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

  Changed paths:
    A changelog/3291.feature

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


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

  Changed paths:
    M _pytest/_code/source.py

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


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

  Changed paths:
    M _pytest/_code/code.py

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


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

  Changed paths:
    M _pytest/mark/structures.py

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


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

  Changed paths:
    M _pytest/_code/source.py

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


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

  Changed paths:
    M _pytest/_code/source.py

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


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

  Changed paths:
    M _pytest/_code/source.py

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


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

  Changed paths:
    M _pytest/_code/source.py

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


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

  Changed paths:
    M _pytest/_code/source.py

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


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

  Changed paths:
    A changelog/3292.trivial.rst

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


  Commit: 54b15f5826438a311c22c693bdb248ed5f379e97
      https://github.com/pytest-dev/pytest/commit/54b15f5826438a311c22c693bdb248ed5f379e97
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-03-10 (Sat, 10 Mar 2018)

  Changed paths:
    M _pytest/config.py
    M _pytest/deprecated.py
    A changelog/3084.removal
    M doc/en/plugins.rst
    M doc/en/writing_plugins.rst
    M testing/deprecated_test.py

  Log Message:
  -----------
  deprecated pytest_plugins in non-top-level conftest


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

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

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


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

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

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


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

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

  Log Message:
  -----------
  Fix typo in docs


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

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

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

move some code and make nodeid computed early


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

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

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

internal refactor port exc FOrmattedExcinfo to attrs, remove old code


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

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

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

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

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


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

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

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


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

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

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

unify cli verbosity handling


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

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

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

remove CmdOptions since we can use argparse.Namespace()


  Commit: c34dde7a3f582ddb57560ea08cfe00b84be31e16
      https://github.com/pytest-dev/pytest/commit/c34dde7a3f582ddb57560ea08cfe00b84be31e16
  Author: Tadeu Manoel <e.tadeu at gmail.com>
  Date:   2018-03-14 (Wed, 14 Mar 2018)

  Changed paths:
    M _pytest/python_api.py
    A changelog/3312.feature
    M testing/python/approx.py

  Log Message:
  -----------
  Add support for pytest.approx comparisons between array and scalar


  Commit: 161d4e5fe4730f46e1fb803595198068b20c94c5
      https://github.com/pytest-dev/pytest/commit/161d4e5fe4730f46e1fb803595198068b20c94c5
  Author: Tadeu Manoel <e.tadeu at gmail.com>
  Date:   2018-03-14 (Wed, 14 Mar 2018)

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

  Log Message:
  -----------
  Add support for pytest.approx comparisons between scalar and array (inverted order)


  Commit: 97f9a8bfdf25e051fbe58b3d645afbc6d9141fbd
      https://github.com/pytest-dev/pytest/commit/97f9a8bfdf25e051fbe58b3d645afbc6d9141fbd
  Author: Tadeu Manoel <e.tadeu at gmail.com>
  Date:   2018-03-14 (Wed, 14 Mar 2018)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Add fixes to make `numpy.approx` array-scalar comparisons work with older numpy versions


  Commit: 42c84f4f30725e42b4ba3e0aa7480549666e2f01
      https://github.com/pytest-dev/pytest/commit/42c84f4f30725e42b4ba3e0aa7480549666e2f01
  Author: Tadeu Manoel <e.tadeu at gmail.com>
  Date:   2018-03-15 (Thu, 15 Mar 2018)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Add fixes to `numpy.approx` array-scalar comparisons (from PR suggestions)


  Commit: a754f00ae7e815786ef917654c4106c7f39dad69
      https://github.com/pytest-dev/pytest/commit/a754f00ae7e815786ef917654c4106c7f39dad69
  Author: Tadeu Manoel <e.tadeu at gmail.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Improve `numpy.approx` array-scalar comparisons

So that `self.expected` in ApproxNumpy is always a numpy array.


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

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

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


  Commit: 86d6804e60ecfcdb0a2b7a73e2e274ffea00d0fb
      https://github.com/pytest-dev/pytest/commit/86d6804e60ecfcdb0a2b7a73e2e274ffea00d0fb
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M _pytest/python_api.py
    A changelog/3312.feature
    M testing/python/approx.py

  Log Message:
  -----------
  Merge pull request #3313 from tadeu/approx-array-scalar

Add support for `pytest.approx` comparisons between array and scalar


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

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

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

Merge master into features


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

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

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

implemented --last-failed-no-failures


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

  Changed paths:
    M testing/python/fixture.py

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

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


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

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

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

Fix #2405


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

  Changed paths:
    M _pytest/config.py
    M _pytest/deprecated.py
    A changelog/3084.removal
    M doc/en/plugins.rst
    M doc/en/writing_plugins.rst
    M testing/deprecated_test.py

  Log Message:
  -----------
  Merge pull request #3230 from brianmaissy/features

deprecate pytest_plugins in non-top-level conftest


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

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

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

Instantiate fixtures by scope order in test function requests


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

  Changed paths:
    M AUTHORS
    M changelog/3245.trivial.rst
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    R doc/en/example/costlysetup/sub1/__init__.py
    R doc/en/example/costlysetup/sub1/test_quick.py
    R doc/en/example/costlysetup/sub2/__init__.py
    R doc/en/example/costlysetup/sub2/test_two.py
    A doc/en/example/costlysetup/sub_a/__init__.py
    A doc/en/example/costlysetup/sub_a/test_quick.py
    A doc/en/example/costlysetup/sub_b/__init__.py
    A doc/en/example/costlysetup/sub_b/test_two.py
    M tox.ini

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


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

  Changed paths:
    M doc/en/usage.rst

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


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

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

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


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

  Changed paths:
    M _pytest/terminal.py

  Log Message:
  -----------
  Remove `terminal.flatten` function in favor of collapse from more_itertools


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

  Changed paths:
    A changelog/3330.trivial.rst

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


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

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

  Log Message:
  -----------
  Merge pull request #3330 from nicoddemus/remove-custom-flatten

Remove terminal.flatten function in favor of collapse from more_itertools


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

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M changelog/3245.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    R doc/en/example/costlysetup/sub1/__init__.py
    R doc/en/example/costlysetup/sub1/test_quick.py
    R doc/en/example/costlysetup/sub2/__init__.py
    R doc/en/example/costlysetup/sub2/test_two.py
    A doc/en/example/costlysetup/sub_a/__init__.py
    A doc/en/example/costlysetup/sub_a/test_quick.py
    A doc/en/example/costlysetup/sub_b/__init__.py
    A doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst
    M tox.ini

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

Release 3.5.0


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

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/cacheprovider.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/main.py
    R _pytest/mark.py
    A _pytest/mark/__init__.py
    A _pytest/mark/evaluate.py
    A _pytest/mark/legacy.py
    A _pytest/mark/structures.py
    M _pytest/nodes.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    A changelog/1478.feature
    A changelog/1642.feature.rst
    A changelog/2405.feature.rst
    A changelog/2770.feature
    A changelog/2770.removal.rst
    A changelog/3034.feature
    A changelog/3084.removal
    A changelog/3139.feature
    A changelog/3149.feature
    A changelog/3156.feature
    A changelog/3189.feature
    A changelog/3190.feature
    A changelog/3198.feature.rst
    A changelog/3204.feature
    A changelog/3213.feature
    A changelog/3228.trivial.rst
    A changelog/3236.feature.rst
    A changelog/3246.trival.rst
    A changelog/3250.trivial.rst
    A changelog/3255.feature.rst
    A changelog/3265.trivial.rst
    A changelog/3268.trivial
    A changelog/3291.trivial.rst
    A changelog/3292.trivial.rst
    A changelog/3296.feature
    A changelog/3296.trivial
    A changelog/3304.trivial
    A changelog/3312.feature
    A changelog/3330.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/customize.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/logging.rst
    M doc/en/plugins.rst
    M doc/en/reference.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/test_cacheprovider.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_pdb.py
    M testing/test_resultlog.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

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


Compare: https://github.com/pytest-dev/pytest/compare/fc4f769888f2...ed118d7f2051


More information about the pytest-commit mailing list