[Pytest-commit] [pytest-dev/pytest] e02597: Merge remote-tracking branch 'upstream/master' int...

[Bruno Oliveira]

  Branch: refs/tags/4.0.0
  Home:   https://github.com/pytest-dev/pytest
  Commit: e025974cbd4102e613a3833e35b8feefe4800d0d
      https://github.com/pytest-dev/pytest/commit/e025974cbd4102e613a3833e35b8feefe4800d0d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-13 (Tue, 13 Nov 2018)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    A changelog/3554.bugfix.rst
    M src/_pytest/runner.py
    M testing/test_runner.py

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


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/3554.bugfix.rst
    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

  Log Message:
  -----------
  Preparing release version 4.0.0


Compare: https://github.com/pytest-dev/pytest/compare/e025974cbd41^...c2d6b3524cc0
      **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.