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

[Bruno Oliveira]

  Branch: refs/tags/3.8.0
  Home:   https://github.com/pytest-dev/pytest
  Commit: 69b34f765871a0df23e08fd5f2caa45ff1d8732d
      https://github.com/pytest-dev/pytest/commit/69b34f765871a0df23e08fd5f2caa45ff1d8732d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-09-05 (Wed, 05 Sep 2018)

  Changed paths:
    M .coveragerc
    M .gitignore
    M AUTHORS
    M appveyor.yml
    A changelog/3566.doc.rst
    A changelog/3911.bugfix.rst
    A changelog/3918.bugfix.rst
    M doc/en/conf.py
    M doc/en/talks.rst
    M doc/en/usage.rst
    M setup.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/config/__init__.py
    M src/_pytest/main.py
    M src/_pytest/outcomes.py
    M src/_pytest/terminal.py
    M testing/test_assertrewrite.py

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


  Commit: 1f2062661826efb5ac4322c17e24db202bf0a147
      https://github.com/pytest-dev/pytest/commit/1f2062661826efb5ac4322c17e24db202bf0a147
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-09-05 (Wed, 05 Sep 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2452.feature.rst
    R changelog/2452.removal.rst
    R changelog/2908.feature.rst
    R changelog/3566.doc.rst
    R changelog/3784.feature.rst
    R changelog/3829.feature.rst
    R changelog/3837.feature.rst
    R changelog/3853.trivial.rst
    R changelog/3907.doc.rst
    R changelog/3911.bugfix.rst
    R changelog/3913.bugfix.rst
    R changelog/3918.bugfix.rst
    R changelog/3936.removal.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.8.0.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Preparing release version 3.8.0


Compare: https://github.com/pytest-dev/pytest/compare/69b34f765871^...1f2062661826
      **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.