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

[Bruno Oliveira]

  Branch: refs/tags/3.5.0
  Home:   https://github.com/pytest-dev/pytest
  Commit: f3c87a77a74089d4f285576ee5e7e7d1b8a26717
      https://github.com/pytest-dev/pytest/commit/f3c87a77a74089d4f285576ee5e7e7d1b8a26717
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-21 (Wed, 21 Mar 2018)

  Changed paths:
    M AUTHORS
    M changelog/3245.trivial.rst
    R doc/en/example/assertion/global_testmodule_config/test_hello.py
    A doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    R doc/en/example/costlysetup/sub1/__init__.py
    R doc/en/example/costlysetup/sub1/test_quick.py
    R doc/en/example/costlysetup/sub2/__init__.py
    R doc/en/example/costlysetup/sub2/test_two.py
    A doc/en/example/costlysetup/sub_a/__init__.py
    A doc/en/example/costlysetup/sub_a/test_quick.py
    A doc/en/example/costlysetup/sub_b/__init__.py
    A doc/en/example/costlysetup/sub_b/test_two.py
    M tox.ini

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


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

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Fix example in usage.rst


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

  Changed paths:
    M CHANGELOG.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Preparing release version 3.5.0


Compare: https://github.com/pytest-dev/pytest/compare/f3c87a77a740^...beacecf29ba0