[Pytest-commit] [pytest-dev/pytest] 840612: Tiny rst syntax fix

Tue Sep 5 19:25:42 EDT 2017

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 84061233ef859fc33e53c42fd73b3e72dc435a16
      https://github.com/pytest-dev/pytest/commit/84061233ef859fc33e53c42fd73b3e72dc435a16
  Author: Alex Gaynor <alex.gaynor at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Tiny rst syntax fix

  Commit: 02da1563512db2c48d4037ba3f937c88565bc5a4
      https://github.com/pytest-dev/pytest/commit/02da1563512db2c48d4037ba3f937c88565bc5a4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Merge pull request #2645 from alex/patch-1

Tiny rst syntax fix

  Commit: 1deac2e210040acf0999d76615276a96d7af5a38
      https://github.com/pytest-dev/pytest/commit/1deac2e210040acf0999d76615276a96d7af5a38
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M _pytest/pytester.py
    M _pytest/runner.py
    A changelog/2644.bugfix
    M testing/acceptance_test.py

  Log Message:
  -----------
  Properly escape test names when setting PYTEST_CURRENT_TEST environment variable

Fix #2644

  Commit: 7703dc921ccdafb65cd32bc4b9ec4d266e2538da
      https://github.com/pytest-dev/pytest/commit/7703dc921ccdafb65cd32bc4b9ec4d266e2538da
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M _pytest/runner.py

  Log Message:
  -----------
  Only skip null bytes before setting the environment variable

As discussed, node ids have already been "ascii" sanitized by the
parametrization process

  Commit: 8969bd43c953674799e25979d5e83caab882654d
      https://github.com/pytest-dev/pytest/commit/8969bd43c953674799e25979d5e83caab882654d
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M _pytest/pytester.py
    M _pytest/runner.py
    A changelog/2644.bugfix
    M testing/acceptance_test.py

  Log Message:
  -----------
  Merge pull request #2646 from nicoddemus/issue-2644

Properly escape test names when setting PYTEST_CURRENT_TEST environment variable

  Commit: ad52f714a9b6c9b2d27e372b98078cd9d94e469d
      https://github.com/pytest-dev/pytest/commit/ad52f714a9b6c9b2d27e372b98078cd9d94e469d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-03 (Thu, 03 Aug 2017)

  Changed paths:
    M _pytest/terminal.py
    A changelog/2579.bugfix
    M testing/test_terminal.py

  Log Message:
  -----------
  Fix small terminal glitch when collecting a single test item

Fix #2579

  Commit: 15cdf137d57e9b83176cad20f9b5daf2dd9facd0
      https://github.com/pytest-dev/pytest/commit/15cdf137d57e9b83176cad20f9b5daf2dd9facd0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    A changelog/2626.doc
    M doc/en/mark.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Document which pytest features work with `unittest`

Fix #2626

  Commit: 12e60956de25f05b38bfa2e92a0b5c37713f2b19
      https://github.com/pytest-dev/pytest/commit/12e60956de25f05b38bfa2e92a0b5c37713f2b19
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    M _pytest/terminal.py
    A changelog/2579.bugfix
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #2655 from nicoddemus/terminal-collecting-glitch

Fix small terminal glitch when collecting a single test item

  Commit: 37353a854e2545a9b1d8894660a6cf3a12294eba
      https://github.com/pytest-dev/pytest/commit/37353a854e2545a9b1d8894660a6cf3a12294eba
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    M doc/en/unittest.rst

  Log Message:
  -----------
  Implement suggestions by Raphael

  Commit: d5f4496bdf8672aa3ebefbdab53a2b15efee9828
      https://github.com/pytest-dev/pytest/commit/d5f4496bdf8672aa3ebefbdab53a2b15efee9828
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-05 (Sat, 05 Aug 2017)

  Changed paths:
    A changelog/2626.doc
    M doc/en/mark.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Merge pull request #2656 from nicoddemus/unittest-features

Document which pytest features work with `unittest`

  Commit: a0101f024e65ca68140f9098469fe686ce1f445f
      https://github.com/pytest-dev/pytest/commit/a0101f024e65ca68140f9098469fe686ce1f445f
  Author: Srinivas Reddy Thatiparthy <thatiparthysreenivas at gmail.com>
  Date:   2017-08-05 (Sat, 05 Aug 2017)

  Changed paths:
    M AUTHORS
    M _pytest/config.py
    A changelog/2591.bugfix
    M testing/test_config.py

  Log Message:
  -----------
  remove os.sep as it behaves differently linux and windows.

* on linux it is '/'

* on windows it is '\'

  Commit: 76c55b31c658b0241d993ac504605236bd223c89
      https://github.com/pytest-dev/pytest/commit/76c55b31c658b0241d993ac504605236bd223c89
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-06 (Sun, 06 Aug 2017)

  Changed paths:
    M AUTHORS
    M _pytest/config.py
    A changelog/2591.bugfix
    M testing/test_config.py

  Log Message:
  -----------
  Merge pull request #2630 from srinivasreddy/2591

Fixed#2591: Replaced os.sep with '/' as it behaves differently on linux and windows.

  Commit: cc0f2473eb054c7ad3ac687161f634305a458016
      https://github.com/pytest-dev/pytest/commit/cc0f2473eb054c7ad3ac687161f634305a458016
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/2666.bugfix
    M testing/test_capture.py

  Log Message:
  -----------
  Fix windows console workaround error with non-standard io-streams

Fix #2666

  Commit: 523bfa6151081d0aa2385d88d85015731fb0c3cc
      https://github.com/pytest-dev/pytest/commit/523bfa6151081d0aa2385d88d85015731fb0c3cc
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/2666.bugfix
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2667 from nicoddemus/py36-windows-workaround-error

Fix windows console workaround error with non-standard io-streams

  Commit: 8b322afcdb094c2c634a4f01c07facfab644b847
      https://github.com/pytest-dev/pytest/commit/8b322afcdb094c2c634a4f01c07facfab644b847
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Make generated doc in simple.rst more reliable

Sometimes `test_funcfast` would show up in the `setup` step in
the slowest test durations summary.

  Commit: 45d2962e97eae33ea71adee74911952c730bc039
      https://github.com/pytest-dev/pytest/commit/45d2962e97eae33ea71adee74911952c730bc039
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-08 (Tue, 08 Aug 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2579.bugfix
    R changelog/2591.bugfix
    R changelog/2626.doc
    R changelog/2644.bugfix
    R changelog/2666.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.1.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Preparing release version 3.2.1

  Commit: c847b83d562e48db4b5f90c4c1bd697dfbf912c1
      https://github.com/pytest-dev/pytest/commit/c847b83d562e48db4b5f90c4c1bd697dfbf912c1
  Author: Felipe Dau <dau at riseup.net>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Use `pytest_collection_modifyitems()` in the run/skip option example

  Commit: acd3c4fbc4eae188d9f3c570c878baaa07f2b9fb
      https://github.com/pytest-dev/pytest/commit/acd3c4fbc4eae188d9f3c570c878baaa07f2b9fb
  Author: Felipe Dau <dau at riseup.net>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    A changelog/2653.doc

  Log Message:
  -----------
  Update changelog for #2653

  Commit: e6020781f6c5c4a68c6a533574cdf1652051cc0b
      https://github.com/pytest-dev/pytest/commit/e6020781f6c5c4a68c6a533574cdf1652051cc0b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    A changelog/2653.doc
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Merge pull request #2653 from felipedau/slow-sharing-note

Add note on sharing the `slow` marker in the basic examples

  Commit: fd84c886ee583c6e1ce7826f6662bcf7dc722698
      https://github.com/pytest-dev/pytest/commit/fd84c886ee583c6e1ce7826f6662bcf7dc722698
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2579.bugfix
    R changelog/2591.bugfix
    R changelog/2626.doc
    R changelog/2644.bugfix
    R changelog/2666.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.1.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Merge pull request #2671 from nicoddemus/release-3.2.1

Release 3.2.1

  Commit: 021fba4e847f61cb4b9ffd9375573cab11e4d1cf
      https://github.com/pytest-dev/pytest/commit/021fba4e847f61cb4b9ffd9375573cab11e4d1cf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-10 (Thu, 10 Aug 2017)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Update number of plugins on README and poiint to plugincompat link

  Commit: dc9154e8ff4e7db03892026b527dee2db6b29070
      https://github.com/pytest-dev/pytest/commit/dc9154e8ff4e7db03892026b527dee2db6b29070
  Author: Jesús Espino <jespinog at gmail.com>
  Date:   2017-08-12 (Sat, 12 Aug 2017)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  Add default values documentation for python_files, python_classes and python_functions

  Commit: 39331856edb7bf54b8fbac0757501a85dba37993
      https://github.com/pytest-dev/pytest/commit/39331856edb7bf54b8fbac0757501a85dba37993
  Author: Andreas Pelme <andreas at pelme.se>
  Date:   2017-08-13 (Sun, 13 Aug 2017)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2681.bugfix

  Log Message:
  -----------
  Use the correct stacklevel for getfuncargvalue() deprecation warning.

Fixed #2681.

  Commit: 5c0c1977e36ea6b27853a609af9c69b928e2d364
      https://github.com/pytest-dev/pytest/commit/5c0c1977e36ea6b27853a609af9c69b928e2d364
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-13 (Sun, 13 Aug 2017)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2681.bugfix

  Log Message:
  -----------
  Merge pull request #2682 from pelme/getfuncargvalue-fix

Use the correct stacklevel for getfuncargvalue() deprecation warning.

  Commit: 362b1b3c4fcada7d65cc03f11cd9e2de1b9138a6
      https://github.com/pytest-dev/pytest/commit/362b1b3c4fcada7d65cc03f11cd9e2de1b9138a6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-14 (Mon, 14 Aug 2017)

  Changed paths:
    M .travis.yml
    M appveyor.yml

  Log Message:
  -----------
  Use tox release candidates in CI

Fix #2683

  Commit: 7b5d26c1a8dce2eff808dc03beb4034ae63f303e
      https://github.com/pytest-dev/pytest/commit/7b5d26c1a8dce2eff808dc03beb4034ae63f303e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-14 (Mon, 14 Aug 2017)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    M scripts/call-tox.bat
    M tox.ini

  Log Message:
  -----------
  Use py36 as preferred Python 3 interpreter for CI testing

  Commit: e9bfccdf2d596f25cc2f85529d08eee4febd51da
      https://github.com/pytest-dev/pytest/commit/e9bfccdf2d596f25cc2f85529d08eee4febd51da
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-14 (Mon, 14 Aug 2017)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  Merge pull request #2678 from jespino/fix/2676

Add default values documentation for python_files, python_classes and python_functions

  Commit: 9b2753b302d3a70fb2b58497beb3a13ff1ab9858
      https://github.com/pytest-dev/pytest/commit/9b2753b302d3a70fb2b58497beb3a13ff1ab9858
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    M scripts/call-tox.bat
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2687 from nicoddemus/use-py36-ci

Use 3.6 as preferred Python 3 interpreter for CI

  Commit: 2a99d82c3b0002ee6184251759bddb7bfd58fac9
      https://github.com/pytest-dev/pytest/commit/2a99d82c3b0002ee6184251759bddb7bfd58fac9
  Author: Antonio Hidalgo <antoniohidalgo.inves at gmail.com>
  Date:   2017-08-16 (Wed, 16 Aug 2017)

  Changed paths:
    A changelog/2691.trivial
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Fixed error in 'Good Practices' code snippet

  Commit: bfc9f61482733042bb390de07c1caea6291a2b29
      https://github.com/pytest-dev/pytest/commit/bfc9f61482733042bb390de07c1caea6291a2b29
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M doc/en/index.rst

  Log Message:
  -----------
  Update the number of plugins in index.rst

  Commit: 806d47b4d4715fcfaa4e26a4b06aae66e27ded17
      https://github.com/pytest-dev/pytest/commit/806d47b4d4715fcfaa4e26a4b06aae66e27ded17
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-16 (Wed, 16 Aug 2017)

  Changed paths:
    A changelog/2691.trivial
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Merge pull request #2691 from anhiga/trivial_error

Fixed error in 'Good Practices' code snippet

  Commit: f18780ed8af9692264d239238617bfaafd5cdf0e
      https://github.com/pytest-dev/pytest/commit/f18780ed8af9692264d239238617bfaafd5cdf0e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-16 (Wed, 16 Aug 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Update docs: ``match`` keyword was introduced in 3.1

Also update the text to recommend using the context-manager
over the callable/string forms.

  Commit: 539523cfee4c49a765569abcf68134b1255eedb5
      https://github.com/pytest-dev/pytest/commit/539523cfee4c49a765569abcf68134b1255eedb5
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-17 (Thu, 17 Aug 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Merge pull request #2697 from nicoddemus/match-kw-version

Update docs: ``match`` keyword was introduced in 3.1

  Commit: 657976e98acc80a0eb44c519f25d89964dba8e10
      https://github.com/pytest-dev/pytest/commit/657976e98acc80a0eb44c519f25d89964dba8e10
  Author: Joan Massich <sik at visor.udg.edu>
  Date:   2017-08-22 (Tue, 22 Aug 2017)

  Changed paths:
    M doc/en/assert.rst

  Log Message:
  -----------
  update raises documentation regarding regex match

  Commit: 12b1bff6c5cf167662870ea212fa6d8061d48e94
      https://github.com/pytest-dev/pytest/commit/12b1bff6c5cf167662870ea212fa6d8061d48e94
  Author: Kirill Pinchuk <cybergrind at gmail.com>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M _pytest/compat.py
    A changelog/2707.bugfix
    M testing/test_compat.py

  Log Message:
  -----------
  `compat.safe_getattr` now catches OutcomeExceptions too

  Commit: 1c891d7d974f2e0b254a950afb10a6f4edd78233
      https://github.com/pytest-dev/pytest/commit/1c891d7d974f2e0b254a950afb10a6f4edd78233
  Author: Joe Talbott <joe.talbott at canonical.com>
  Date:   2017-08-25 (Fri, 25 Aug 2017)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Fix typo in goodpractices.rst

  Commit: 67161ee9f8d1188401ff84c7522785326155d4af
      https://github.com/pytest-dev/pytest/commit/67161ee9f8d1188401ff84c7522785326155d4af
  Author: Joe Talbott <joe.talbott at canonical.com>
  Date:   2017-08-25 (Fri, 25 Aug 2017)

  Changed paths:
    A changelog/2721.trivial

  Log Message:
  -----------
  Add changelog item for PR #2721.

  Commit: 0824076e119cc06fbfb41155938004c19b583354
      https://github.com/pytest-dev/pytest/commit/0824076e119cc06fbfb41155938004c19b583354
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M doc/en/assert.rst

  Log Message:
  -----------
  Merge pull request #2710 from massich/raises_match_doc

[DOC] update raises documentation regarding regex match

  Commit: 709b8b65a4301a6debe336cae6e3eef233058f08
      https://github.com/pytest-dev/pytest/commit/709b8b65a4301a6debe336cae6e3eef233058f08
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    A changelog/2721.trivial
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Merge pull request #2721 from josepht/patch-1

Fix typo in goodpractices.rst

  Commit: 59cdef92beebc9054a1c366afc27e079116af1b6
      https://github.com/pytest-dev/pytest/commit/59cdef92beebc9054a1c366afc27e079116af1b6
  Author: Fernando Macedo <fgmacedo at gmail.com>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M _pytest/_code/code.py
    A changelog/2731.bugfix
    M testing/code/test_code.py

  Log Message:
  -----------
  fixes #2731 ReprFuncArgs with mixed unicode and utf-8 args

  Commit: f4e811afc02a5c536ee6b78990304a1fc29b1e63
      https://github.com/pytest-dev/pytest/commit/f4e811afc02a5c536ee6b78990304a1fc29b1e63
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    A changelog/2721.trivial
    M doc/en/assert.rst
    M doc/en/goodpractices.rst

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

  Commit: f9157b1b6b441098b40e02eaa20b3232c4683f3d
      https://github.com/pytest-dev/pytest/commit/f9157b1b6b441098b40e02eaa20b3232c4683f3d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M changelog/2707.bugfix

  Log Message:
  -----------
  Improve CHANGELOG entry to be more user-friendly

  Commit: b770a32dc87441ea98234fc9a62372d00344207d
      https://github.com/pytest-dev/pytest/commit/b770a32dc87441ea98234fc9a62372d00344207d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-31 (Thu, 31 Aug 2017)

  Changed paths:
    M _pytest/compat.py
    A changelog/2707.bugfix
    M testing/test_compat.py

  Log Message:
  -----------
  Merge pull request #2707 from cybergrind/fix_baseexception

Catch BaseException in safe_getattr

  Commit: 5e00549eccaeda4de55ecf96aa833cc3a28dfa5e
      https://github.com/pytest-dev/pytest/commit/5e00549eccaeda4de55ecf96aa833cc3a28dfa5e
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-31 (Thu, 31 Aug 2017)

  Changed paths:
    M _pytest/_code/code.py
    A changelog/2731.bugfix
    M testing/code/test_code.py

  Log Message:
  -----------
  Merge pull request #2735 from fgmacedo/fgm-fix-reprfuncargs-toterminal

2731.bug Fix ReprFuncArgs with mixed unicode and utf-8 args.

  Commit: 3288c9a110558b703a89896a5e3f08ff58dfa732
      https://github.com/pytest-dev/pytest/commit/3288c9a110558b703a89896a5e3f08ff58dfa732
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-31 (Thu, 31 Aug 2017)

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

  Log Message:
  -----------
  Improve user guidance regarding ``--resultlog`` deprecation

Fix #2739

  Commit: 181bd60bf99021e3d8936ade5f92d408c53d3419
      https://github.com/pytest-dev/pytest/commit/181bd60bf99021e3d8936ade5f92d408c53d3419
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

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

  Log Message:
  -----------
  Merge pull request #2742 from nicoddemus/resultlog-deprecation

Improve user guidance regarding ``--resultlog`` deprecation

  Commit: f825b4979b52f9ae4b4a38cc8f77af7ab5905920
      https://github.com/pytest-dev/pytest/commit/f825b4979b52f9ae4b4a38cc8f77af7ab5905920
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M README.rst
    M _pytest/_code/code.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/python_api.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M appveyor.yml
    A changelog/2653.doc
    A changelog/2681.bugfix
    A changelog/2691.trivial
    A changelog/2707.bugfix
    A changelog/2721.trivial
    A changelog/2731.bugfix
    A changelog/2739.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.1.rst
    M doc/en/assert.rst
    M doc/en/customize.rst
    M doc/en/example/simple.rst
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/mark.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M scripts/call-tox.bat
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/deprecated_test.py
    M testing/test_capture.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_terminal.py
    M tox.ini

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

Compare: https://github.com/pytest-dev/pytest/compare/d1f71b0575af...f825b4979b52