[Pytest-commit] [pytest-dev/pytest] cfd16d: provide error fixture applied to the same func

Bruno Oliveira nicoddemus at gmail.com
Wed May 23 06:54:36 EDT 2018


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

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

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

provide error fixture applied to the same func

provide error fixture applied to the same func


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

  Changed paths:
    M changelog/2334.feature

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


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

  Changed paths:
    A testing/test_debugging.py

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


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

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

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


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

  Changed paths:
    M testing/test_debugging.py

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


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

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

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


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

  Changed paths:
    M testing/test_pdb.py

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


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

  Changed paths:
    M _pytest/debugging.py

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


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

  Changed paths:
    M _pytest/debugging.py

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


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

  Changed paths:
    M testing/test_pdb.py

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


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

  Changed paths:
    A changelog/3180.feature.rst

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


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

  Changed paths:
    M AUTHORS

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


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

  Changed paths:
    M testing/test_pdb.py

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


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

  Changed paths:
    M testing/test_pdb.py

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


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

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

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


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

  Changed paths:
    M changelog/3307.feature.rst

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


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

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

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


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

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

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


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

  Changed paths:
    M doc/en/usage.rst

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


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

  Changed paths:
    M doc/en/usage.rst

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


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

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

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

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


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

  Changed paths:
    M changelog/3180.feature.rst

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

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


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

  Changed paths:
    M testing/test_pdb.py

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


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

  Changed paths:
    M testing/test_pdb.py

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


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

  Changed paths:
    M testing/test_pdb.py

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

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


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

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

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


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

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

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


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

  Changed paths:
    M testing/test_mark.py

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


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

  Changed paths:
    M _pytest/mark/evaluate.py

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


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

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

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


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

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

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


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

  Changed paths:
    M _pytest/python.py

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


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

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

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


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

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

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


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

  Changed paths:
    A changelog/3317.feature

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


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

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

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


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

  Changed paths:
    M _pytest/nodes.py

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


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

  Changed paths:
    M _pytest/fixtures.py

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


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

  Changed paths:
    M _pytest/python.py

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


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

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

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


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

  Changed paths:
    M _pytest/nodes.py

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

TODO: add tests


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

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

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


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

  Changed paths:
    M _pytest/deprecated.py

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


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

  Changed paths:
    M _pytest/python.py

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


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

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

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


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

  Changed paths:
    M doc/en/mark.rst

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


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

  Changed paths:
    M testing/test_pdb.py

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


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

  Changed paths:
    M testing/test_pdb.py

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


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

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

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


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

  Changed paths:
    M doc/en/mark.rst

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


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

  Changed paths:
    M doc/en/reference.rst

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


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

  Changed paths:
    M doc/en/mark.rst

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


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

  Changed paths:
    M doc/en/mark.rst

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


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

  Changed paths:
    M doc/en/mark.rst

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


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

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

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

introduce a distinct searchable non-broken storage for markers


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

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

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

Support for the new builtin breakpoint function in Python 3.7


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

  Changed paths:
    M doc/en/mark.rst

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

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


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

  Changed paths:
    M doc/en/mark.rst

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

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


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

  Changed paths:
    M _pytest/monkeypatch.py

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


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

  Changed paths:
    M testing/test_monkeypatch.py

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


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

  Changed paths:
    A changelog/3290.bugfix

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


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

  Changed paths:
    M doc/en/monkeypatch.rst

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


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

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

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


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

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

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

Merge master into features


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

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

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

This uses of the `atomicwrites` library.

This is very hard to create a reliable test for.

Fix #3008


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

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

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

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


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

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

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


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

  Changed paths:
    M doc/en/monkeypatch.rst

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


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

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

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

#3290 improve monkeypatch


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

  Changed paths:
    M testing/python/fixture.py

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

Fix #2334


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

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

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


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

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

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

provide error fixture applied to the same func


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

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

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


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

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

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

Merge master into features


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

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

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


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

  Changed paths:
    M testing/test_pdb.py

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


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

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

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

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


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

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

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

Improve changelog note about markers


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

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

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


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

  Changed paths:
    M testing/test_mark.py

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


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

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

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

--pdb treats KeyboardInterrupt as exception


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

  Changed paths:
    M testing/test_mark.py

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


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

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

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

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


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

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

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


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

  Changed paths:
    M changelog/3446.feature

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


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

  Changed paths:
    M changelog/3459.feature

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


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

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

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


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

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

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


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

  Changed paths:
    M doc/en/mark.rst

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


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

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

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


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

  Changed paths:
    M changelog/3317.feature

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


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

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

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


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

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

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

Merge master into features


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

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

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

introduce name filtering for marker iteration again


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

  Changed paths:
    M tasks/requirements.txt

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


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

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

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


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

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

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


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

  Changed paths:
    M CHANGELOG.rst

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


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

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

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

Release 3.6.0


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

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


More information about the pytest-commit mailing list