Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d12f46caef29c99ff1d097f72a10a2b377e7f329
      
https://github.com/pytest-dev/pytest/commit/d12f46caef29c99ff1d097f72a10a2b377e7f329
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-09-07 (Fri, 07 Sep 2018)

  Changed paths:
    M .gitattributes
    M .gitignore
    M .travis.yml
    M README.rst
    M appveyor.yml
    R scripts/call-tox.bat
    A scripts/prepare-coverage.bat
    A scripts/upload-coverage.bat
    M testing/python/metafunc.py
    M tox.ini

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

Merge master into features


  Commit: ab40696007b9f2313e26d0bcf67eb04fbb9d0efc
      
https://github.com/pytest-dev/pytest/commit/ab40696007b9f2313e26d0bcf67eb04fbb9d0efc
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-11 (Tue, 11 Sep 2018)

  Changed paths:
    A changelog/3946.bugfix.rst
    M src/_pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  -W now takes precedence over filters in ini files

Fix #3946


  Commit: 53c9124fc92e55e562d55109313fec85d7f427d5
      
https://github.com/pytest-dev/pytest/commit/53c9124fc92e55e562d55109313fec85d7f427d5
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-13 (Thu, 13 Sep 2018)

  Changed paths:
    A changelog/3946.bugfix.rst
    M src/_pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Merge pull request #3947 from nicoddemus/warnings-filter-precedence

-W now takes precedence over filters in ini files


  Commit: 495a55725b5f85ca6935ff2d67a2fd62f915e924
      
https://github.com/pytest-dev/pytest/commit/495a55725b5f85ca6935ff2d67a2fd62f915e924
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-13 (Thu, 13 Sep 2018)

  Changed paths:
    M changelog/README.rst
    M pyproject.toml

  Log Message:
  -----------
  Separate deprecations and removals in the CHANGELOG


  Commit: bf074b37a3192a454f8c156e116eebd0b4588d9e
      
https://github.com/pytest-dev/pytest/commit/bf074b37a3192a454f8c156e116eebd0b4588d9e
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-13 (Thu, 13 Sep 2018)

  Changed paths:
    A changelog/3616.deprecation.rst
    M doc/en/historical-notes.rst
    M src/_pytest/nodes.py
    M src/_pytest/python.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Show deprecation warnings for compat properties

Fix #3616


  Commit: 482bd5efd2a88a025a21979a6d7e7923a0605209
      
https://github.com/pytest-dev/pytest/commit/482bd5efd2a88a025a21979a6d7e7923a0605209
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-13 (Thu, 13 Sep 2018)

  Changed paths:
    M changelog/3616.deprecation.rst
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Show deprecation warning for cached_setup


  Commit: b7dd9154c370b5d22ca921cdac4962ca3ca8aacd
      
https://github.com/pytest-dev/pytest/commit/b7dd9154c370b5d22ca921cdac4962ca3ca8aacd
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-13 (Thu, 13 Sep 2018)

  Changed paths:
    M changelog/3616.deprecation.rst
    M src/_pytest/nodes.py
    M testing/deprecated_test.py

  Log Message:
  -----------
  Deprecate custom node types during collection by using special names


  Commit: feb8240410194c050c881678c97c0d7246ec1ccb
      
https://github.com/pytest-dev/pytest/commit/feb8240410194c050c881678c97c0d7246ec1ccb
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-13 (Thu, 13 Sep 2018)

  Changed paths:
    M src/_pytest/python.py
    M testing/python/collect.py

  Log Message:
  -----------
  Use self.Function again during collection


  Commit: 32ee0b9c885d8bdda9edeabd86277ba1cb31dce4
      
https://github.com/pytest-dev/pytest/commit/32ee0b9c885d8bdda9edeabd86277ba1cb31dce4
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-13 (Thu, 13 Sep 2018)

  Changed paths:
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/nodes.py

  Log Message:
  -----------
  Move warning messages to _pytest.deprecated


  Commit: da6830f19b13dba32956f27d0493c26e0ab29322
      
https://github.com/pytest-dev/pytest/commit/da6830f19b13dba32956f27d0493c26e0ab29322
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-14 (Fri, 14 Sep 2018)

  Changed paths:
    M changelog/3616.deprecation.rst
    M src/_pytest/config/findpaths.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/nodes.py
    M src/_pytest/resultlog.py

  Log Message:
  -----------
  Introduce UnformattedWarning to keep warning types and messages in 
_pytest.deprecated


  Commit: ae8f3695b52c69df9eb7911e209c82617f816a8f
      
https://github.com/pytest-dev/pytest/commit/ae8f3695b52c69df9eb7911e209c82617f816a8f
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-14 (Fri, 14 Sep 2018)

  Changed paths:
    M src/_pytest/deprecated.py
    M src/_pytest/warning_types.py

  Log Message:
  -----------
  Move UnformattedWarning to _pytest.warning_types


  Commit: bceaede1984c224066a9900439f78217df110ccf
      
https://github.com/pytest-dev/pytest/commit/bceaede1984c224066a9900439f78217df110ccf
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-09-15 (Sat, 15 Sep 2018)

  Changed paths:
    A changelog/3616.deprecation.rst
    M changelog/README.rst
    M doc/en/historical-notes.rst
    M pyproject.toml
    M src/_pytest/config/findpaths.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/nodes.py
    M src/_pytest/python.py
    M src/_pytest/resultlog.py
    M src/_pytest/warning_types.py
    M testing/deprecated_test.py
    M testing/python/collect.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3978 from nicoddemus/warn-yield-and-compat-properties

Actually deprecate long standing features


  Commit: 05155e4db0460cc58befbfd4af8192ef1ea14a88
      
https://github.com/pytest-dev/pytest/commit/05155e4db0460cc58befbfd4af8192ef1ea14a88
  Author: Andrea Cimatoribus <[email protected]>
  Date:   2018-09-15 (Sat, 15 Sep 2018)

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

  Log Message:
  -----------
  Fail at parametrize option for empty parameter set

Optionally raise an exception when parametrize collects no arguments.
Provide the name of the test causing the failure in the exception
message.

See: #3849


  Commit: 4a9f468aac312bde4c8dd499c3aeb14c02e9087c
      
https://github.com/pytest-dev/pytest/commit/4a9f468aac312bde4c8dd499c3aeb14c02e9087c
  Author: Andrea Cimatoribus <[email protected]>
  Date:   2018-09-15 (Sat, 15 Sep 2018)

  Changed paths:
    M doc/en/reference.rst

  Log Message:
  -----------
  Update documentation


  Commit: 913c07e41418c123228ad2ed50803b328f7a177f
      
https://github.com/pytest-dev/pytest/commit/913c07e41418c123228ad2ed50803b328f7a177f
  Author: Andrea Cimatoribus <[email protected]>
  Date:   2018-09-15 (Sat, 15 Sep 2018)

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

  Log Message:
  -----------
  Add changelog file and new author


  Commit: a79dc12f1e60b495e0e284904c3f5ce347871300
      
https://github.com/pytest-dev/pytest/commit/a79dc12f1e60b495e0e284904c3f5ce347871300
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-18 (Tue, 18 Sep 2018)

  Changed paths:
    M AUTHORS
    A changelog/3849.feature.rst
    M doc/en/reference.rst
    M src/_pytest/mark/__init__.py
    M src/_pytest/mark/structures.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #3970 from sambarluc/raise_on_empty_parameterset

Raise exception if parametrize collects an empty parameter set


  Commit: e967d4587a771106353232c410d5d2644d161ebe
      
https://github.com/pytest-dev/pytest/commit/e967d4587a771106353232c410d5d2644d161ebe
  Author: Thomas Hisch <[email protected]>
  Date:   2018-09-18 (Tue, 18 Sep 2018)

  Changed paths:
    A changelog/3964.rst
    M src/_pytest/logging.py
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Add support for logging in collection-phase

The logging plugin does not output log messages generated during the
collection-phase when live-logging is enabled. This fixes this.

Fixes #3964


  Commit: d1a3aa7b2bb0919348ba6a38a2c5ea99c8c3b118
      
https://github.com/pytest-dev/pytest/commit/d1a3aa7b2bb0919348ba6a38a2c5ea99c8c3b118
  Author: Thomas Hisch <[email protected]>
  Date:   2018-09-18 (Tue, 18 Sep 2018)

  Changed paths:
    M changelog/3964.rst

  Log Message:
  -----------
  Update 3964.rst


  Commit: 048342817b587ef0839331ca55a8f3f479a0d675
      
https://github.com/pytest-dev/pytest/commit/048342817b587ef0839331ca55a8f3f479a0d675
  Author: Thomas Hisch <[email protected]>
  Date:   2018-09-18 (Tue, 18 Sep 2018)

  Changed paths:
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Add testcase for logging to file


  Commit: 18cc74b8d0cc788f0162775412a618477571ad35
      
https://github.com/pytest-dev/pytest/commit/18cc74b8d0cc788f0162775412a618477571ad35
  Author: Thomas Hisch <[email protected]>
  Date:   2018-09-19 (Wed, 19 Sep 2018)

  Changed paths:
    M src/_pytest/logging.py

  Log Message:
  -----------
  Remove useless comment


  Commit: 83802d149481f5a5877a0e9e46eecfeaab99683a
      
https://github.com/pytest-dev/pytest/commit/83802d149481f5a5877a0e9e46eecfeaab99683a
  Author: Thomas Hisch <[email protected]>
  Date:   2018-09-19 (Wed, 19 Sep 2018)

  Changed paths:
    A changelog/3964.rst
    M src/_pytest/logging.py
    M testing/logging/test_reporting.py

  Log Message:
  -----------
  Merge pull request #3986 from thisch/fb3964

Add support for logging in collection-phase


  Commit: c30184709d0077843195b083fc9b1256f2e8a0d5
      
https://github.com/pytest-dev/pytest/commit/c30184709d0077843195b083fc9b1256f2e8a0d5
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-22 (Sat, 22 Sep 2018)

  Changed paths:
    A changelog/4013.feature.rst
    M doc/en/warnings.rst
    M src/_pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Show deprecation warnings even if filters are customized

Fix #4013


  Commit: 56d0b5a7e2eb5a02b048d870eb065024d07437de
      
https://github.com/pytest-dev/pytest/commit/56d0b5a7e2eb5a02b048d870eb065024d07437de
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-22 (Sat, 22 Sep 2018)

  Changed paths:
    M .coveragerc
    M .gitignore
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    M appveyor.yml
    R changelog/3251.feture.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.8.1.rst
    M doc/en/backwards-compatibility.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    A doc/en/deprecations.rst
    M doc/en/example/parametrize.rst
    M doc/en/getting-started.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M doc/en/warnings.rst
    R scripts/fail
    M scripts/prepare-coverage.bat
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/compat.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/paths.py
    M src/_pytest/python.py
    M src/_pytest/unittest.py
    M testing/code/test_code.py
    A testing/example_scripts/collect/package_init_given_as_arg/pkg/__init__.py
    A testing/example_scripts/collect/package_init_given_as_arg/pkg/test_foo.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    A testing/test_paths.py
    M testing/test_pdb.py
    M tox.ini

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


  Commit: 42afce27b303c77cbf3d87608ac64cc7384984e1
      
https://github.com/pytest-dev/pytest/commit/42afce27b303c77cbf3d87608ac64cc7384984e1
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-22 (Sat, 22 Sep 2018)

  Changed paths:
    A changelog/4013.feature.rst
    M doc/en/warnings.rst
    M src/_pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Merge pull request #4019 from nicoddemus/deprecation-warnings-4013

Show deprecation warnings even if filters are customized


  Commit: fcc5b6d60407d13b068e84a33744844cc7010a1c
      
https://github.com/pytest-dev/pytest/commit/fcc5b6d60407d13b068e84a33744844cc7010a1c
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-22 (Sat, 22 Sep 2018)

  Changed paths:
    M .pre-commit-config.yaml
    A changelog/3964.feature.rst
    R changelog/3964.rst

  Log Message:
  -----------
  Add "deprecation" to possible changelog entries in pre-commit


  Commit: e03a19f88d17aab7c6830b21104b31be0da68068
      
https://github.com/pytest-dev/pytest/commit/e03a19f88d17aab7c6830b21104b31be0da68068
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-09-23 (Sun, 23 Sep 2018)

  Changed paths:
    M .coveragerc
    M .gitignore
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    M appveyor.yml
    R changelog/3251.feture.rst
    A changelog/3964.feature.rst
    R changelog/3964.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.8.1.rst
    M doc/en/backwards-compatibility.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    A doc/en/deprecations.rst
    M doc/en/example/parametrize.rst
    M doc/en/getting-started.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M doc/en/warnings.rst
    R scripts/fail
    M scripts/prepare-coverage.bat
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/compat.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/paths.py
    M src/_pytest/python.py
    M src/_pytest/unittest.py
    M testing/code/test_code.py
    A testing/example_scripts/collect/package_init_given_as_arg/pkg/__init__.py
    A testing/example_scripts/collect/package_init_given_as_arg/pkg/test_foo.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    A testing/test_paths.py
    M testing/test_pdb.py
    M tox.ini

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

Merge master into features


  Commit: 0d04aa7c59f0aa295ebbc0b85410775c1ba972d5
      
https://github.com/pytest-dev/pytest/commit/0d04aa7c59f0aa295ebbc0b85410775c1ba972d5
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-09-23 (Sun, 23 Sep 2018)

  Changed paths:
    M doc/en/deprecations.rst

  Log Message:
  -----------
  Add 3.9 deprecated features to deprecations.rst


  Commit: 5d8467bedc0faaad73d7362a4d62687be02708e3
      
https://github.com/pytest-dev/pytest/commit/5d8467bedc0faaad73d7362a4d62687be02708e3
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-09-23 (Sun, 23 Sep 2018)

  Changed paths:
    M doc/en/deprecations.rst

  Log Message:
  -----------
  Merge pull request #4023 from nicoddemus/deprecated-3.9

Add 3.9 deprecated features to deprecations.rst


  Commit: 1101a20408367ce3243b52814353daf549b445d3
      
https://github.com/pytest-dev/pytest/commit/1101a20408367ce3243b52814353daf549b445d3
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-02 (Tue, 02 Oct 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.8.2.rst
    M doc/en/assert.rst
    M doc/en/deprecations.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/usage.rst
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/config/__init__.py
    M src/_pytest/hookspec.py
    M src/_pytest/mark/legacy.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/recwarn.py
    M src/_pytest/reports.py
    M src/_pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_conftest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_terminal.py

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


  Commit: 29d3faed6687ad433440f6c348585b269da29c85
      
https://github.com/pytest-dev/pytest/commit/29d3faed6687ad433440f6c348585b269da29c85
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-03 (Wed, 03 Oct 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.8.2.rst
    M doc/en/assert.rst
    M doc/en/deprecations.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/usage.rst
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/config/__init__.py
    M src/_pytest/hookspec.py
    M src/_pytest/mark/legacy.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/recwarn.py
    M src/_pytest/reports.py
    M src/_pytest/terminal.py
    M testing/acceptance_test.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_conftest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_terminal.py

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

Merge master into features


  Commit: 96b2ae66549b74b4f838e7f4169ae376e9528b52
      
https://github.com/pytest-dev/pytest/commit/96b2ae66549b74b4f838e7f4169ae376e9528b52
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-03 (Wed, 03 Oct 2018)

  Changed paths:
    M setup.py
    M src/_pytest/pytester.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Initial pass at timeout for subprocessing pytest

pytest-dev/pytest#4073


  Commit: 870a93c37b136d80406ce117b27b5d0f9631e1ee
      
https://github.com/pytest-dev/pytest/commit/870a93c37b136d80406ce117b27b5d0f9631e1ee
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-04 (Thu, 04 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Actually construct TimeoutExpired


  Commit: fe7050ba004527edce5dabfb983d7efcf4d7dfa1
      
https://github.com/pytest-dev/pytest/commit/fe7050ba004527edce5dabfb983d7efcf4d7dfa1
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-04 (Thu, 04 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Fix lint


  Commit: d2906950ce8afe2f19b56a5046a2274a2c7d65f6
      
https://github.com/pytest-dev/pytest/commit/d2906950ce8afe2f19b56a5046a2274a2c7d65f6
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-04 (Thu, 04 Oct 2018)

  Changed paths:
    M setup.py
    M src/_pytest/pytester.py

  Log Message:
  -----------
  monotonic.monotonic() -> time.time()


  Commit: d5e5433553a52d93654b863669593f68a6a7556e
      
https://github.com/pytest-dev/pytest/commit/d5e5433553a52d93654b863669593f68a6a7556e
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-04 (Thu, 04 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Add descriptive message for timeout


  Commit: 33f0338eeb14e4b154122447d73f161b536d70f1
      
https://github.com/pytest-dev/pytest/commit/33f0338eeb14e4b154122447d73f161b536d70f1
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-04 (Thu, 04 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  kill and wait for subprocess before raising TimeoutExpired


  Commit: dcd635ba0cbba40efce1947071cc0cfb7830952e
      
https://github.com/pytest-dev/pytest/commit/dcd635ba0cbba40efce1947071cc0cfb7830952e
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-04 (Thu, 04 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Correct timeout to check every so often


  Commit: 0d095fc978dde9994d81a7fb40d5bc5551d32283
      
https://github.com/pytest-dev/pytest/commit/0d095fc978dde9994d81a7fb40d5bc5551d32283
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-04 (Thu, 04 Oct 2018)

  Changed paths:
    M testing/test_pytester.py

  Log Message:
  -----------
  Up timeout to 1 second for test


  Commit: 900cef639710682c67a4ab88bd9e7666b14a9da2
      
https://github.com/pytest-dev/pytest/commit/900cef639710682c67a4ab88bd9e7666b14a9da2
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-04 (Thu, 04 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Use signal.alarm() for py2 timeout


  Commit: dd225e1b9d17212dfa079c0266336d6fb40de592
      
https://github.com/pytest-dev/pytest/commit/dd225e1b9d17212dfa079c0266336d6fb40de592
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-04 (Thu, 04 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Tidy getting of timeout from kwargs


  Commit: dcf9eb01043fb4131cf7e8e7b402695d3f8bdecc
      
https://github.com/pytest-dev/pytest/commit/dcf9eb01043fb4131cf7e8e7b402695d3f8bdecc
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-04 (Thu, 04 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Raise an exception on unexpected kwargs


  Commit: 5c38a5160d7878a12b459f8da6f441681ff9d59f
      
https://github.com/pytest-dev/pytest/commit/5c38a5160d7878a12b459f8da6f441681ff9d59f
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-04 (Thu, 04 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Slight diff tidy


  Commit: f3a173b7369cbf5807dbc8b8c7d08189debb471f
      
https://github.com/pytest-dev/pytest/commit/f3a173b7369cbf5807dbc8b8c7d08189debb471f
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-05 (Fri, 05 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Revert "Use signal.alarm() for py2 timeout"

This reverts commit 900cef639710682c67a4ab88bd9e7666b14a9da2.


  Commit: 42422a7f629265bdcd1afb76a44911cb4673b95e
      
https://github.com/pytest-dev/pytest/commit/42422a7f629265bdcd1afb76a44911cb4673b95e
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-05 (Fri, 05 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Throw away arbitrary args to runpytest_subprocess()


  Commit: 8e0e862c84f44dfa3e429275b3a3a5d29b5836a8
      
https://github.com/pytest-dev/pytest/commit/8e0e862c84f44dfa3e429275b3a3a5d29b5836a8
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-05 (Fri, 05 Oct 2018)

  Changed paths:
    M testing/test_pytester.py

  Log Message:
  -----------
  Stretch out the time assertion for slow AppVeyor


  Commit: ee64f1fb9f00a82e91055a3e70febfff643f016e
      
https://github.com/pytest-dev/pytest/commit/ee64f1fb9f00a82e91055a3e70febfff643f016e
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-05 (Fri, 05 Oct 2018)

  Changed paths:
    A changelog/4073.feature.rst

  Log Message:
  -----------
  Add changelog file for 4073


  Commit: ed5556bdac8b864937d5df2ea690573df27a4f83
      
https://github.com/pytest-dev/pytest/commit/ed5556bdac8b864937d5df2ea690573df27a4f83
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-05 (Fri, 05 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Add to docstrings


  Commit: 20902deb75d7d84b24c9f640439a45625aaac0d6
      
https://github.com/pytest-dev/pytest/commit/20902deb75d7d84b24c9f640439a45625aaac0d6
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-05 (Fri, 05 Oct 2018)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add Kyle Altendorf to AUTHORS


  Commit: 5ecbb0acba66e56a88805bde53515b6dda1c5452
      
https://github.com/pytest-dev/pytest/commit/5ecbb0acba66e56a88805bde53515b6dda1c5452
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-05 (Fri, 05 Oct 2018)

  Changed paths:
    M changelog/4073.feature.rst

  Log Message:
  -----------
  Correct new changelog to have newline at end


  Commit: 4b36f9aa64b90fde67db88d39c63d6c5e6116b9b
      
https://github.com/pytest-dev/pytest/commit/4b36f9aa64b90fde67db88d39c63d6c5e6116b9b
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-05 (Fri, 05 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Tidy timeout checking


  Commit: ccaec8d360e17e041a8f95e2a0942859615feae3
      
https://github.com/pytest-dev/pytest/commit/ccaec8d360e17e041a8f95e2a0942859615feae3
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-06 (Sat, 06 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  __tracebackhide__ = True


  Commit: 48dcc6727421bed1f9fe335ba53fae775a8c2fcc
      
https://github.com/pytest-dev/pytest/commit/48dcc6727421bed1f9fe335ba53fae775a8c2fcc
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-06 (Sat, 06 Oct 2018)

  Changed paths:
    M testing/test_pytester.py

  Log Message:
  -----------
  Increase timeout in test_testdir_run_with_timeout to decrease false failures


  Commit: a6fb4c82682aed92fa27d83cbf8955d40a377f98
      
https://github.com/pytest-dev/pytest/commit/a6fb4c82682aed92fa27d83cbf8955d40a377f98
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-07 (Sun, 07 Oct 2018)

  Changed paths:
    M AUTHORS
    A changelog/4073.feature.rst
    M src/_pytest/pytester.py
    M testing/test_pytester.py

  Log Message:
  -----------
  Merge pull request #4078 from altendky/4073-altendky-subprocessing_timeout

Add timeout for Testdir.runpytest_subprocess() and Testdir.run()


  Commit: 4071c8a4a8ff3b39c7a4f4461140527aea4a889a
      
https://github.com/pytest-dev/pytest/commit/4071c8a4a8ff3b39c7a4f4461140527aea4a889a
  Author: Kyle Altendorf <[email protected]>
  Date:   2018-10-08 (Mon, 08 Oct 2018)

  Changed paths:
    M testing/test_pytester.py

  Log Message:
  -----------
  Correct timing in test_pytester.test_testdir_run_with_timeout()


  Commit: b8958168f53de3bd774b556976102273eb5e8043
      
https://github.com/pytest-dev/pytest/commit/b8958168f53de3bd774b556976102273eb5e8043
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-09 (Tue, 09 Oct 2018)

  Changed paths:
    M testing/test_pytester.py

  Log Message:
  -----------
  Merge pull request #4092 from 
altendky/4073-altendky-subprocessing_timeout-take_2

Correct timing in test_pytester.test_testdir_run_with_timeout()


  Commit: 9a3836a0cff34aed500cbf787a0d8663a8e9f072
      
https://github.com/pytest-dev/pytest/commit/9a3836a0cff34aed500cbf787a0d8663a8e9f072
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-09 (Tue, 09 Oct 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M bench/bench_argcomplete.py
    M bench/manyparam.py
    A changelog/2535.bugfix.rst
    A changelog/3057.bugfix.rst
    A changelog/4058.doc.rst
    A changelog/4064.doc.rst
    A changelog/4066.bugfix.rst
    M doc/en/announce/release-3.6.3.rst
    M doc/en/announce/release-3.7.3.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/plugins.rst
    M doc/en/reference.rst
    M doc/en/unittest.rst
    M src/_pytest/_argcomplete.py
    M src/_pytest/_code/source.py
    M src/_pytest/fixtures.py
    M src/_pytest/junitxml.py
    M src/_pytest/logging.py
    M src/_pytest/mark/evaluate.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/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
    M 
testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
    A testing/example_scripts/fixtures/test_getfixturevalue_dynamic.py
    M testing/example_scripts/issue_519.py
    A 
testing/example_scripts/unittest/test_parametrized_fixture_error_message.py
    M testing/logging/test_fixture.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/test_pytester.py
    M testing/test_unittest.py

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


  Commit: 943bbdd8cedfd5cf63a9274aedeb4777e314c162
      
https://github.com/pytest-dev/pytest/commit/943bbdd8cedfd5cf63a9274aedeb4777e314c162
  Author: Anthony Sottile <[email protected]>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M bench/bench_argcomplete.py
    M bench/manyparam.py
    A changelog/2535.bugfix.rst
    A changelog/3057.bugfix.rst
    A changelog/4058.doc.rst
    A changelog/4064.doc.rst
    A changelog/4066.bugfix.rst
    M doc/en/announce/release-3.6.3.rst
    M doc/en/announce/release-3.7.3.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/plugins.rst
    M doc/en/reference.rst
    M doc/en/unittest.rst
    M src/_pytest/_argcomplete.py
    M src/_pytest/_code/source.py
    M src/_pytest/fixtures.py
    M src/_pytest/junitxml.py
    M src/_pytest/logging.py
    M src/_pytest/mark/evaluate.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/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
    M 
testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
    A testing/example_scripts/fixtures/test_getfixturevalue_dynamic.py
    M testing/example_scripts/issue_519.py
    A 
testing/example_scripts/unittest/test_parametrized_fixture_error_message.py
    M testing/logging/test_fixture.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/test_pytester.py
    M testing/test_unittest.py

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

Merge master into features


  Commit: aeb92accb2521f1f1ccc4faaf9e6f6bd36e04d8b
      
https://github.com/pytest-dev/pytest/commit/aeb92accb2521f1f1ccc4faaf9e6f6bd36e04d8b
  Author: Anthony Sottile <[email protected]>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    A changelog/4102.feature.rst
    M src/_pytest/recwarn.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  Implement pytest.deprecated_call with pytest.warns


  Commit: d93de6cc67b26c62490eb0e080934835d8c213ea
      
https://github.com/pytest-dev/pytest/commit/d93de6cc67b26c62490eb0e080934835d8c213ea
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Fix trailing whitespace in FixtureDef.__repr__


  Commit: e0f6fce9e9213d5beda7f54e800a72ac95cbb3b6
      
https://github.com/pytest-dev/pytest/commit/e0f6fce9e9213d5beda7f54e800a72ac95cbb3b6
  Author: Anthony Sottile <[email protected]>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    A changelog/4012.bugfix.rst
    M src/_pytest/recwarn.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  In python2, display previously warned warnings


  Commit: b8fc3e569ae0997b081b4002f2d663e8f477ffaf
      
https://github.com/pytest-dev/pytest/commit/b8fc3e569ae0997b081b4002f2d663e8f477ffaf
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  pytester: fix __tracebackhide__ for {re_,fn}match_lines


  Commit: 4c9015c3b158d3b2800b1582574d36d79daa22eb
      
https://github.com/pytest-dev/pytest/commit/4c9015c3b158d3b2800b1582574d36d79daa22eb
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Merge pull request #4105 from blueyed/repr

Fix trailing whitespace in FixtureDef.__repr__


  Commit: 602e74c2a7ea3377f8175bdaf6cb39a9f51fbfab
      
https://github.com/pytest-dev/pytest/commit/602e74c2a7ea3377f8175bdaf6cb39a9f51fbfab
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  Merge pull request #4107 from blueyed/__tracebackhide__

pytester: fix __tracebackhide__ for {re_,fn}match_lines


  Commit: 52ff1eaf37603c69b8381d6aead771325968cfb7
      
https://github.com/pytest-dev/pytest/commit/52ff1eaf37603c69b8381d6aead771325968cfb7
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

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

  Log Message:
  -----------
  _getconftestmodules: optimize


  Commit: 67f40e18a7420f2112bbf10a8eca4f317517cab9
      
https://github.com/pytest-dev/pytest/commit/67f40e18a7420f2112bbf10a8eca4f317517cab9
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

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

  Log Message:
  -----------
  Use attr.s(repr=False) because we customize MarkInfo's repr


  Commit: 5436e4299075236023e8875c563a7c74cad9bb2a
      
https://github.com/pytest-dev/pytest/commit/5436e4299075236023e8875c563a7c74cad9bb2a
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    A changelog/2293.feature.rst
    A changelog/2293.trivial.rst
    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 testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_mark.py
    M testing/test_runner.py

  Log Message:
  -----------
  Use pytest.fail(..., pytrace=False) when treating user errors

This prevents an enormous and often useless stack trace from showing
to end users.

Fix #3867
Fix #2293


  Commit: bf265a424d1d146978d3847142d543b46cc0f117
      
https://github.com/pytest-dev/pytest/commit/bf265a424d1d146978d3847142d543b46cc0f117
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-10 (Wed, 10 Oct 2018)

  Changed paths:
    R changelog/4012.bugfix.rst
    A changelog/4102.bugfix.rst
    M changelog/4102.feature.rst
    M src/_pytest/recwarn.py

  Log Message:
  -----------
  Minor adjustments found during code review


  Commit: b48e23d54c7133e2612d6b1974dd26d994be10b9
      
https://github.com/pytest-dev/pytest/commit/b48e23d54c7133e2612d6b1974dd26d994be10b9
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M src/_pytest/main.py
    M src/_pytest/tmpdir.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  port interals of tmpdir to a basic pathlib implementation

this is still lacking locking and cleanup of the folders


  Commit: 2e39fd89d1f54d924c10094659254e7c66096e0a
      
https://github.com/pytest-dev/pytest/commit/2e39fd89d1f54d924c10094659254e7c66096e0a
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/tmpdir.py

  Log Message:
  -----------
  add python27 support by using reduce instead of max


  Commit: d053cdfbbb5a9da7a726d0f564c1ff7139e5e70c
      
https://github.com/pytest-dev/pytest/commit/d053cdfbbb5a9da7a726d0f564c1ff7139e5e70c
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/tmpdir.py

  Log Message:
  -----------
  factor out max and iterate on locks and cleanups


  Commit: 8e00280fc1d50bc2fb74cc1ea128e938bb29a691
      
https://github.com/pytest-dev/pytest/commit/8e00280fc1d50bc2fb74cc1ea128e938bb29a691
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/tmpdir.py

  Log Message:
  -----------
  fix linting


  Commit: 66a690928cc847c48774906e5ea60f578ddb216c
      
https://github.com/pytest-dev/pytest/commit/66a690928cc847c48774906e5ea60f578ddb216c
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/pytest.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  bring in purepath and fix an assertion


  Commit: ab3637d486cf48f46aaaa3627c3314ec7099ab06
      
https://github.com/pytest-dev/pytest/commit/ab3637d486cf48f46aaaa3627c3314ec7099ab06
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/tmpdir.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  implement cleanup for unlocked folders


  Commit: 8b4a29357e24cab087202135a92ef603439c194d
      
https://github.com/pytest-dev/pytest/commit/8b4a29357e24cab087202135a92ef603439c194d
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/tmpdir.py

  Log Message:
  -----------
  fix typo


  Commit: b3a5b0ebe1fa759cea7dcdd82d17020648234c61
      
https://github.com/pytest-dev/pytest/commit/b3a5b0ebe1fa759cea7dcdd82d17020648234c61
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/pytest.py

  Log Message:
  -----------
  remove path from exposure


  Commit: 642cd86dd1723b4ed997a99f3e089eeefdf8af08
      
https://github.com/pytest-dev/pytest/commit/642cd86dd1723b4ed997a99f3e089eeefdf8af08
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/tmpdir.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  shape up removal and lock destruction


  Commit: 2532dc1dbbdf49f2c32638d3caa19c4a7579a9b8
      
https://github.com/pytest-dev/pytest/commit/2532dc1dbbdf49f2c32638d3caa19c4a7579a9b8
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/tmpdir.py

  Log Message:
  -----------
  fix up lock consideration argument


  Commit: d76fa59b35edfffa91ce24e19c9f17f75f510546
      
https://github.com/pytest-dev/pytest/commit/d76fa59b35edfffa91ce24e19c9f17f75f510546
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/tmpdir.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  fix lock timeouts for good this time


  Commit: fed4f73a61384189f591294e8ca0dc9ad50ddb89
      
https://github.com/pytest-dev/pytest/commit/fed4f73a61384189f591294e8ca0dc9ad50ddb89
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/tmpdir.py

  Log Message:
  -----------
  ignore rmtree errors


  Commit: 85cc9b8f128ae3cc5fd14b0b301b69ef8ea87128
      
https://github.com/pytest-dev/pytest/commit/85cc9b8f128ae3cc5fd14b0b301b69ef8ea87128
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/compat.py
    A src/_pytest/pathlib.py
    M src/_pytest/paths.py
    M src/_pytest/pytester.py
    M src/_pytest/tmpdir.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  move all the things into _pytest.pathlib


  Commit: 00716177b4af3dd885ea1c1cb0ccfd71a3893b51
      
https://github.com/pytest-dev/pytest/commit/00716177b4af3dd885ea1c1cb0ccfd71a3893b51
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  fix missed Path import


  Commit: 2831cb9ab5eb5acdc2eb0e55becf507a93ea3ac0
      
https://github.com/pytest-dev/pytest/commit/2831cb9ab5eb5acdc2eb0e55becf507a93ea3ac0
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/pathlib.py
    R src/_pytest/paths.py
    M testing/test_paths.py

  Log Message:
  -----------
  unify paths.py and pathlib.py


  Commit: 30369140979973c486b0c2c55f8d346db8d9f252
      
https://github.com/pytest-dev/pytest/commit/30369140979973c486b0c2c55f8d346db8d9f252
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py
    M src/_pytest/pathlib.py
    M src/_pytest/tmpdir.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  sort out rmtree expectations


  Commit: ad6f63edda671733d4ad08a390da3bc6c1b758d1
      
https://github.com/pytest-dev/pytest/commit/ad6f63edda671733d4ad08a390da3bc6c1b758d1
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    A changelog/3985.feature.rst
    A changelog/3988.trivial.rst

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


  Commit: 4a436b54709b4d6a530cb2931e6f51a17c97945b
      
https://github.com/pytest-dev/pytest/commit/4a436b54709b4d6a530cb2931e6f51a17c97945b
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/pathlib.py
    M src/_pytest/tmpdir.py

  Log Message:
  -----------
  resolve in code review commments


  Commit: b82d6f7a0b628a5f1cb6d326ec25389f3c804abf
      
https://github.com/pytest-dev/pytest/commit/b82d6f7a0b628a5f1cb6d326ec25389f3c804abf
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M src/_pytest/tmpdir.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  pytester: use per test tmproot


  Commit: 94829c391bc868f40f727be7f86d16fd1c223756
      
https://github.com/pytest-dev/pytest/commit/94829c391bc868f40f727be7f86d16fd1c223756
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/pytester.py

  Log Message:
  -----------
  make tmpdir env cleanup idempotent


  Commit: ebd597b2fdba6faca1645c75cf3cf82849c76715
      
https://github.com/pytest-dev/pytest/commit/ebd597b2fdba6faca1645c75cf3cf82849c76715
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/tmpdir.py

  Log Message:
  -----------
  use the constant for lock timeouts


  Commit: 36c2a101cbf047df9303c57c94a1f2cae7282f52
      
https://github.com/pytest-dev/pytest/commit/36c2a101cbf047df9303c57c94a1f2cae7282f52
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/tmpdir.py

  Log Message:
  -----------
  add missing docstring


  Commit: 16e2737da3e25a076d61166f2c341db5ee27e977
      
https://github.com/pytest-dev/pytest/commit/16e2737da3e25a076d61166f2c341db5ee27e977
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M src/_pytest/deprecated.py
    M src/_pytest/tmpdir.py

  Log Message:
  -----------
  implement tmp_path_factory and deprecate pytest.ensuretemp as intended


  Commit: 584051aa90b3437bcbd509a6591393e7e4d1569d
      
https://github.com/pytest-dev/pytest/commit/584051aa90b3437bcbd509a6591393e7e4d1569d
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M doc/en/tmpdir.rst

  Log Message:
  -----------
  extend docs with basics about tmp_path and tmp_path_facotry


  Commit: b3940666a77c53fb07fa90bc68cf501ccf9b099a
      
https://github.com/pytest-dev/pytest/commit/b3940666a77c53fb07fa90bc68cf501ccf9b099a
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

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

  Log Message:
  -----------
  Merge pull request #4103 from blueyed/conftest

conftest: optimize _getconftestmodules


  Commit: 8ecdd4e9ff0e0053cf38212b9296bff6fca67468
      
https://github.com/pytest-dev/pytest/commit/8ecdd4e9ff0e0053cf38212b9296bff6fca67468
  Author: Anthony Sottile <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    A changelog/4102.bugfix.rst
    A changelog/4102.feature.rst
    M src/_pytest/recwarn.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  Merge pull request #4104 from asottile/deprecated_call_match

Implement pytest.deprecated_call with pytest.warns


  Commit: 4736b2bdfb99f66f998cdc387627d64fd38447d1
      
https://github.com/pytest-dev/pytest/commit/4736b2bdfb99f66f998cdc387627d64fd38447d1
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-11 (Thu, 11 Oct 2018)

  Changed paths:
    M .pre-commit-config.yaml
    A changelog/3988.deprecation.rst
    M doc/en/tmpdir.rst
    M src/_pytest/tmpdir.py

  Log Message:
  -----------
  address review comments


  Commit: e8348a1d12c55e03f3bbe5b1f86eca00b9bfe0bd
      
https://github.com/pytest-dev/pytest/commit/e8348a1d12c55e03f3bbe5b1f86eca00b9bfe0bd
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-12 (Fri, 12 Oct 2018)

  Changed paths:
    A changelog/2293.feature.rst
    A changelog/2293.trivial.rst
    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 testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_mark.py
    M testing/test_runner.py

  Log Message:
  -----------
  Merge pull request #4077 from nicoddemus/short-usage-errors

Improve internal error messages


  Commit: 933de16fe438bc9c4b441cb6a21fdf25c8b7b710
      
https://github.com/pytest-dev/pytest/commit/933de16fe438bc9c4b441cb6a21fdf25c8b7b710
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-12 (Fri, 12 Oct 2018)

  Changed paths:
    M .pre-commit-config.yaml
    A changelog/3985.feature.rst
    A changelog/3988.deprecation.rst
    A changelog/3988.trivial.rst
    M doc/en/tmpdir.rst
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/compat.py
    M src/_pytest/deprecated.py
    M src/_pytest/main.py
    A src/_pytest/pathlib.py
    R src/_pytest/paths.py
    M src/_pytest/pytester.py
    M src/_pytest/tmpdir.py
    M testing/python/fixture.py
    M testing/test_paths.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Merge pull request #3988 from RonnyPfannschmidt/tmpdir-port-pathlib

Tmpdir port pathlib


  Commit: 36dc6718435c423f768df8334e93d7f06d752784
      
https://github.com/pytest-dev/pytest/commit/36dc6718435c423f768df8334e93d7f06d752784
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-12 (Fri, 12 Oct 2018)

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

  Log Message:
  -----------
  New ExceptionInfo.getrepr 'chain' parameter to be able to suppress chained 
exceptions


  Commit: 8e11fe530487e560ac52f49ec50bda1f49718554
      
https://github.com/pytest-dev/pytest/commit/8e11fe530487e560ac52f49ec50bda1f49718554
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-12 (Fri, 12 Oct 2018)

  Changed paths:
    A changelog/3332.feature.rst
    M src/_pytest/config/__init__.py
    M testing/acceptance_test.py

  Log Message:
  -----------
  Improve tracebacks for ImportErrors in conftest.py files

Fix #3332


  Commit: 2cb35346792af2eb22c719be07dee409c9ef5ba8
      
https://github.com/pytest-dev/pytest/commit/2cb35346792af2eb22c719be07dee409c9ef5ba8
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-12 (Fri, 12 Oct 2018)

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

  Log Message:
  -----------
  Move filter_traceback to _pytest._code


  Commit: ef97121d4282c516e8e355a3c75cd42169848c19
      
https://github.com/pytest-dev/pytest/commit/ef97121d4282c516e8e355a3c75cd42169848c19
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-12 (Fri, 12 Oct 2018)

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

  Log Message:
  -----------
  Removed unused ConftestImportFailure.__str__ method


  Commit: 307fa7a42ae71a345b72ce904e0c66b2e639f011
      
https://github.com/pytest-dev/pytest/commit/307fa7a42ae71a345b72ce904e0c66b2e639f011
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-12 (Fri, 12 Oct 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  tox.ini: use testpaths, cleanup other pytest options


  Commit: 29d58495190e3e214aeedc74869b9e2ebab14cbb
      
https://github.com/pytest-dev/pytest/commit/29d58495190e3e214aeedc74869b9e2ebab14cbb
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-13 (Sat, 13 Oct 2018)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    A changelog/3713.doc.rst
    A changelog/4093.trivial.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/reportingdemo.rst
    M doc/en/reference.rst
    M src/_pytest/assertion/util.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/deprecated.py
    M src/_pytest/helpconfig.py
    M src/_pytest/python.py
    M src/_pytest/recwarn.py
    M src/_pytest/terminal.py
    M testing/acceptance_test.py
    M testing/logging/test_formatter.py
    M testing/test_junitxml.py
    M testing/test_pdb.py

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


  Commit: e2667106a249916644f3043bdad2176d07d3d920
      
https://github.com/pytest-dev/pytest/commit/e2667106a249916644f3043bdad2176d07d3d920
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-13 (Sat, 13 Oct 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Merge pull request #4126 from blueyed/testpaths

tox.ini: use testpaths, cleanup other pytest options


  Commit: ed42ada3739d0e5eec07345a956b102459562b5a
      
https://github.com/pytest-dev/pytest/commit/ed42ada3739d0e5eec07345a956b102459562b5a
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-13 (Sat, 13 Oct 2018)

  Changed paths:
    A changelog/3332.feature.rst
    M src/_pytest/_code/__init__.py
    M src/_pytest/_code/code.py
    M src/_pytest/config/__init__.py
    M src/_pytest/python.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Merge pull request #4124 from nicoddemus/traceback-import-error-3332

Improve tracebacks for ImportErrors in conftest


  Commit: 24c83d725ad75edecc678344130d91affbacf0f3
      
https://github.com/pytest-dev/pytest/commit/24c83d725ad75edecc678344130d91affbacf0f3
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-13 (Sat, 13 Oct 2018)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    A changelog/3713.doc.rst
    A changelog/4093.trivial.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/reportingdemo.rst
    M doc/en/reference.rst
    M src/_pytest/assertion/util.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/deprecated.py
    M src/_pytest/helpconfig.py
    M src/_pytest/python.py
    M src/_pytest/recwarn.py
    M src/_pytest/terminal.py
    M testing/acceptance_test.py
    M testing/logging/test_formatter.py
    M testing/test_junitxml.py
    M testing/test_pdb.py

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

Merge master into features (prepare for 3.9)


  Commit: 7268462b33954e756cfaaa13da81c3c84c2971ee
      
https://github.com/pytest-dev/pytest/commit/7268462b33954e756cfaaa13da81c3c84c2971ee
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-13 (Sat, 13 Oct 2018)

  Changed paths:
    A changelog/4108.bugfix.rst
    M src/_pytest/fixtures.py
    M src/_pytest/main.py
    M testing/acceptance_test.py
    M testing/test_conftest.py

  Log Message:
  -----------
  Resolve symlinks for args

This fixes running `pytest tests/test_foo.py::test_bar`, where `tests`
is a symlink to `project/app/tests`: previously
`project/app/conftest.py` would be ignored for fixtures then.


  Commit: 5322f422e3b09b3630488b0315368595d9804215
      
https://github.com/pytest-dev/pytest/commit/5322f422e3b09b3630488b0315368595d9804215
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    A changelog/4108.bugfix.rst
    M src/_pytest/fixtures.py
    M src/_pytest/main.py
    M testing/acceptance_test.py
    M testing/test_conftest.py

  Log Message:
  -----------
  Merge pull request #4108 from blueyed/realpath

Resolve symlinks for args


  Commit: 323c846ce647fe2421847a1e163c873983321fe3
      
https://github.com/pytest-dev/pytest/commit/323c846ce647fe2421847a1e163c873983321fe3
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  tox.ini: fix testpaths

Broken recently in 307fa7a4 (features branch).

[ci skip] (since it apparently is not tested/used there)


  Commit: 0be84cd68bce04cbf18cf2a91eea5669b4e39d3f
      
https://github.com/pytest-dev/pytest/commit/0be84cd68bce04cbf18cf2a91eea5669b4e39d3f
  Author: Daniel Hahler <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Merge pull request #4141 from blueyed/testpaths-fix

tox.ini: fix testpaths


  Commit: d7be039f1b6ed1f3aaf04283a50e4601c25d1115
      
https://github.com/pytest-dev/pytest/commit/d7be039f1b6ed1f3aaf04283a50e4601c25d1115
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M src/_pytest/outcomes.py

  Log Message:
  -----------
  Add returncode argument to pytest.exit

If the argument is not None, it'll raise a SystemExit exception to
cleanly exit pytest.


  Commit: ce55dcf64c31272ed8fff4c6f118af1956f3d0b3
      
https://github.com/pytest-dev/pytest/commit/ce55dcf64c31272ed8fff4c6f118af1956f3d0b3
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M testing/test_runner.py

  Log Message:
  -----------
  Add test for calling pytest.exit with statuscode

It checks that a SystemError was raised and the SystemError code
is the same as the returncode argument.


  Commit: a0666354dd77b85919eee232ddd20a122bbff2d7
      
https://github.com/pytest-dev/pytest/commit/a0666354dd77b85919eee232ddd20a122bbff2d7
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    A changelog/4098.feature.rst

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


  Commit: 1dfa303b1e4656e3e87171e0ffc7db3dc36627a0
      
https://github.com/pytest-dev/pytest/commit/1dfa303b1e4656e3e87171e0ffc7db3dc36627a0
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    A changelog/4135.bugfix.rst
    M src/_pytest/pathlib.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  fix #4135 - handle symlinks in tmp path cleanup


  Commit: 46d6a3fc27c41ad04b7658a6d454521635fbac9a
      
https://github.com/pytest-dev/pytest/commit/46d6a3fc27c41ad04b7658a6d454521635fbac9a
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M src/_pytest/outcomes.py

  Log Message:
  -----------
  Pass returncode to Error exception when creating instance


  Commit: 836c9f82f12b8d2558d2b3a70edb6b53a6d2d5ac
      
https://github.com/pytest-dev/pytest/commit/836c9f82f12b8d2558d2b3a70edb6b53a6d2d5ac
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M src/_pytest/main.py

  Log Message:
  -----------
  Set test session exitstatus value from Exit excetion return code


  Commit: 766d2daa06509839779cd2f33728535d2b428485
      
https://github.com/pytest-dev/pytest/commit/766d2daa06509839779cd2f33728535d2b428485
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M testing/test_runner.py

  Log Message:
  -----------
  Update returncode exit test to check exitstatus returrned from test session


  Commit: d4351ac5a287eb96521f09618bbbe1c73f4e6884
      
https://github.com/pytest-dev/pytest/commit/d4351ac5a287eb96521f09618bbbe1c73f4e6884
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M pyproject.toml
    M setup.cfg
    M setup.py

  Log Message:
  -----------
  modernize packaging for setuptools>30.3


  Commit: d4dfd526c11d610e3b2314a8d77ad990623b5db0
      
https://github.com/pytest-dev/pytest/commit/d4dfd526c11d610e3b2314a8d77ad990623b5db0
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M src/_pytest/outcomes.py

  Log Message:
  -----------
  Update pytest.exit docstring


  Commit: bbd1cbb0b3be15543b04674a8f358d2d1ff16a4a
      
https://github.com/pytest-dev/pytest/commit/bbd1cbb0b3be15543b04674a8f358d2d1ff16a4a
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M changelog/4098.feature.rst

  Log Message:
  -----------
  Update changelog to better reading


  Commit: ced62f30ba0d446518a138a4e20e9e9b7179c7cf
      
https://github.com/pytest-dev/pytest/commit/ced62f30ba0d446518a138a4e20e9e9b7179c7cf
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Attempt to create symlinks even on Windows, skipping when not possible


  Commit: d32f2c5c142b71b9fca55860c4d00652ab7a9aa5
      
https://github.com/pytest-dev/pytest/commit/d32f2c5c142b71b9fca55860c4d00652ab7a9aa5
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M src/_pytest/outcomes.py

  Log Message:
  -----------
  Change Exit.__init__ params order to keep backward compatibility


  Commit: 76fb9970c8cc561e1ed6ee21fc10f46c60fc8637
      
https://github.com/pytest-dev/pytest/commit/76fb9970c8cc561e1ed6ee21fc10f46c60fc8637
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M src/_pytest/main.py

  Log Message:
  -----------
  Check if returncode is not None before assigning test return code


  Commit: 40091ec2c733331b45ec7ee68538aab6afbcdec1
      
https://github.com/pytest-dev/pytest/commit/40091ec2c733331b45ec7ee68538aab6afbcdec1
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M src/_pytest/outcomes.py

  Log Message:
  -----------
  Update pytest.exit docstring


  Commit: 27d932e882152c828352ec4855ac2e16d23cc115
      
https://github.com/pytest-dev/pytest/commit/27d932e882152c828352ec4855ac2e16d23cc115
  Author: Jose Carlos Menezes <[email protected]>
  Date:   2018-10-14 (Sun, 14 Oct 2018)

  Changed paths:
    M src/_pytest/outcomes.py

  Log Message:
  -----------
  Fix order of parameters when raising Exit exception


  Commit: 5b0f88712be0673808232a3d1bfcc8d74c2093e0
      
https://github.com/pytest-dev/pytest/commit/5b0f88712be0673808232a3d1bfcc8d74c2093e0
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    A changelog/4135.bugfix.rst
    M src/_pytest/pathlib.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Merge pull request #4148 from 
RonnyPfannschmidt/pathlib-cleanup-symlink-is-fine

fix #4135 - handle symlinks in tmp path cleanup


  Commit: 7855284ef72bb7176aca7eba90e02f6825eb17f9
      
https://github.com/pytest-dev/pytest/commit/7855284ef72bb7176aca7eba90e02f6825eb17f9
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M setup.cfg
    M setup.py

  Log Message:
  -----------
  move most setuptools parameters over to setup.cfg


  Commit: d65c7658d507597e7fb42590290c8cd2feeef639
      
https://github.com/pytest-dev/pytest/commit/d65c7658d507597e7fb42590290c8cd2feeef639
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    A changelog/4149.feature.rst

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


  Commit: 141c51f0cbfe55a9781e3acf09a82848af513d45
      
https://github.com/pytest-dev/pytest/commit/141c51f0cbfe55a9781e3acf09a82848af513d45
  Author: Ankit Goel <[email protected]>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

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

  Log Message:
  -----------
  Merge pull request #4145 from labcodes/4098

Add returncode argument to pytest.exit


  Commit: 58b6e8616c35589407d1a7a5c497d5260bfa4dc4
      
https://github.com/pytest-dev/pytest/commit/58b6e8616c35589407d1a7a5c497d5260bfa4dc4
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    A changelog/4149.feature.rst
    M pyproject.toml
    M setup.cfg
    M setup.py

  Log Message:
  -----------
  Merge pull request #4149 from RonnyPfannschmidt/modern-build

modernize packaging for setuptools>30.3


  Commit: 9646a1cd7a0f9ec8655d2fb681f81f5e4bf557ca
      
https://github.com/pytest-dev/pytest/commit/9646a1cd7a0f9ec8655d2fb681f81f5e4bf557ca
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .travis.yml
    M AUTHORS
    M CONTRIBUTING.rst
    M appveyor.yml
    A changelog/4063.trivial.rst
    A changelog/4132.bugfix.rst
    A changelog/4151.doc.rst
    A changelog/4152.bugfix.rst
    M doc/en/deprecations.rst
    M doc/en/usage.rst
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/debugging.py
    M src/_pytest/fixtures.py
    M src/_pytest/main.py
    M src/_pytest/pytester.py
    M src/_pytest/runner.py
    M testing/acceptance_test.py
    M testing/python/fixture.py
    M testing/test_pdb.py
    M tox.ini

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


  Commit: e8c220b9bd31924aa94f0410d3a6f0c50e9ab18d
      
https://github.com/pytest-dev/pytest/commit/e8c220b9bd31924aa94f0410d3a6f0c50e9ab18d
  Author: Thomas Hisch <[email protected]>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

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

  Log Message:
  -----------
  Increase required verbosity level for debug output

To show the subclassed file in legacy test suits in the runtest output
you have to set the verbosity level to at least "-vv" now.

Closes #3211


  Commit: e4e4fd1e521c3a6235adedb179915c9c74bd08d4
      
https://github.com/pytest-dev/pytest/commit/e4e4fd1e521c3a6235adedb179915c9c74bd08d4
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .travis.yml
    M AUTHORS
    M CONTRIBUTING.rst
    M appveyor.yml
    A changelog/4063.trivial.rst
    A changelog/4132.bugfix.rst
    A changelog/4151.doc.rst
    A changelog/4152.bugfix.rst
    M doc/en/deprecations.rst
    M doc/en/usage.rst
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/debugging.py
    M src/_pytest/fixtures.py
    M src/_pytest/main.py
    M src/_pytest/pytester.py
    M src/_pytest/runner.py
    M testing/acceptance_test.py
    M testing/python/fixture.py
    M testing/test_pdb.py
    M tox.ini

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

Merge master into features (prepare for 3.9, pt2)


  Commit: 39a13d70647ae8c7a984209a3424b5b4052efa4f
      
https://github.com/pytest-dev/pytest/commit/39a13d70647ae8c7a984209a3424b5b4052efa4f
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M doc/en/tmpdir.rst

  Log Message:
  -----------
  Fix tmp_path example in docs


  Commit: 2868c314953e3a2cf2c753ebb87710d65c906cfa
      
https://github.com/pytest-dev/pytest/commit/2868c314953e3a2cf2c753ebb87710d65c906cfa
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2293.feature.rst
    R changelog/2293.trivial.rst
    R changelog/2535.bugfix.rst
    R changelog/3057.bugfix.rst
    R changelog/3332.feature.rst
    R changelog/3616.deprecation.rst
    R changelog/3713.doc.rst
    R changelog/3849.feature.rst
    R changelog/3946.bugfix.rst
    R changelog/3964.feature.rst
    R changelog/3985.feature.rst
    R changelog/3988.deprecation.rst
    R changelog/3988.trivial.rst
    R changelog/4013.feature.rst
    R changelog/4058.doc.rst
    R changelog/4063.trivial.rst
    R changelog/4064.doc.rst
    R changelog/4066.bugfix.rst
    R changelog/4073.feature.rst
    R changelog/4093.trivial.rst
    R changelog/4098.feature.rst
    R changelog/4102.bugfix.rst
    R changelog/4102.feature.rst
    R changelog/4108.bugfix.rst
    R changelog/4132.bugfix.rst
    R changelog/4135.bugfix.rst
    R changelog/4149.feature.rst
    R changelog/4151.doc.rst
    R changelog/4152.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.9.0.rst
    M doc/en/builtin.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/tmpdir.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Preparing release version 3.9.0


  Commit: 54b8ad4554509b191d3c5e7d53ecafe235652b87
      
https://github.com/pytest-dev/pytest/commit/54b8ad4554509b191d3c5e7d53ecafe235652b87
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-16 (Tue, 16 Oct 2018)

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

  Log Message:
  -----------
  Merge pull request #4159 from thisch/subclassedfile

Increase required verbosity level for debug output


  Commit: 456715a5c1b4e573cb87b9864c1ca83616944395
      
https://github.com/pytest-dev/pytest/commit/456715a5c1b4e573cb87b9864c1ca83616944395
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-16 (Tue, 16 Oct 2018)

  Changed paths:
    M setup.cfg

  Log Message:
  -----------
  fix url quotes in setup.cfg metadata


  Commit: 2c00f8aad1ae71b31d7dfa6f57953b2ebdd48930
      
https://github.com/pytest-dev/pytest/commit/2c00f8aad1ae71b31d7dfa6f57953b2ebdd48930
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-16 (Tue, 16 Oct 2018)

  Changed paths:
    M setup.cfg

  Log Message:
  -----------
  Merge pull request #4170 from RonnyPfannschmidt/fix-metadata-url-quotes

Fix metadata url quotes


  Commit: c4550bc922b6d44cb68b6577320888f9028096b4
      
https://github.com/pytest-dev/pytest/commit/c4550bc922b6d44cb68b6577320888f9028096b4
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-16 (Tue, 16 Oct 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2293.feature.rst
    R changelog/2293.trivial.rst
    R changelog/2535.bugfix.rst
    R changelog/3057.bugfix.rst
    R changelog/3332.feature.rst
    R changelog/3616.deprecation.rst
    R changelog/3713.doc.rst
    R changelog/3849.feature.rst
    R changelog/3946.bugfix.rst
    R changelog/3964.feature.rst
    R changelog/3985.feature.rst
    R changelog/3988.deprecation.rst
    R changelog/3988.trivial.rst
    R changelog/4013.feature.rst
    R changelog/4058.doc.rst
    R changelog/4063.trivial.rst
    R changelog/4064.doc.rst
    R changelog/4066.bugfix.rst
    R changelog/4073.feature.rst
    R changelog/4093.trivial.rst
    R changelog/4098.feature.rst
    R changelog/4102.bugfix.rst
    R changelog/4102.feature.rst
    R changelog/4108.bugfix.rst
    R changelog/4132.bugfix.rst
    R changelog/4135.bugfix.rst
    R changelog/4149.feature.rst
    R changelog/4151.doc.rst
    R changelog/4152.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.9.0.rst
    M doc/en/builtin.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/tmpdir.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge branch 'release-3.9.0' of github.com:nicoddemus/pytest into 
release-3.9.1


  Commit: 253c5786af681604f4e0c2b315f17fa5bcc950c2
      
https://github.com/pytest-dev/pytest/commit/253c5786af681604f4e0c2b315f17fa5bcc950c2
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-16 (Tue, 16 Oct 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/4159.feature.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.9.1.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst

  Log Message:
  -----------
  Preparing release version 3.9.1


  Commit: c5bbf8ac73a78fd15016296e808d13f2a2a983f1
      
https://github.com/pytest-dev/pytest/commit/c5bbf8ac73a78fd15016296e808d13f2a2a983f1
  Author: Ronny Pfannschmidt <[email protected]>
  Date:   2018-10-16 (Tue, 16 Oct 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  make note about the unpublished 3.9.0 release


  Commit: 7931b5b4892caf8283f814f3b73dd1597100c87e
      
https://github.com/pytest-dev/pytest/commit/7931b5b4892caf8283f814f3b73dd1597100c87e
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-16 (Tue, 16 Oct 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2293.feature.rst
    R changelog/2293.trivial.rst
    R changelog/2535.bugfix.rst
    R changelog/3057.bugfix.rst
    R changelog/3332.feature.rst
    R changelog/3616.deprecation.rst
    R changelog/3713.doc.rst
    R changelog/3849.feature.rst
    R changelog/3946.bugfix.rst
    R changelog/3964.feature.rst
    R changelog/3985.feature.rst
    R changelog/3988.deprecation.rst
    R changelog/3988.trivial.rst
    R changelog/4013.feature.rst
    R changelog/4058.doc.rst
    R changelog/4063.trivial.rst
    R changelog/4064.doc.rst
    R changelog/4066.bugfix.rst
    R changelog/4073.feature.rst
    R changelog/4093.trivial.rst
    R changelog/4098.feature.rst
    R changelog/4102.bugfix.rst
    R changelog/4102.feature.rst
    R changelog/4108.bugfix.rst
    R changelog/4132.bugfix.rst
    R changelog/4135.bugfix.rst
    R changelog/4149.feature.rst
    R changelog/4151.doc.rst
    R changelog/4152.bugfix.rst
    R changelog/4159.feature.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.9.0.rst
    A doc/en/announce/release-3.9.1.rst
    M doc/en/builtin.rst
    M doc/en/example/simple.rst
    M doc/en/tmpdir.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #4171 from RonnyPfannschmidt/release-3.9.1

Release 3.9.1


  Commit: ee0a306ee45caf502a4c37dc3e5b7c76b9b93f86
      
https://github.com/pytest-dev/pytest/commit/ee0a306ee45caf502a4c37dc3e5b7c76b9b93f86
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-16 (Tue, 16 Oct 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M AUTHORS
    M CHANGELOG.rst
    R changelog/2535.bugfix.rst
    R changelog/3057.bugfix.rst
    R changelog/3713.doc.rst
    R changelog/4058.doc.rst
    R changelog/4063.trivial.rst
    R changelog/4064.doc.rst
    R changelog/4066.bugfix.rst
    R changelog/4093.trivial.rst
    R changelog/4132.bugfix.rst
    R changelog/4151.doc.rst
    R changelog/4152.bugfix.rst
    M changelog/README.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.9.0.rst
    A doc/en/announce/release-3.9.1.rst
    M doc/en/builtin.rst
    M doc/en/deprecations.rst
    M doc/en/example/simple.rst
    M doc/en/historical-notes.rst
    M doc/en/reference.rst
    M doc/en/tmpdir.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pyproject.toml
    M setup.cfg
    M setup.py
    M src/_pytest/_code/__init__.py
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.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/logging.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/outcomes.py
    A src/_pytest/pathlib.py
    R src/_pytest/paths.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M src/_pytest/recwarn.py
    M src/_pytest/resultlog.py
    M src/_pytest/terminal.py
    M src/_pytest/tmpdir.py
    M src/_pytest/warning_types.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/deprecated_test.py
    M testing/logging/test_reporting.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_paths.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_warnings.py
    M tox.ini

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


  Commit: f7285b6ab2222e29d80ad1501a301c250db444e0
      
https://github.com/pytest-dev/pytest/commit/f7285b6ab2222e29d80ad1501a301c250db444e0
  Author: Bruno Oliveira <[email protected]>
  Date:   2018-10-16 (Tue, 16 Oct 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M AUTHORS
    M CHANGELOG.rst
    R changelog/2535.bugfix.rst
    R changelog/3057.bugfix.rst
    R changelog/3713.doc.rst
    R changelog/4058.doc.rst
    R changelog/4063.trivial.rst
    R changelog/4064.doc.rst
    R changelog/4066.bugfix.rst
    R changelog/4093.trivial.rst
    R changelog/4132.bugfix.rst
    R changelog/4151.doc.rst
    R changelog/4152.bugfix.rst
    M changelog/README.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.9.0.rst
    A doc/en/announce/release-3.9.1.rst
    M doc/en/builtin.rst
    M doc/en/deprecations.rst
    M doc/en/example/simple.rst
    M doc/en/historical-notes.rst
    M doc/en/reference.rst
    M doc/en/tmpdir.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pyproject.toml
    M setup.cfg
    M setup.py
    M src/_pytest/_code/__init__.py
    M src/_pytest/_code/code.py
    M src/_pytest/assertion/rewrite.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/logging.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/outcomes.py
    A src/_pytest/pathlib.py
    R src/_pytest/paths.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M src/_pytest/recwarn.py
    M src/_pytest/resultlog.py
    M src/_pytest/terminal.py
    M src/_pytest/tmpdir.py
    M src/_pytest/warning_types.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/deprecated_test.py
    M testing/logging/test_reporting.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_paths.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_warnings.py
    M tox.ini

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

Merge features into master


Compare: 
https://github.com/pytest-dev/pytest/compare/f858177495dc...f7285b6ab222
      **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.
_______________________________________________
pytest-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pytest-commit

Reply via email to