[Pytest-commit] [pytest-dev/pytest] 9769bc: moving plugin inside pytest first pass

Bruno Oliveira nicoddemus at gmail.com
Sun Jan 6 10:09:15 EST 2019


  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 9769bc05c626dd0401e691c2c9c68f774fb990c3
      https://github.com/pytest-dev/pytest/commit/9769bc05c626dd0401e691c2c9c68f774fb990c3
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M .gitignore
    M src/_pytest/assertion/util.py

  Log Message:
  -----------
  moving plugin inside pytest first pass


  Commit: d42f1e87c3c4b55ef5faa1a11a4f3083860c864d
      https://github.com/pytest-dev/pytest/commit/d42f1e87c3c4b55ef5faa1a11a4f3083860c864d
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M src/_pytest/assertion/util.py
    M testing/test_assertion.py

  Log Message:
  -----------
  Add tests for attrs and dataclasses


  Commit: a0ba881c2202b4b7d49505fb5d53088ea387db30
      https://github.com/pytest-dev/pytest/commit/a0ba881c2202b4b7d49505fb5d53088ea387db30
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M AUTHORS
    A changelog/3632.feature.rst

  Log Message:
  -----------
  Add change to log; name to AUTHORS


  Commit: 1184db827373822863fe936b3027b225cb77ed02
      https://github.com/pytest-dev/pytest/commit/1184db827373822863fe936b3027b225cb77ed02
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M changelog/3632.feature.rst
    M testing/test_assertion.py

  Log Message:
  -----------
  cleaning up


  Commit: 87b019d5f91f7fb74c8a80218b4d4cf1647e61e5
      https://github.com/pytest-dev/pytest/commit/87b019d5f91f7fb74c8a80218b4d4cf1647e61e5
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  fix gitignore


  Commit: 1847cc74208a58efbfd1d8154e34b2bf18987b8c
      https://github.com/pytest-dev/pytest/commit/1847cc74208a58efbfd1d8154e34b2bf18987b8c
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M changelog/3632.feature.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_failures.py
    M src/_pytest/assertion/util.py
    M testing/test_assertion.py

  Log Message:
  -----------
  adding docs and cleaning up


  Commit: a3e388a73a4ef6b712c442c4147633322790b80d
      https://github.com/pytest-dev/pytest/commit/a3e388a73a4ef6b712c442c4147633322790b80d
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M changelog/3632.feature.rst
    M src/_pytest/assertion/util.py

  Log Message:
  -----------
  Improve changelog


  Commit: 025d160dfc0ce87482606b27762c47d47e4a2d5a
      https://github.com/pytest-dev/pytest/commit/025d160dfc0ce87482606b27762c47d47e4a2d5a
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M changelog/3632.feature.rst
    M testing/test_assertion.py

  Log Message:
  -----------
  Update tests to pass in py27


  Commit: e1e81e315e41fd4674b9e10c2bd4074734d3692b
      https://github.com/pytest-dev/pytest/commit/e1e81e315e41fd4674b9e10c2bd4074734d3692b
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M src/_pytest/assertion/util.py

  Log Message:
  -----------
  code review 1/n -- change hasattr to getattr


  Commit: a663f60b054fa791c1cb9729b68dbddedfdff26f
      https://github.com/pytest-dev/pytest/commit/a663f60b054fa791c1cb9729b68dbddedfdff26f
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M src/_pytest/assertion/util.py

  Log Message:
  -----------
  cr 2/n -- refactor compare eq class


  Commit: 4e99c80425024dfcf733e060c5ce9c53ff49c475
      https://github.com/pytest-dev/pytest/commit/4e99c80425024dfcf733e060c5ce9c53ff49c475
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M src/_pytest/assertion/util.py
    M testing/test_assertion.py

  Log Message:
  -----------
  have tests pass in python37; move to separate file


  Commit: 2bffd6829eb38a44f9e7523d044dad7339830691
      https://github.com/pytest-dev/pytest/commit/2bffd6829eb38a44f9e7523d044dad7339830691
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    A testing/example_scripts/dataclasses/test_compare_dataclasses.py
    A testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py
    A testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py
    A testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py
    M testing/test_assertion.py

  Log Message:
  -----------
  Move dataclass tests for 3.7 to separate file


  Commit: b83e97802e91ff74c6a437bb076de65bf2423fa1
      https://github.com/pytest-dev/pytest/commit/b83e97802e91ff74c6a437bb076de65bf2423fa1
  Author: Aly Sivji <alysivji at gmail.com>
  Date:   2018-11-13 (Tue, 13 Nov 2018)

  Changed paths:
    M src/_pytest/assertion/util.py
    M testing/test_assertion.py

  Log Message:
  -----------
  improve failure output


  Commit: ed91d5f086cfc8e707098e4032c098125b376f20
      https://github.com/pytest-dev/pytest/commit/ed91d5f086cfc8e707098e4032c098125b376f20
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-13 (Tue, 13 Nov 2018)

  Changed paths:
    M src/_pytest/config/__init__.py

  Log Message:
  -----------
  config: set invocation_dir in the constructor already

This allows to make use of it when determining the rootdir etc.


  Commit: ba457f5febe2f0b99330e696acb636d896f613b2
      https://github.com/pytest-dev/pytest/commit/ba457f5febe2f0b99330e696acb636d896f613b2
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-13 (Tue, 13 Nov 2018)

  Changed paths:
    M src/_pytest/config/findpaths.py

  Log Message:
  -----------
  Optimize/revisit determine_setup


  Commit: 5872e1c35a4de407129404c6f8f3e04c02962310
      https://github.com/pytest-dev/pytest/commit/5872e1c35a4de407129404c6f8f3e04c02962310
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-11-15 (Thu, 15 Nov 2018)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M appveyor.yml
    R changelog/3737.removal.rst
    R changelog/4270.feature.rst
    R changelog/4358.removal.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-4.0.0.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 src/_pytest/runner.py
    M testing/test_runner.py

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

Merge master into features


  Commit: 62967b311029b7a3e022d35dc57d2b8b1199b57f
      https://github.com/pytest-dev/pytest/commit/62967b311029b7a3e022d35dc57d2b8b1199b57f
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-11-18 (Sun, 18 Nov 2018)

  Changed paths:
    M src/_pytest/config/__init__.py
    M src/_pytest/config/findpaths.py

  Log Message:
  -----------
  Merge pull request #4367 from blueyed/determine_setup

Optimize/revisit determine_setup


  Commit: 1a8d9bf2549ab2c74aec4000599b8d6afc3a631b
      https://github.com/pytest-dev/pytest/commit/1a8d9bf2549ab2c74aec4000599b8d6afc3a631b
  Author: Nicholas Devenish <ndevenish at gmail.com>
  Date:   2018-11-18 (Sun, 18 Nov 2018)

  Changed paths:
    M AUTHORS
    A changelog/4327.bugfix.rst
    M src/_pytest/compat.py
    M src/_pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  Let approx() work on more generic sequences

approx() was updated in 9f3122fe to work better with numpy arrays,
however at the same time the requirements were tightened from
requiring an Iterable to requiring a Sequence - the former being
tested only on interface, while the latter requires subclassing or
registration with the abc.

Since the ApproxSequence only used __iter__ and __len__ this commit
reduces the requirement to only what's used, and allows unregistered
Sequence-like containers to be used.

Since numpy arrays qualify for the new criteria, reorder the checks so
that generic sequences are checked for after numpy arrays.


  Commit: 4eddf634e7c3631a37b3415aa8df1673e18114df
      https://github.com/pytest-dev/pytest/commit/4eddf634e7c3631a37b3415aa8df1673e18114df
  Author: Nicholas Devenish <ndevenish at gmail.com>
  Date:   2018-11-18 (Sun, 18 Nov 2018)

  Changed paths:
    M changelog/4327.bugfix.rst
    M testing/python/approx.py

  Log Message:
  -----------
  Rename and split out the testing, and reword the changelog.


  Commit: 2754a13f8600096a48eb17a2c39502aaaf309a3a
      https://github.com/pytest-dev/pytest/commit/2754a13f8600096a48eb17a2c39502aaaf309a3a
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

  Changed paths:
    A changelog/4400.bugfix.rst
    A changelog/4405.bugfix.rst
    A changelog/4412.bugfix.rst
    M setup.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/config/__init__.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M testing/test_assertrewrite.py
    M testing/test_collection.py
    M testing/test_session.py
    M tox.ini

  Log Message:
  -----------
  Merge master into features


  Commit: 92a2884b09eb793a390460012e6e2859da87767a
      https://github.com/pytest-dev/pytest/commit/92a2884b09eb793a390460012e6e2859da87767a
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

  Changed paths:
    A changelog/4416.feature.rst
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  pdb: support kwargs with `pdb.set_trace`

This handles `header` similar to Python 3.7 does it, and forwards any
other keyword arguments to the Pdb constructor.

This allows for `__import__("pdb").set_trace(skip=["foo.*"])`.

Fixes https://github.com/pytest-dev/pytest/issues/4416.


  Commit: ba17363d7585c3990d3f0c3796d747ff5f95433f
      https://github.com/pytest-dev/pytest/commit/ba17363d7585c3990d3f0c3796d747ff5f95433f
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

  Changed paths:
    A changelog/4421.removal.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/deprecated.py
    M src/_pytest/hookspec.py
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  remove pytest namespace hook


  Commit: 6e85febf2095d33b1e42f5182f3b7a52cb881a8a
      https://github.com/pytest-dev/pytest/commit/6e85febf2095d33b1e42f5182f3b7a52cb881a8a
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

  Changed paths:
    A changelog/4400.bugfix.rst
    A changelog/4405.bugfix.rst
    A changelog/4412.bugfix.rst
    M setup.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/config/__init__.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M testing/test_assertrewrite.py
    M testing/test_collection.py
    M testing/test_session.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #4420 from blueyed/merge-master

Merge master into features


  Commit: 50e3783f0712c22a4f88f3ea78602291b41cb9b1
      https://github.com/pytest-dev/pytest/commit/50e3783f0712c22a4f88f3ea78602291b41cb9b1
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

  Changed paths:
    A changelog/4421.removal.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/deprecated.py
    M src/_pytest/hookspec.py
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Merge pull request #4421 from RonnyPfannschmidt/remove-pytest-namespace

remove pytest namespace hook


  Commit: 3d92d5a6595a6f5df5849e5355a8dbd6bda9843d
      https://github.com/pytest-dev/pytest/commit/3d92d5a6595a6f5df5849e5355a8dbd6bda9843d
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

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

  Log Message:
  -----------
  Make sure parametrize ids are printable


  Commit: 8395b9e25dd968124c239c303af4088aa6a348b9
      https://github.com/pytest-dev/pytest/commit/8395b9e25dd968124c239c303af4088aa6a348b9
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

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

  Log Message:
  -----------
  Require id=... to be a string

This was documented before, but never enforced.  Passing non-strings could
have strange side-effects and enforcing a string simplifies other
implementation.


  Commit: 9ca0ab6e2be28a44dca3a52080a4bcd407ca0b7b
      https://github.com/pytest-dev/pytest/commit/9ca0ab6e2be28a44dca3a52080a4bcd407ca0b7b
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

  Changed paths:
    M src/_pytest/mark/structures.py
    M testing/python/metafunc.py

  Log Message:
  -----------
  Ensure printable manually-specified param(id=...)


  Commit: 9a1e518cc3bedbcfc3eefa1576cc9a627f23aca6
      https://github.com/pytest-dev/pytest/commit/9a1e518cc3bedbcfc3eefa1576cc9a627f23aca6
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

  Changed paths:
    A changelog/4397.bugfix.rst

  Log Message:
  -----------
  Add changelog entry for printable node ids


  Commit: 95c6d591f7f5eff10f98e7768823c220ac830435
      https://github.com/pytest-dev/pytest/commit/95c6d591f7f5eff10f98e7768823c220ac830435
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

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

  Log Message:
  -----------
  Properly escape \r \n \t bytes


  Commit: 0ffb8ddd7f7814481f7278d4eee1a62d81ae0c8b
      https://github.com/pytest-dev/pytest/commit/0ffb8ddd7f7814481f7278d4eee1a62d81ae0c8b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

  Changed paths:
    A changelog/4397.bugfix.rst
    M src/_pytest/compat.py
    M src/_pytest/mark/structures.py
    M testing/python/metafunc.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #4418 from asottile/printable_ids

Ensure that node ids are printable


  Commit: d52ea4b6cf1b7a552d52a78acfd3b3b7f642bcc6
      https://github.com/pytest-dev/pytest/commit/d52ea4b6cf1b7a552d52a78acfd3b3b7f642bcc6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-19 (Mon, 19 Nov 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Use python 3 in 'doctesting' environment

We some examples now use type annotations


  Commit: 9ed63c607ea8093d0a86bd848a5371562b7573c8
      https://github.com/pytest-dev/pytest/commit/9ed63c607ea8093d0a86bd848a5371562b7573c8
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-20 (Tue, 20 Nov 2018)

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  capture: do not overwrite `sys.__stdin__` etc

Ref: https://github.com/pytest-dev/pytest/pull/4398#discussion_r234333053


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

  Changed paths:
    M src/_pytest/capture.py

  Log Message:
  -----------
  Merge pull request #4407 from blueyed/sys-dunder

capture: do not overwrite `sys.__stdin__` etc


  Commit: 88bf01a31e6625edec134fc1d49ec882947fb680
      https://github.com/pytest-dev/pytest/commit/88bf01a31e6625edec134fc1d49ec882947fb680
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-11-22 (Thu, 22 Nov 2018)

  Changed paths:
    A changelog/4386.feature.rst
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/util.py
    M src/_pytest/main.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/runner.py
    M src/_pytest/unittest.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/test_resultlog.py
    M testing/test_runner.py

  Log Message:
  -----------
  fix #4386 - restructure construction and partial state of ExceptionInfo


  Commit: 2eaf3db6aeda21c060b18531c74776ffb41d33fc
      https://github.com/pytest-dev/pytest/commit/2eaf3db6aeda21c060b18531c74776ffb41d33fc
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-22 (Thu, 22 Nov 2018)

  Changed paths:
    M src/_pytest/_code/code.py

  Log Message:
  -----------
  Fix docstring indentation (docs env)


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

  Changed paths:
    M doc/en/deprecations.rst

  Log Message:
  -----------
  Update deprecations.rst now that we have removed a few features

* yield tests
* compat properties
* pytest_namespace

All merciless cut down by Ronny :'(


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

  Changed paths:
    M .gitignore
    M AUTHORS
    A changelog/3632.feature.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_failures.py
    M src/_pytest/assertion/util.py
    A testing/example_scripts/dataclasses/test_compare_dataclasses.py
    A testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py
    A testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py
    A testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py
    M testing/test_assertion.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3776 from alysivji/attrs-n-dataclasses

Detailed assert failure introspection for attrs and dataclasses objects


  Commit: 63f90a2bcd249a91c76d9e2078143bf66c33b43c
      https://github.com/pytest-dev/pytest/commit/63f90a2bcd249a91c76d9e2078143bf66c33b43c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    A changelog/4386.feature.rst
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/util.py
    M src/_pytest/main.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/runner.py
    M src/_pytest/unittest.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/test_resultlog.py
    M testing/test_runner.py

  Log Message:
  -----------
  Merge pull request #4438 from RonnyPfannschmidt/fix-4386-raises-partial-object

fix #4386 - restructure construction and partial state of ExceptionInfo


  Commit: 33b877cc01f7bbf33206f07b701aa2375694ee5c
      https://github.com/pytest-dev/pytest/commit/33b877cc01f7bbf33206f07b701aa2375694ee5c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    R changelog/4400.bugfix.rst
    R changelog/4405.bugfix.rst
    R changelog/4412.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-4.0.1.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.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 src/_pytest/assertion/rewrite.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/config/__init__.py
    M src/_pytest/config/findpaths.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/resultlog.py
    M src/_pytest/terminal.py
    M src/_pytest/tmpdir.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/raises.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_nose.py
    M testing/test_runner_xunit.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py

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


  Commit: 5bee396e4b441b724b7e283f04a1c0be87dea660
      https://github.com/pytest-dev/pytest/commit/5bee396e4b441b724b7e283f04a1c0be87dea660
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-24 (Sat, 24 Nov 2018)

  Changed paths:
    A changelog/4435.bugfix.rst
    M src/_pytest/python_api.py
    M testing/python/fixture.py
    M testing/python/raises.py

  Log Message:
  -----------
  Merge master into merge-master-into-features


  Commit: 59f65230b5df77f3e432dd98defdec5755e42335
      https://github.com/pytest-dev/pytest/commit/59f65230b5df77f3e432dd98defdec5755e42335
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-11-24 (Sat, 24 Nov 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    R changelog/4400.bugfix.rst
    R changelog/4405.bugfix.rst
    R changelog/4412.bugfix.rst
    A changelog/4435.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-4.0.1.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.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 src/_pytest/assertion/rewrite.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/config/__init__.py
    M src/_pytest/config/findpaths.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/python_api.py
    M src/_pytest/resultlog.py
    M src/_pytest/terminal.py
    M src/_pytest/tmpdir.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/raises.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_nose.py
    M testing/test_runner_xunit.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py

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

Merge master into features


  Commit: e9b2475e291d49c23beba6d35dbd08222d1b2763
      https://github.com/pytest-dev/pytest/commit/e9b2475e291d49c23beba6d35dbd08222d1b2763
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-11-25 (Sun, 25 Nov 2018)

  Changed paths:
    A changelog/4458.bugfix.rst
    M src/_pytest/nodes.py
    M testing/python/collect.py
    M testing/python/metafunc.py
    M testing/test_collection.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Display actual test ids in `--collect-only`


  Commit: 7d3ca68be6a6db623e54eab70ab46c5f1e8b6730
      https://github.com/pytest-dev/pytest/commit/7d3ca68be6a6db623e54eab70ab46c5f1e8b6730
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-11-25 (Sun, 25 Nov 2018)

  Changed paths:
    A changelog/4458.bugfix.rst
    M src/_pytest/nodes.py
    M testing/python/collect.py
    M testing/python/metafunc.py
    M testing/test_collection.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #4464 from asottile/dash_q_escaped

Display actual test ids in `--collect-only`


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

  Changed paths:
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/conf.py
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/requirements.txt
    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
    A scripts/appveyor-retry.cmd
    M scripts/upload-coverage.bat
    M tox.ini

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


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

  Changed paths:
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/conf.py
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/requirements.txt
    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
    A scripts/appveyor-retry.cmd
    M scripts/upload-coverage.bat
    M tox.ini

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

Merge master into features


  Commit: 1bba0a97146575b496ac3a021f6a68e1be74ec0d
      https://github.com/pytest-dev/pytest/commit/1bba0a97146575b496ac3a021f6a68e1be74ec0d
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-11-29 (Thu, 29 Nov 2018)

  Changed paths:
    A changelog/4435.deprecation.rst
    M doc/en/assert.rst
    M doc/en/deprecations.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/parametrize.rst
    M src/_pytest/deprecated.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_capture.py
    M testing/test_config.py
    M testing/test_monkeypatch.py
    M testing/test_parseopt.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_session.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Deprecate `raises(..., 'code(as_a_string)')` / `warns(..., 'code(as_a_string)')


  Commit: 1d86247b2c09bdfa05953343f865659c22309de6
      https://github.com/pytest-dev/pytest/commit/1d86247b2c09bdfa05953343f865659c22309de6
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-11-29 (Thu, 29 Nov 2018)

  Changed paths:
    A changelog/4435.deprecation.rst
    M doc/en/assert.rst
    M doc/en/deprecations.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/parametrize.rst
    M src/_pytest/deprecated.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_capture.py
    M testing/test_config.py
    M testing/test_monkeypatch.py
    M testing/test_parseopt.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_session.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #4443 from asottile/deprecate_raises_exec

Deprecate `raises(..., 'code(as_a_string)')` / `warns(..., 'code(as_a_string)')`.


  Commit: 7eb28f9eb7222ea9a08d0b7ffdec29353769519f
      https://github.com/pytest-dev/pytest/commit/7eb28f9eb7222ea9a08d0b7ffdec29353769519f
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-11-30 (Fri, 30 Nov 2018)

  Changed paths:
    A changelog/3079.removal.rst
    A changelog/3616.removal.rst
    M src/_pytest/compat.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/nodes.py
    M src/_pytest/nose.py
    M src/_pytest/python.py
    M src/pytest.py
    M testing/deprecated_test.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/test_collection.py
    M testing/test_nose.py
    M testing/test_pdb.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_terminal.py

  Log Message:
  -----------
  remove yield tests and compat properties


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

  Changed paths:
    A changelog/3079.removal.rst
    A changelog/3616.removal.rst
    M src/_pytest/compat.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/nodes.py
    M src/_pytest/nose.py
    M src/_pytest/python.py
    M src/pytest.py
    M testing/deprecated_test.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/test_collection.py
    M testing/test_nose.py
    M testing/test_pdb.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #3898 from RonnyPfannschmidt/remove-yield-and-compatprop

Remove yield and compatprop


  Commit: 847eacea19a02887fb6e63601908a37d7c2576a8
      https://github.com/pytest-dev/pytest/commit/847eacea19a02887fb6e63601908a37d7c2576a8
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-11-30 (Fri, 30 Nov 2018)

  Changed paths:
    M src/_pytest/nose.py
    M src/_pytest/runner.py
    M testing/test_runner.py

  Log Message:
  -----------
  refactor CallInfo constructor magic into named constructor


  Commit: e0ba1cbf8d84ede0acee869443b4e4924a0df9f2
      https://github.com/pytest-dev/pytest/commit/e0ba1cbf8d84ede0acee869443b4e4924a0df9f2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-30 (Fri, 30 Nov 2018)

  Changed paths:
    M src/_pytest/nose.py
    M src/_pytest/runner.py
    M testing/test_runner.py

  Log Message:
  -----------
  Merge pull request #4299 from RonnyPfannschmidt/callinfo-sanity

refactor callinfo to simplify ctor magic


  Commit: 63f38de38e2ff58063e4724eb31ff8e29bc25ebf
      https://github.com/pytest-dev/pytest/commit/63f38de38e2ff58063e4724eb31ff8e29bc25ebf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    M .gitignore
    M AUTHORS
    M CHANGELOG.rst
    A changelog/3079.removal.rst
    A changelog/3616.removal.rst
    A changelog/3632.feature.rst
    A changelog/4386.feature.rst
    R changelog/4400.bugfix.rst
    R changelog/4405.bugfix.rst
    R changelog/4412.bugfix.rst
    A changelog/4435.bugfix.rst
    A changelog/4435.deprecation.rst
    A changelog/4458.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-4.0.1.rst
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/conf.py
    M doc/en/deprecations.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/requirements.txt
    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
    A scripts/appveyor-retry.cmd
    M scripts/upload-coverage.bat
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/config/findpaths.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/main.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/nodes.py
    M src/_pytest/nose.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M src/_pytest/resultlog.py
    M src/_pytest/runner.py
    M src/_pytest/terminal.py
    M src/_pytest/tmpdir.py
    M src/_pytest/unittest.py
    M src/_pytest/warnings.py
    M src/pytest.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    A testing/example_scripts/dataclasses/test_compare_dataclasses.py
    A testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py
    A testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py
    A testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py
    M testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.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/test_assertion.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.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_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.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 update-deprecations-docs


  Commit: 06dc6e349023089a3c53bc4e4ad122c1a4834b12
      https://github.com/pytest-dev/pytest/commit/06dc6e349023089a3c53bc4e4ad122c1a4834b12
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    M doc/en/deprecations.rst

  Log Message:
  -----------
  Merge pull request #4446 from nicoddemus/update-deprecations-docs

Update deprecations.rst now that we have removed a few features


  Commit: b05061dcd27516da907ce62964263fd91f006ade
      https://github.com/pytest-dev/pytest/commit/b05061dcd27516da907ce62964263fd91f006ade
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    A changelog/4447.trivial.rst
    M doc/en/deprecations.rst
    M doc/en/usage.rst
    M src/_pytest/deprecated.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Change deprecation type of --result-log to PytestDeprecationWarning

It was decided to deprecate this on a later date (see discussion in #4447)


  Commit: 090f7ff44907ab1b3317bf5c19b36fabb6a84b8b
      https://github.com/pytest-dev/pytest/commit/090f7ff44907ab1b3317bf5c19b36fabb6a84b8b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    A changelog/4489.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Remove request.cached_setup

Fix #4489


  Commit: 40b85d7ee89388245e7bb45b044993251c71664c
      https://github.com/pytest-dev/pytest/commit/40b85d7ee89388245e7bb45b044993251c71664c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    A changelog/3083.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/python.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/python/metafunc.py

  Log Message:
  -----------
  Remove Metafunc.addcall

Fix #3083


  Commit: 44b74c8c25fa05c14ce45b884141631bb9df6a66
      https://github.com/pytest-dev/pytest/commit/44b74c8c25fa05c14ce45b884141631bb9df6a66
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    A changelog/4447.trivial.rst
    M doc/en/deprecations.rst
    M doc/en/usage.rst
    M src/_pytest/deprecated.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Merge pull request #4447 from nicoddemus/remove-result-log

Change resultlog deprecation to PytestDeprecatedWarning


  Commit: 4ffa13728dd64ee3131f718b0d3e58dc00d29b72
      https://github.com/pytest-dev/pytest/commit/4ffa13728dd64ee3131f718b0d3e58dc00d29b72
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    M changelog/3079.removal.rst
    M changelog/3616.removal.rst
    M changelog/4421.removal.rst

  Log Message:
  -----------
  Add links to the deprecations docs for the "removal" changelog entries


  Commit: a131f0acf6350968cc58f72328391abe84c1c365
      https://github.com/pytest-dev/pytest/commit/a131f0acf6350968cc58f72328391abe84c1c365
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    A changelog/3083.removal.rst
    A changelog/4489.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/python.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/python/fixture.py
    M testing/python/metafunc.py

  Log Message:
  -----------
  Merge pull request #4490 from nicoddemus/remove-cached-setup-add-call

Remove cached_setup and Metafunc.addcall


  Commit: 4a3c8e22d727f26b99f7e36f1b0c307646f596d3
      https://github.com/pytest-dev/pytest/commit/4a3c8e22d727f26b99f7e36f1b0c307646f596d3
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    M changelog/3079.removal.rst
    M changelog/3616.removal.rst
    M changelog/4421.removal.rst

  Log Message:
  -----------
  Merge pull request #4491 from nicoddemus/removal-links

Add links to the deprecations docs for the "removal" changelog entries


  Commit: b88c3f8f828baa8b1b719a587773671db70c87b0
      https://github.com/pytest-dev/pytest/commit/b88c3f8f828baa8b1b719a587773671db70c87b0
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-12-03 (Mon, 03 Dec 2018)

  Changed paths:
    A changelog/3050.deprecation.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/main.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Deprecate pytest.config


  Commit: 5db46d2087092e0fdd8867a393d0cccd5b47e2dd
      https://github.com/pytest-dev/pytest/commit/5db46d2087092e0fdd8867a393d0cccd5b47e2dd
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-12-03 (Mon, 03 Dec 2018)

  Changed paths:
    A changelog/3050.deprecation.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/main.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #4498 from asottile/deprecate_pytest_config

Deprecate pytest.config


  Commit: d237197de34bed39854251989126777fc9941c18
      https://github.com/pytest-dev/pytest/commit/d237197de34bed39854251989126777fc9941c18
  Author: feuillemorte <it at me.fmorte.org>
  Date:   2018-12-04 (Tue, 04 Dec 2018)

  Changed paths:
    A changelog/4278.trivial.rst
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  #4278 Added a CACHEDIR.TAG file to the cache directory


  Commit: 1654b77ca0febbe047a56cdce59e14755064b3e6
      https://github.com/pytest-dev/pytest/commit/1654b77ca0febbe047a56cdce59e14755064b3e6
  Author: Tomer Keren <tomer.keren.dev at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M testing/test_warnings.py

  Log Message:
  -----------
  [#3191] Set up tests to confirm warnings


  Commit: 9fc9b2926f35915b6e7fd9bebe1855e47554db04
      https://github.com/pytest-dev/pytest/commit/9fc9b2926f35915b6e7fd9bebe1855e47554db04
  Author: Tomer Keren <tomer.keren.dev at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M testing/test_warnings.py

  Log Message:
  -----------
  Fix tests and add aditional cases

As requested by review.

:ok_hand: Address code review for tests


  Commit: 59a11b6a5d4e9a93eba71c39b9f523e2b8380f39
      https://github.com/pytest-dev/pytest/commit/59a11b6a5d4e9a93eba71c39b9f523e2b8380f39
  Author: Tomer Keren <tomer.keren.dev at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M src/_pytest/assertion/rewrite.py

  Log Message:
  -----------
  Check for 'assert None' and warn appropriately

:bug:Fix warn ast bugs

:bug:Fix inner-ast imports by using importFrom

Alternetavly ast_call_helper could be retooled to use ast.attribute(...)


  Commit: e0c2ab19017d38cd957b96aff873e6fe97acbeef
      https://github.com/pytest-dev/pytest/commit/e0c2ab19017d38cd957b96aff873e6fe97acbeef
  Author: Tomer Keren <tomer.keren.dev at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M testing/test_warnings.py

  Log Message:
  -----------
  Fix tests not to assert a function that already asserts

Maybe there should be a warning about that too?


  Commit: aaf7f7fcca0721941b8633e190065759818fd5ea
      https://github.com/pytest-dev/pytest/commit/aaf7f7fcca0721941b8633e190065759818fd5ea
  Author: Tomer Keren <tomer.keren.dev at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    A changelog/3191.feature.rst

  Log Message:
  -----------
  Update changelog


  Commit: 3e6f1fa2db20eb2fd751a778dc42dd126a9e778d
      https://github.com/pytest-dev/pytest/commit/3e6f1fa2db20eb2fd751a778dc42dd126a9e778d
  Author: Tomer Keren <tomer.keren.dev at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M src/_pytest/assertion/rewrite.py

  Log Message:
  -----------
  Simplify warning creation by using ast.parse

in py2 it's a ast.Name where in py3 it's a ast.NamedConstant

Fixes namespace by using import from


  Commit: 26d27df6fce16904ed9fb27e27e16dc9620d9569
      https://github.com/pytest-dev/pytest/commit/26d27df6fce16904ed9fb27e27e16dc9620d9569
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M changelog/3191.feature.rst

  Log Message:
  -----------
  Improve changelog message


  Commit: e1e4b226c6aa7ea81bf18eb192a6f979275d7097
      https://github.com/pytest-dev/pytest/commit/e1e4b226c6aa7ea81bf18eb192a6f979275d7097
  Author: Tomer Keren <tomer.keren.dev at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M changelog/3191.feature.rst
    M src/_pytest/assertion/rewrite.py
    M testing/test_warnings.py

  Log Message:
  -----------
  :ok_hand: Address code review

Edited the changelog for extra clarity, and to fire off auto-formatting

Oddly enough, keeping `filename='{filename!r}'` caused an error while
collecting tests, but getting rid of the single ticks fixed it
Hopefully closes #3191


  Commit: 41031fce2fc64d36abfbbf5b140325759af94383
      https://github.com/pytest-dev/pytest/commit/41031fce2fc64d36abfbbf5b140325759af94383
  Author: Tomer Keren <tomer.keren.dev at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M changelog/3191.feature.rst
    M src/_pytest/assertion/rewrite.py

  Log Message:
  -----------
  Address code review


  Commit: 7a7ad0c12076f5dad281bbac064b95ba48dfb24e
      https://github.com/pytest-dev/pytest/commit/7a7ad0c12076f5dad281bbac064b95ba48dfb24e
  Author: Tomer Keren <tomer.keren.dev at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M src/_pytest/assertion/rewrite.py

  Log Message:
  -----------
  Shorten docstring for warn_about_none_ast


  Commit: 8fd60483efec91cdf410afc54ce9a95d76a8a2c9
      https://github.com/pytest-dev/pytest/commit/8fd60483efec91cdf410afc54ce9a95d76a8a2c9
  Author: Tomer Keren <tomer.keren.dev at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M src/_pytest/assertion/rewrite.py

  Log Message:
  -----------
  Don't insert warnings when not in a module


  Commit: 62b8f2f731c1b144a0bc9e872e6714922273549b
      https://github.com/pytest-dev/pytest/commit/62b8f2f731c1b144a0bc9e872e6714922273549b
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M changelog/4278.trivial.rst

  Log Message:
  -----------
  Update changelog [ci skip]


  Commit: 8a0ed7e2b33a33f29f81314dce587d05c6425c0a
      https://github.com/pytest-dev/pytest/commit/8a0ed7e2b33a33f29f81314dce587d05c6425c0a
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M changelog/3191.feature.rst

  Log Message:
  -----------
  Revisit changelog entry  [ci skip]


  Commit: 5ebacc49c630178413a38deb6e344fc07f284be3
      https://github.com/pytest-dev/pytest/commit/5ebacc49c630178413a38deb6e344fc07f284be3
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    M src/_pytest/assertion/rewrite.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Harden tests, fix doc/msg


  Commit: 76884c73bf1ba0cd9fa5ed6e4ba65931fa38096d
      https://github.com/pytest-dev/pytest/commit/76884c73bf1ba0cd9fa5ed6e4ba65931fa38096d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-05 (Wed, 05 Dec 2018)

  Changed paths:
    A changelog/3191.feature.rst
    M src/_pytest/assertion/rewrite.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Merge pull request #4146 from Tadaboody/give_hints_when_an_assertion_value_is_None_instead_of_a_boolean_3191

[#3191] Give hints when an assertion value is None instead of a boolean


  Commit: 0db5ccb0ddcd1556de7a851c0d9aee4378950ce7
      https://github.com/pytest-dev/pytest/commit/0db5ccb0ddcd1556de7a851c0d9aee4378950ce7
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-12-10 (Mon, 10 Dec 2018)

  Changed paths:
    A changelog/1495.doc.rst
    A changelog/4265.bugfix.rst
    A changelog/4500.bugfix.rst
    M doc/en/doctest.rst
    M doc/en/mark.rst
    M doc/en/requirements.txt
    M src/_pytest/capture.py
    M src/_pytest/config/__init__.py
    M testing/test_capture.py
    M testing/test_config.py

  Log Message:
  -----------
  Merge master into features


  Commit: 539d3dc34dad0129e324b8252cf22671af16118d
      https://github.com/pytest-dev/pytest/commit/539d3dc34dad0129e324b8252cf22671af16118d
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-12-10 (Mon, 10 Dec 2018)

  Changed paths:
    M testing/python/raises.py

  Log Message:
  -----------
  Merge branch 'fix-test_raises_exception_looks_iterable' into merge-master


  Commit: 038f1f94c292d6681456cce2ffb4712d5888e056
      https://github.com/pytest-dev/pytest/commit/038f1f94c292d6681456cce2ffb4712d5888e056
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-12-10 (Mon, 10 Dec 2018)

  Changed paths:
    A changelog/1495.doc.rst
    A changelog/4265.bugfix.rst
    A changelog/4500.bugfix.rst
    M doc/en/doctest.rst
    M doc/en/mark.rst
    M doc/en/requirements.txt
    M src/_pytest/capture.py
    M src/_pytest/config/__init__.py
    M testing/python/raises.py
    M testing/test_capture.py
    M testing/test_config.py

  Log Message:
  -----------
  Merge pull request #4524 from blueyed/merge-master

Merge master into features


  Commit: fc4aa27caebe6bcdcd3cefd7771df8fb2ef5e6b5
      https://github.com/pytest-dev/pytest/commit/fc4aa27caebe6bcdcd3cefd7771df8fb2ef5e6b5
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    A changelog/4292.feature.rst
    M src/_pytest/main.py
    M src/_pytest/outcomes.py
    M src/_pytest/runner.py
    M testing/test_runner.py

  Log Message:
  -----------
  Derive outcomes.exit.Exception from SystemExit instead of KeyboardInterrupt

This is required for properly getting out of pdb, where
KeyboardInterrupt is caught in py36 at least.

Ref: https://github.com/pytest-dev/pytest/issues/1865#issuecomment-242599949


  Commit: 7b1cb885c747dcbbbba3f320e5465bade8a98fa2
      https://github.com/pytest-dev/pytest/commit/7b1cb885c747dcbbbba3f320e5465bade8a98fa2
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    A changelog/3532.bugfix.rst
    M src/_pytest/config/__init__.py
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Handle missing space with -p

This still does not use an actual argument parser, which only gets
instantiated below, and it does not appear to make sense instantiating
it just for this pre-parsing it seems.

`-p` without the required value is being handled before already though,
so it could potentially be passed down from somewhere already?!

Fixes https://github.com/pytest-dev/pytest/issues/3532.


  Commit: 0e4e8e00a9ec15f87437abe41079bca33b8412b7
      https://github.com/pytest-dev/pytest/commit/0e4e8e00a9ec15f87437abe41079bca33b8412b7
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    A changelog/4278.trivial.rst
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #4504 from feuillemorte/4278_add_cachedir_tag

#4278 Added a CACHEDIR.TAG file to the cache directory


  Commit: 8152b6837e3b47dccf7b1e65a29f99595067765f
      https://github.com/pytest-dev/pytest/commit/8152b6837e3b47dccf7b1e65a29f99595067765f
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    A changelog/4416.feature.rst
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #4419 from blueyed/set_trace-kwargs

pdb: support kwargs with `pdb.set_trace`


  Commit: 3445eae737e5d5110674ad5aff1f87263c1be089
      https://github.com/pytest-dev/pytest/commit/3445eae737e5d5110674ad5aff1f87263c1be089
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    M src/_pytest/config/argparsing.py
    M testing/test_parseopt.py

  Log Message:
  -----------
  argparsing: Parser: allow to forward prog to argparse

Ref: https://github.com/pytest-dev/pytest-xdist/pull/388.


  Commit: ebe0a88226d1e63e068727e0c47e46628e0c81bc
      https://github.com/pytest-dev/pytest/commit/ebe0a88226d1e63e068727e0c47e46628e0c81bc
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    A changelog/3532.bugfix.rst
    M src/_pytest/config/__init__.py
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Merge pull request #4522 from blueyed/p-no-space

Handle missing space with -p


  Commit: bb363c8ff256e0a5fa9d78ca9fa9d7ec3c932f3a
      https://github.com/pytest-dev/pytest/commit/bb363c8ff256e0a5fa9d78ca9fa9d7ec3c932f3a
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    M src/_pytest/config/argparsing.py
    M testing/test_parseopt.py

  Log Message:
  -----------
  Merge pull request #4528 from blueyed/parser-prog

argparsing: Parser: allow to forward prog to argparse


  Commit: cfbd387a5d7a27a3e7dfb754d7cd4482e931822b
      https://github.com/pytest-dev/pytest/commit/cfbd387a5d7a27a3e7dfb754d7cd4482e931822b
  Author: Andrey Paramonov <paramon at acdlabs.ru>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    M src/_pytest/junitxml.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Add --junittime=call option


  Commit: a44776ed48755de7c7a0860cdba078b363b3d2b6
      https://github.com/pytest-dev/pytest/commit/a44776ed48755de7c7a0860cdba078b363b3d2b6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    M src/_pytest/junitxml.py

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


  Commit: 9839ceffe0c78c5308716db758532b03e0f908d8
      https://github.com/pytest-dev/pytest/commit/9839ceffe0c78c5308716db758532b03e0f908d8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    M src/_pytest/terminal.py
    M testing/test_skipping.py

  Log Message:
  -----------
  Change -ra to show errors and failures last, instead of first

Often in large test suites (like pytest's), the -ra summary is very useful
to obtain a list of failures so we can execute each test at once to fix them.

Problem is the default shows errors and failures first, which leads to a lot
of scrolling to get to them.


  Commit: 3cd11617ea8df94989af8e5115c1d235aaea13c2
      https://github.com/pytest-dev/pytest/commit/3cd11617ea8df94989af8e5115c1d235aaea13c2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    A changelog/4532.feature.rst

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


  Commit: 0bccfc44a754dfefce3e99602e767253b7f360f7
      https://github.com/pytest-dev/pytest/commit/0bccfc44a754dfefce3e99602e767253b7f360f7
  Author: Andrey Paramonov <paramon at acdlabs.ru>
  Date:   2018-12-12 (Wed, 12 Dec 2018)

  Changed paths:
    M testing/test_junitxml.py

  Log Message:
  -----------
  Fix flaky test


  Commit: 316cca204ff04c93529368ce63a7d3f5cc60aa6c
      https://github.com/pytest-dev/pytest/commit/316cca204ff04c93529368ce63a7d3f5cc60aa6c
  Author: Andrey Paramonov <paramon at acdlabs.ru>
  Date:   2018-12-12 (Wed, 12 Dec 2018)

  Changed paths:
    M src/_pytest/junitxml.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Switch to ini config parameter


  Commit: b1e766c30ed3f9a5cf3fa7dd47b330dd8684565e
      https://github.com/pytest-dev/pytest/commit/b1e766c30ed3f9a5cf3fa7dd47b330dd8684565e
  Author: Andrey Paramonov <paramon at acdlabs.ru>
  Date:   2018-12-12 (Wed, 12 Dec 2018)

  Changed paths:
    M AUTHORS
    A changelog/4483.feature.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Update docs


  Commit: ec4507d12a12cf9cc8b3bd33952abc1042e11344
      https://github.com/pytest-dev/pytest/commit/ec4507d12a12cf9cc8b3bd33952abc1042e11344
  Author: Andrey Paramonov <paramon at acdlabs.ru>
  Date:   2018-12-12 (Wed, 12 Dec 2018)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Fix doc formatting


  Commit: 5d79baf3f8cc2986dacfe0e34ff0b84794beecb4
      https://github.com/pytest-dev/pytest/commit/5d79baf3f8cc2986dacfe0e34ff0b84794beecb4
  Author: Andrey Paramonov <paramon at acdlabs.ru>
  Date:   2018-12-12 (Wed, 12 Dec 2018)

  Changed paths:
    M testing/test_junitxml.py

  Log Message:
  -----------
  Fix flaky test attempt 2


  Commit: e3d30f8ebf75da51f4ac09a6b197716420994b1f
      https://github.com/pytest-dev/pytest/commit/e3d30f8ebf75da51f4ac09a6b197716420994b1f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-12 (Wed, 12 Dec 2018)

  Changed paths:
    A changelog/4535.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/python.py
    M testing/deprecated_test.py
    M testing/python/collect.py

  Log Message:
  -----------
  Remove deprecated PyCollector.makeitem

Fix #4535


  Commit: 110fe2473f03acad1484ddc497c4e49a20d434e8
      https://github.com/pytest-dev/pytest/commit/110fe2473f03acad1484ddc497c4e49a20d434e8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-12 (Wed, 12 Dec 2018)

  Changed paths:
    A changelog/4535.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/python.py
    M testing/deprecated_test.py
    M testing/python/collect.py

  Log Message:
  -----------
  Merge pull request #4531 from nicoddemus/remove-custom-collection-types

Remove PyCollector.makeitem


  Commit: 5b83417afcce36c42e5c6cd51649da55101c0d86
      https://github.com/pytest-dev/pytest/commit/5b83417afcce36c42e5c6cd51649da55101c0d86
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-12 (Wed, 12 Dec 2018)

  Changed paths:
    A changelog/3974.deprecation.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/python_api.py
    M testing/deprecated_test.py
    M testing/python/raises.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Deprecate the 'message' parameter of pytest.raises

Fix #3974


  Commit: 15b0a89fb10524c31b24cead2e51d89564eb6b92
      https://github.com/pytest-dev/pytest/commit/15b0a89fb10524c31b24cead2e51d89564eb6b92
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-13 (Thu, 13 Dec 2018)

  Changed paths:
    A changelog/3974.deprecation.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/python_api.py
    M testing/deprecated_test.py
    M testing/python/raises.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Merge pull request #4539 from nicoddemus/deprecate-pytest-raises-message

Deprecate the 'message' parameter of pytest.raises


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

  Changed paths:
    A changelog/4532.feature.rst
    M src/_pytest/terminal.py
    M testing/test_skipping.py

  Log Message:
  -----------
  Merge pull request #4532 from nicoddemus/failure-summary

Change -ra to show errors and failures last, instead of first


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

  Changed paths:
    A changelog/4292.feature.rst
    M src/_pytest/main.py
    M src/_pytest/outcomes.py
    M src/_pytest/runner.py
    M testing/test_runner.py

  Log Message:
  -----------
  Merge pull request #4292 from blueyed/exit-outcome

Derive outcomes.exit.Exit from SystemExit instead of KeyboardInterrupt


  Commit: 26d202a7bd533cfbd9ec72d208aad81220ced3c8
      https://github.com/pytest-dev/pytest/commit/26d202a7bd533cfbd9ec72d208aad81220ced3c8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-13 (Thu, 13 Dec 2018)

  Changed paths:
    M AUTHORS
    A changelog/4483.feature.rst
    M doc/en/usage.rst
    M src/_pytest/junitxml.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #4529 from aparamon/jxmlunit-call-time

Add --junittime=call option


  Commit: 1e80a9cb34c73066cc8fa232be9b20fe284b8ae9
      https://github.com/pytest-dev/pytest/commit/1e80a9cb34c73066cc8fa232be9b20fe284b8ae9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-13 (Thu, 13 Dec 2018)

  Changed paths:
    A changelog/4543.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Remove pytest_funcarg__ prefix support for defining fixtures

Fix #4543


  Commit: 437f44a1f4f78d36e39461715791ae60d46c6043
      https://github.com/pytest-dev/pytest/commit/437f44a1f4f78d36e39461715791ae60d46c6043
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-14 (Fri, 14 Dec 2018)

  Changed paths:
    A changelog/4543.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #4544 from nicoddemus/remove-pytest-funcarg-prefix

Remove pytest_funcarg__ prefix support for defining fixtures


  Commit: 98987177a082944135ea2b208b38ec7d32b02d39
      https://github.com/pytest-dev/pytest/commit/98987177a082944135ea2b208b38ec7d32b02d39
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-14 (Fri, 14 Dec 2018)

  Changed paths:
    M changelog/3050.deprecation.rst
    M changelog/3079.removal.rst
    M changelog/3083.removal.rst
    M changelog/3191.feature.rst
    M changelog/3616.removal.rst
    A changelog/4278.feature.rst
    R changelog/4278.trivial.rst
    M changelog/4292.feature.rst
    M changelog/4386.feature.rst
    M changelog/4416.feature.rst
    M changelog/4421.removal.rst
    M changelog/4435.bugfix.rst
    M changelog/4435.deprecation.rst
    M changelog/4483.feature.rst
    M changelog/4535.removal.rst
    M changelog/4543.removal.rst

  Log Message:
  -----------
  Review changelog entries for features branch

I used `towncrier --draft` to see the full changelog, and decided to "nitpick" it
so it reads better as a whole.


  Commit: fd48cd57f95d2c4e2f6f4e416d20c36b4484d094
      https://github.com/pytest-dev/pytest/commit/fd48cd57f95d2c4e2f6f4e416d20c36b4484d094
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-14 (Fri, 14 Dec 2018)

  Changed paths:
    A changelog/3078.removal.rst
    M doc/en/deprecations.rst
    M doc/en/reference.rst
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/config/__init__.py
    M src/_pytest/config/findpaths.py
    M src/_pytest/deprecated.py
    M src/_pytest/hookspec.py
    M src/_pytest/nodes.py
    M src/_pytest/resultlog.py
    M src/_pytest/terminal.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/test_assertrewrite.py
    M testing/test_config.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Remove config.warn, Node.warn; pytest_logwarning issues a warning when implemented

Fix #3078


  Commit: ae5d5b8f59812f995ef7cc51d581ffc22d7eaefe
      https://github.com/pytest-dev/pytest/commit/ae5d5b8f59812f995ef7cc51d581ffc22d7eaefe
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-14 (Fri, 14 Dec 2018)

  Changed paths:
    M changelog/3050.deprecation.rst
    M changelog/3079.removal.rst
    M changelog/3083.removal.rst
    M changelog/3191.feature.rst
    M changelog/3616.removal.rst
    A changelog/4278.feature.rst
    R changelog/4278.trivial.rst
    M changelog/4292.feature.rst
    M changelog/4386.feature.rst
    M changelog/4416.feature.rst
    M changelog/4421.removal.rst
    M changelog/4435.bugfix.rst
    M changelog/4435.deprecation.rst
    M changelog/4483.feature.rst
    M changelog/4535.removal.rst
    M changelog/4543.removal.rst

  Log Message:
  -----------
  Merge pull request #4552 from nicoddemus/review-changelog-entries

Review changelog entries for features branch


  Commit: 231863b1337b708b2c95db975f7f2d9f6d0ef086
      https://github.com/pytest-dev/pytest/commit/231863b1337b708b2c95db975f7f2d9f6d0ef086
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-14 (Fri, 14 Dec 2018)

  Changed paths:
    M changelog/4483.feature.rst
    M doc/en/usage.rst
    M src/_pytest/junitxml.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Rename "junit_time" to "junit_duration_report" option

Just realized while reading the changelog that "junit_time" is not a very good
name, so I decided to open this PR renaming it to "junit_duration_report" which
I believe conveys the meaning of the option better


  Commit: 8e287c5c77914fa5bdd54314dc2d496e82f56dc1
      https://github.com/pytest-dev/pytest/commit/8e287c5c77914fa5bdd54314dc2d496e82f56dc1
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-12-14 (Fri, 14 Dec 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1495.doc.rst
    R changelog/4265.bugfix.rst
    R changelog/4500.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-4.0.2.rst
    M doc/en/example/parametrize.rst
    M src/_pytest/python_api.py
    M testing/python/raises.py
    M testing/test_assertion.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge master into features


  Commit: 6e1b1abfa7ec8816c289df29c5bc8fdfae5e6bff
      https://github.com/pytest-dev/pytest/commit/6e1b1abfa7ec8816c289df29c5bc8fdfae5e6bff
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-14 (Fri, 14 Dec 2018)

  Changed paths:
    A changelog/4547.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/junitxml.py

  Log Message:
  -----------
  Remove deprecated record_xml_property

Fix #4547


  Commit: a7e401656eca66fb1ecee7c5e55ea24598d87f45
      https://github.com/pytest-dev/pytest/commit/a7e401656eca66fb1ecee7c5e55ea24598d87f45
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-14 (Fri, 14 Dec 2018)

  Changed paths:
    A changelog/3085.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/deprecated.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Remove support to pass strings to pytest.main()

Fix #3085


  Commit: 1499778d5ea0f02f690cd50462c4061dad8cb9d7
      https://github.com/pytest-dev/pytest/commit/1499778d5ea0f02f690cd50462c4061dad8cb9d7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-14 (Fri, 14 Dec 2018)

  Changed paths:
    A changelog/2169.removal.rst
    M src/_pytest/python.py
    M testing/python/metafunc.py

  Log Message:
  -----------
  Errors in parametrize id functions now propagate the error instead of issuing a warning

Fix #2169


  Commit: 3cf44b30375acd769b041879e71d840dab26ab18
      https://github.com/pytest-dev/pytest/commit/3cf44b30375acd769b041879e71d840dab26ab18
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-12-15 (Sat, 15 Dec 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1495.doc.rst
    R changelog/4265.bugfix.rst
    R changelog/4500.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-4.0.2.rst
    M doc/en/example/parametrize.rst
    M src/_pytest/python_api.py
    M testing/python/raises.py
    M testing/test_assertion.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #4554 from blueyed/merge-master

Merge master into features


  Commit: 84390accccb160d52f1b0e6503c92027a64d6839
      https://github.com/pytest-dev/pytest/commit/84390accccb160d52f1b0e6503c92027a64d6839
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M changelog/4483.feature.rst
    M doc/en/usage.rst
    M src/_pytest/junitxml.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #4553 from nicoddemus/junit-durations

Rename "junit_time" to "junit_duration_report" option


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

  Changed paths:
    A changelog/3085.removal.rst
    A changelog/4547.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/deprecated.py
    M src/_pytest/junitxml.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Merge pull request #4555 from nicoddemus/remove-record-xml-pytest-main-str

Remove record_xml_property and support for strings in pytest.main()


  Commit: 75e93e5168d646946b713ccbd06e6268884659ec
      https://github.com/pytest-dev/pytest/commit/75e93e5168d646946b713ccbd06e6268884659ec
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    A changelog/2169.removal.rst
    M src/_pytest/python.py
    M testing/python/metafunc.py

  Log Message:
  -----------
  Merge pull request #4556 from nicoddemus/idfunc-failure

Errors in parametrize id functions now propagate the error instead of issuing a warning


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/1495.doc.rst
    A changelog/2169.removal.rst
    M changelog/3050.deprecation.rst
    M changelog/3079.removal.rst
    M changelog/3083.removal.rst
    A changelog/3085.removal.rst
    M changelog/3191.feature.rst
    M changelog/3616.removal.rst
    R changelog/4265.bugfix.rst
    A changelog/4278.feature.rst
    R changelog/4278.trivial.rst
    M changelog/4292.feature.rst
    M changelog/4386.feature.rst
    M changelog/4416.feature.rst
    M changelog/4421.removal.rst
    M changelog/4435.bugfix.rst
    M changelog/4435.deprecation.rst
    M changelog/4483.feature.rst
    R changelog/4500.bugfix.rst
    M changelog/4535.removal.rst
    A changelog/4543.removal.rst
    A changelog/4547.removal.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-4.0.2.rst
    M doc/en/deprecations.rst
    M doc/en/example/parametrize.rst
    M doc/en/usage.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/junitxml.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_assertion.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge branch 'features' into remove-legacy-warn


  Commit: e63c7a13ffa8190e378e6d2a89d671b343610aee
      https://github.com/pytest-dev/pytest/commit/e63c7a13ffa8190e378e6d2a89d671b343610aee
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M AUTHORS
    A changelog/4327.bugfix.rst
    M src/_pytest/compat.py
    M src/_pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  Merge pull request #4327 from ndevenish/approx

Let approx() work on more generic sequences


  Commit: 8563364d8be672e4155cdbcf23b2ec9c912a7d09
      https://github.com/pytest-dev/pytest/commit/8563364d8be672e4155cdbcf23b2ec9c912a7d09
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-18 (Tue, 18 Dec 2018)

  Changed paths:
    A changelog/3078.removal.rst
    M doc/en/deprecations.rst
    M doc/en/reference.rst
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/config/__init__.py
    M src/_pytest/config/findpaths.py
    M src/_pytest/deprecated.py
    M src/_pytest/hookspec.py
    M src/_pytest/nodes.py
    M src/_pytest/resultlog.py
    M src/_pytest/terminal.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/test_assertrewrite.py
    M testing/test_config.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Merge pull request #4542 from nicoddemus/remove-legacy-warn

Remove config.warn, Node.warn and pytest_logwarning


  Commit: 0115766df3fe660ee663a96b114e08a6a8b039b3
      https://github.com/pytest-dev/pytest/commit/0115766df3fe660ee663a96b114e08a6a8b039b3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-19 (Wed, 19 Dec 2018)

  Changed paths:
    A changelog/4545.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Calling fixtures directly is now an error instead of a warning

Fix #4545


  Commit: c400d8b2d861a9e99ba5af466842b890f1e346ea
      https://github.com/pytest-dev/pytest/commit/c400d8b2d861a9e99ba5af466842b890f1e346ea
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-19 (Wed, 19 Dec 2018)

  Changed paths:
    A changelog/4545.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #4561 from nicoddemus/remove-calling-fixtures-directly

Calling fixtures directly is now an error instead of a warning


  Commit: 197fd69ddcc4acb4f9e598f3e857abee9e02cba1
      https://github.com/pytest-dev/pytest/commit/197fd69ddcc4acb4f9e598f3e857abee9e02cba1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-19 (Wed, 19 Dec 2018)

  Changed paths:
    M testing/test_junitxml.py

  Log Message:
  -----------
  Use mocking to make test_junit_duration_report deterministic

Fix #4563


  Commit: 91384193794dcf8ae30778767546a2dad7bad845
      https://github.com/pytest-dev/pytest/commit/91384193794dcf8ae30778767546a2dad7bad845
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-19 (Wed, 19 Dec 2018)

  Changed paths:
    A changelog/3086.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/config/findpaths.py
    M src/_pytest/deprecated.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Remove support for '[pytest]' section in setup.cfg file

Fix #3086


  Commit: a93f41233a8f4edadb33a055396247ef1ede210a
      https://github.com/pytest-dev/pytest/commit/a93f41233a8f4edadb33a055396247ef1ede210a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-19 (Wed, 19 Dec 2018)

  Changed paths:
    A changelog/4548.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/deprecated.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Raise an error if pytest_plugins is defined in a non-top-level conftest.py file

Fix #4548


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

  Changed paths:
    A changelog/3086.removal.rst
    A changelog/4548.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/config/findpaths.py
    M src/_pytest/deprecated.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Merge pull request #4566 from nicoddemus/remove-setup-cfg-non-top-level-pytest-plugins

Remove support for [pytest] in setup.cfg files and pytest_plugins in non-top-level conftests


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

  Changed paths:
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #4565 from nicoddemus/flaky-test

Use mocking to make test_junit_duration_report deterministic


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

  Changed paths:
    A changelog/3082.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/mark/structures.py
    M testing/python/collect.py
    M testing/python/metafunc.py
    M testing/test_mark.py

  Log Message:
  -----------
  Remove support for applying marks to values in parametrize

Fix #3082


  Commit: 58fc918d0a2d596c62028daf842689aaeef78a10
      https://github.com/pytest-dev/pytest/commit/58fc918d0a2d596c62028daf842689aaeef78a10
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-21 (Fri, 21 Dec 2018)

  Changed paths:
    A changelog/3082.removal.rst
    M doc/en/deprecations.rst
    M src/_pytest/deprecated.py
    M src/_pytest/mark/structures.py
    M testing/python/collect.py
    M testing/python/metafunc.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #4571 from nicoddemus/remove-parametrize-marks

Remove support for applying marks to values in parametrize


  Commit: 9f9f6ee48beba8bbf0911e458590aa67b45bd867
      https://github.com/pytest-dev/pytest/commit/9f9f6ee48beba8bbf0911e458590aa67b45bd867
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-12-21 (Fri, 21 Dec 2018)

  Changed paths:
    M src/_pytest/config/__init__.py
    M src/_pytest/fixtures.py
    M src/_pytest/mark/__init__.py
    M src/_pytest/mark/structures.py
    M src/_pytest/nodes.py
    M src/_pytest/python.py
    M src/_pytest/unittest.py
    M testing/test_mark.py

  Log Message:
  -----------
  remove most of markertransfer

keywords are still a big issue


  Commit: 3947b859dc28c33658f82bd6b9ddbe6f4f6d97ba
      https://github.com/pytest-dev/pytest/commit/3947b859dc28c33658f82bd6b9ddbe6f4f6d97ba
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-12-21 (Fri, 21 Dec 2018)

  Changed paths:
    M src/_pytest/config/__init__.py

  Log Message:
  -----------
  fix hookspec parsing


  Commit: b258764ffed842bab2f6c580e48ed8f0b6b06992
      https://github.com/pytest-dev/pytest/commit/b258764ffed842bab2f6c580e48ed8f0b6b06992
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-12-21 (Fri, 21 Dec 2018)

  Changed paths:
    M doc/en/reference.rst
    M tox.ini

  Log Message:
  -----------
  fix docs


  Commit: 64a353f2b688049941fcbad87b62ddea6c3ef71d
      https://github.com/pytest-dev/pytest/commit/64a353f2b688049941fcbad87b62ddea6c3ef71d
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-12-21 (Fri, 21 Dec 2018)

  Changed paths:
    M doc/en/deprecations.rst

  Log Message:
  -----------
  update deprecation docs


  Commit: 102ffc69e8f0a8a82406f7f8a1ffaa722da79de7
      https://github.com/pytest-dev/pytest/commit/102ffc69e8f0a8a82406f7f8a1ffaa722da79de7
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-12-21 (Fri, 21 Dec 2018)

  Changed paths:
    M src/_pytest/config/__init__.py
    M src/_pytest/python.py

  Log Message:
  -----------
  add issue references to the todos


  Commit: 8f8d3114dd12564b9e051ca48fab55c3496b4cd1
      https://github.com/pytest-dev/pytest/commit/8f8d3114dd12564b9e051ca48fab55c3496b4cd1
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-12-21 (Fri, 21 Dec 2018)

  Changed paths:
    M doc/en/deprecations.rst

  Log Message:
  -----------
   apply suggested enhancements in deprecations.rst


  Commit: 134641fcb5687bd76511bdc629407a4c0be05685
      https://github.com/pytest-dev/pytest/commit/134641fcb5687bd76511bdc629407a4c0be05685
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2018-12-21 (Fri, 21 Dec 2018)

  Changed paths:
    A changelog/4546.removal.rst
    A changelog/891.removal.rst

  Log Message:
  -----------
  add first set of changelog entries for marker removal


  Commit: 134ace98d9b4bce9ae7c64448f488cfb14ead457
      https://github.com/pytest-dev/pytest/commit/134ace98d9b4bce9ae7c64448f488cfb14ead457
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-21 (Fri, 21 Dec 2018)

  Changed paths:
    A changelog/4546.removal.rst
    A changelog/891.removal.rst
    M doc/en/deprecations.rst
    M doc/en/reference.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/fixtures.py
    M src/_pytest/mark/__init__.py
    M src/_pytest/mark/structures.py
    M src/_pytest/nodes.py
    M src/_pytest/python.py
    M src/_pytest/unittest.py
    M testing/test_mark.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #4564 from RonnyPfannschmidt/remove-markinfo

 Remove MarkInfo


  Commit: 1eef53b6fe7a5e16359d03f30da6ed7fe4e0d8f6
      https://github.com/pytest-dev/pytest/commit/1eef53b6fe7a5e16359d03f30da6ed7fe4e0d8f6
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-12-29 (Sat, 29 Dec 2018)

  Changed paths:
    A changelog/4371.feature.rst
    M src/_pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Update --collect-only to display test descriptions when ran in verbose mode.


  Commit: 1a9979a8031dba34d6fff240ed41b51a6717edec
      https://github.com/pytest-dev/pytest/commit/1a9979a8031dba34d6fff240ed41b51a6717edec
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-12-30 (Sun, 30 Dec 2018)

  Changed paths:
    A changelog/4371.feature.rst
    M src/_pytest/terminal.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #4582 from jeffreyrack/4371-display-test-descriptions

4371: Update --collect-only to display test descriptions when ran in verbose


  Commit: 30c7a7bd697e3a4b0816a59c6bc2ed2dbf86e8a3
      https://github.com/pytest-dev/pytest/commit/30c7a7bd697e3a4b0816a59c6bc2ed2dbf86e8a3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-02 (Wed, 02 Jan 2019)

  Changed paths:
    M AUTHORS
    A changelog/4557.doc.rst
    A changelog/4558.doc.rst
    A changelog/4580.doc.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/usage.rst

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


  Commit: 56aecfc081f821790fce6402bead4b3f8182049d
      https://github.com/pytest-dev/pytest/commit/56aecfc081f821790fce6402bead4b3f8182049d
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2019-01-04 (Fri, 04 Jan 2019)

  Changed paths:
    M AUTHORS
    A changelog/4557.doc.rst
    A changelog/4558.doc.rst
    A changelog/4580.doc.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/usage.rst

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

Merge master into features


  Commit: 8b48621687f1a4bbc4832d1c2b852bec061dbfff
      https://github.com/pytest-dev/pytest/commit/8b48621687f1a4bbc4832d1c2b852bec061dbfff
  Author: Pedro Algarvio <pedro at algarvio.me>
  Date:   2019-01-04 (Fri, 04 Jan 2019)

  Changed paths:
    M src/_pytest/outcomes.py

  Log Message:
  -----------
  Allow providing a custom reason for `importorskip`


  Commit: be7eb22e8871fb9cb332bacfd3810a698f52636b
      https://github.com/pytest-dev/pytest/commit/be7eb22e8871fb9cb332bacfd3810a698f52636b
  Author: Pedro Algarvio <pedro at algarvio.me>
  Date:   2019-01-04 (Fri, 04 Jan 2019)

  Changed paths:
    M testing/test_runner.py

  Log Message:
  -----------
  Add test case for `importorskip` custom reason


  Commit: 0c4898670c98fa39b393d396062d08808941ae5f
      https://github.com/pytest-dev/pytest/commit/0c4898670c98fa39b393d396062d08808941ae5f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-05 (Sat, 05 Jan 2019)

  Changed paths:
    A changelog/4599.feature.rst
    M src/_pytest/outcomes.py

  Log Message:
  -----------
  Add changelog entry and update docs for importorskip


  Commit: 0da5531c7c3c40386d7b268ab070ffd0f97bd52c
      https://github.com/pytest-dev/pytest/commit/0da5531c7c3c40386d7b268ab070ffd0f97bd52c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-05 (Sat, 05 Jan 2019)

  Changed paths:
    A changelog/4599.feature.rst
    M src/_pytest/outcomes.py
    M testing/test_runner.py

  Log Message:
  -----------
  Merge pull request #4599 from s0undt3ch/feature/skiporfail-reason

Custom reason support for "importorskip"


  Commit: 9d297c06e8679346a3046239554f5d67452b8dea
      https://github.com/pytest-dev/pytest/commit/9d297c06e8679346a3046239554f5d67452b8dea
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-05 (Sat, 05 Jan 2019)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2169.removal.rst
    R changelog/3050.deprecation.rst
    R changelog/3078.removal.rst
    R changelog/3079.removal.rst
    R changelog/3082.removal.rst
    R changelog/3083.removal.rst
    R changelog/3085.removal.rst
    R changelog/3086.removal.rst
    R changelog/3191.feature.rst
    R changelog/3532.bugfix.rst
    R changelog/3616.removal.rst
    R changelog/3632.feature.rst
    R changelog/3974.deprecation.rst
    R changelog/4278.feature.rst
    R changelog/4292.feature.rst
    R changelog/4327.bugfix.rst
    R changelog/4371.feature.rst
    R changelog/4386.feature.rst
    R changelog/4397.bugfix.rst
    R changelog/4416.feature.rst
    R changelog/4421.removal.rst
    R changelog/4435.bugfix.rst
    R changelog/4435.deprecation.rst
    R changelog/4447.trivial.rst
    R changelog/4458.bugfix.rst
    R changelog/4483.feature.rst
    R changelog/4489.removal.rst
    R changelog/4532.feature.rst
    R changelog/4535.removal.rst
    R changelog/4543.removal.rst
    R changelog/4545.removal.rst
    R changelog/4546.removal.rst
    R changelog/4547.removal.rst
    R changelog/4548.removal.rst
    R changelog/4557.doc.rst
    R changelog/4558.doc.rst
    R changelog/4580.doc.rst
    R changelog/4599.feature.rst
    R changelog/891.removal.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-4.1.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Preparing release version 4.1.0


  Commit: e380d4306bcc56c441255c4a1d92878f4b553fce
      https://github.com/pytest-dev/pytest/commit/e380d4306bcc56c441255c4a1d92878f4b553fce
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-05 (Sat, 05 Jan 2019)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Anonimize attrs links


  Commit: 5a8e674e927970e2f35d93b0fd2f10ea9c81d287
      https://github.com/pytest-dev/pytest/commit/5a8e674e927970e2f35d93b0fd2f10ea9c81d287
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-05 (Sat, 05 Jan 2019)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Add dataclasses as a regendoc dependency


  Commit: d0e9b4812f083289cf14a581ab05da06d57d7174
      https://github.com/pytest-dev/pytest/commit/d0e9b4812f083289cf14a581ab05da06d57d7174
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-05 (Sat, 05 Jan 2019)

  Changed paths:
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.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

  Log Message:
  -----------
  Regendocs


  Commit: 01151ff566388a53b5cac3eeb90aae6045275c75
      https://github.com/pytest-dev/pytest/commit/01151ff566388a53b5cac3eeb90aae6045275c75
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-05 (Sat, 05 Jan 2019)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Add example for -ra usage to the docs


  Commit: d7465895d09e71225ffa6ae6943e2ae6b6136ec8
      https://github.com/pytest-dev/pytest/commit/d7465895d09e71225ffa6ae6943e2ae6b6136ec8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-05 (Sat, 05 Jan 2019)

  Changed paths:
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.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

  Log Message:
  -----------
  Regendoc again


  Commit: 99ef8c6d1660365a836e1cf01bf0298009f11490
      https://github.com/pytest-dev/pytest/commit/99ef8c6d1660365a836e1cf01bf0298009f11490
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-05 (Sat, 05 Jan 2019)

  Changed paths:
    M doc/en/Makefile

  Log Message:
  -----------
  Fix typo in Makefile: PYTEST_ADDOPT -> PYTEST_ADDOPTS


  Commit: e24031fb3627ae6c187ea476c99a5f6d90e876f6
      https://github.com/pytest-dev/pytest/commit/e24031fb3627ae6c187ea476c99a5f6d90e876f6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-05 (Sat, 05 Jan 2019)

  Changed paths:
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.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

  Log Message:
  -----------
  Regendocs again, without hypothesis


  Commit: 38adb23bd245329d26b36fd85a43aa9b3dd0406c
      https://github.com/pytest-dev/pytest/commit/38adb23bd245329d26b36fd85a43aa9b3dd0406c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2019-01-06 (Sun, 06 Jan 2019)

  Changed paths:
    M .gitignore
    M AUTHORS
    M CHANGELOG.rst
    R changelog/4557.doc.rst
    R changelog/4558.doc.rst
    R changelog/4580.doc.rst
    M doc/en/Makefile
    M doc/en/announce/index.rst
    A doc/en/announce/release-4.1.0.rst
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/deprecations.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_failures.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/reference.rst
    M doc/en/usage.rst
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/config/argparsing.py
    M src/_pytest/config/findpaths.py
    M src/_pytest/debugging.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/hookspec.py
    M src/_pytest/junitxml.py
    M src/_pytest/main.py
    M src/_pytest/mark/__init__.py
    M src/_pytest/mark/structures.py
    M src/_pytest/nodes.py
    M src/_pytest/nose.py
    M src/_pytest/outcomes.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M src/_pytest/resultlog.py
    M src/_pytest/runner.py
    M src/_pytest/terminal.py
    M src/_pytest/unittest.py
    M src/_pytest/warnings.py
    M src/pytest.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    A testing/example_scripts/dataclasses/test_compare_dataclasses.py
    A testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py
    A testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py
    A testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py
    M testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.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_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_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #4600 from nicoddemus/release-4.1.0

Release 4.1.0


Compare: https://github.com/pytest-dev/pytest/compare/e8152207c472...38adb23bd245
      **NOTE:** This service has 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