From nicoddemus at gmail.com  Tue Sep  5 17:51:10 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 05 Sep 2017 14:51:10 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 8d1903: Avoid creating
 arbitrary filenames for tmpdir on T...
Message-ID: <59af1c4e8b7c3_29533fe3d5951c3c17275f@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 8d1903fed386e5d2060c8a61339f0dd9d4df3b8f
      https://github.com/pytest-dev/pytest/commit/8d1903fed386e5d2060c8a61339f0dd9d4df3b8f
  Author: Tarcisio Fischer <tarcisio at esss.com.br>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M _pytest/pytester.py
    M testing/test_collection.py

  Log Message:
  -----------
  Avoid creating arbitrary filenames for tmpdir on Testdir's constructor

Fixes #2751


  Commit: de6b41e318a69d723c2e43aa6253991cd9921d5b
      https://github.com/pytest-dev/pytest/commit/de6b41e318a69d723c2e43aa6253991cd9921d5b
  Author: Tarcisio Fischer <tarcisio at esss.com.br>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M AUTHORS
    A changelog/2751.bugfix

  Log Message:
  -----------
  Update changelog and AUTHORS files, following the CONTRIBUTING guidelines


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

  Changed paths:
    M AUTHORS
    M _pytest/pytester.py
    A changelog/2751.bugfix
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #2752 from tarcisiofischer/issue-2751-fix-flaky-testdir

Issue 2751 fix flaky testdir


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

From nicoddemus at gmail.com  Tue Sep  5 19:25:42 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 05 Sep 2017 16:25:42 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 840612: Tiny rst syntax fix
Message-ID: <59af3276e9369_1d513fb7758d1c30604c3@hookshot-fe2-cp1-prd.iad.github.net.mail>

  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

From nicoddemus at gmail.com  Tue Sep  5 20:14:28 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 05 Sep 2017 17:14:28 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 78a027: simplyfy ascii escaping
 by using backslashreplace ...
Message-ID: <59af3de4eecb0_227463fedd12bbc3c1238bc@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 78a027e128d8846a2babdffee5c38c374e5c93d9
      https://github.com/pytest-dev/pytest/commit/78a027e128d8846a2babdffee5c38c374e5c93d9
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M _pytest/compat.py
    A changelog/2734.trivial

  Log Message:
  -----------
  simplyfy ascii escaping by using backslashreplace error handling


  Commit: 13eac944ae860a3cc4dcde49a5a7dca814941670
      https://github.com/pytest-dev/pytest/commit/13eac944ae860a3cc4dcde49a5a7dca814941670
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M _pytest/compat.py

  Log Message:
  -----------
  restore ascii escaping for python 3.3/3.4


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

  Changed paths:
    M changelog/2734.trivial

  Log Message:
  -----------
  Improve wording in changelog entry


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

  Changed paths:
    M _pytest/compat.py
    A changelog/2734.trivial

  Log Message:
  -----------
  Merge pull request #2734 from RonnyPfannschmidt/simplify-string-safening

simplyfy ascii escaping by using backslashreplace error handling


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

From nicoddemus at gmail.com  Wed Sep  6 14:03:21 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 06 Sep 2017 11:03:21 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 11ec6a: Add test environment
 using pluggy from master bran...
Message-ID: <59b038696fe7e_2de3f8c322b5c344163b@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 11ec6aeafb6f07047c043055f4beb33d83f1d4ba
      https://github.com/pytest-dev/pytest/commit/11ec6aeafb6f07047c043055f4beb33d83f1d4ba
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    M setup.py
    M tox.ini

  Log Message:
  -----------
  Add test environment using pluggy from master branch

Fix #2737


  Commit: 3dc0da9339e4952cb276b32f451fa8cdc23d38be
      https://github.com/pytest-dev/pytest/commit/3dc0da9339e4952cb276b32f451fa8cdc23d38be
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M _pytest/config.py
    M testing/python/collect.py
    M testing/test_collection.py
    M testing/test_pluginmanager.py
    M testing/test_runner.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Remove __multicall__ warning and usages in testing

pluggy>=0.5 already warns about those


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

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Change all pytest report options to the more concise '-ra' in tox.ini


  Commit: 9bbf14d0f6d68a175a440daffad97c63c51fde37
      https://github.com/pytest-dev/pytest/commit/9bbf14d0f6d68a175a440daffad97c63c51fde37
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Create explicit 'pluggymaster' env definitions

For some reason, the previous approach brakes 'coveralls' because
pip still tries to install the 'pluggy' master requirement
(git+https://...)


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

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Refactor tox.ini so pluggymaster envs share definitions


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

  Changed paths:
    M testing/test_collection.py

  Log Message:
  -----------
  Fix call to outcome.force_result

Even though the test is not running at the moment (xfail), at least
we avoid future confusion


  Commit: d01f08e96fafc93cf54fd05ddff434a6da73bb6a
      https://github.com/pytest-dev/pytest/commit/d01f08e96fafc93cf54fd05ddff434a6da73bb6a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-06 (Wed, 06 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/2734.trivial
    A changelog/2739.trivial
    A changelog/2751.bugfix
    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_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'features' into pluggy-master


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

  Changed paths:
    M .travis.yml
    M _pytest/config.py
    M appveyor.yml
    M setup.py
    M testing/python/collect.py
    M testing/test_collection.py
    M testing/test_pluginmanager.py
    M testing/test_runner.py
    M testing/test_unittest.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2744 from nicoddemus/pluggy-master

Add test environment using pluggy from master branch


Compare: https://github.com/pytest-dev/pytest/compare/e1f2254fc2df...b55a4f805f52

From nicoddemus at gmail.com  Wed Sep  6 15:33:03 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 06 Sep 2017 12:33:03 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 3f8ff7: [DOC] Add examples for
 mark.with_args
Message-ID: <59b04d6f92b57_10853fcb3b18bc44652d@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 3f8ff7f090314a25c3b24dfecc4d38f74393b137
      https://github.com/pytest-dev/pytest/commit/3f8ff7f090314a25c3b24dfecc4d38f74393b137
  Author: Xuan Luong <luonghoaixuan at gmail.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M AUTHORS
    A changelog/2604.doc
    M doc/en/example/markers.rst

  Log Message:
  -----------
  [DOC] Add examples for mark.with_args


  Commit: 549f5c1a47f510abab4d8d28cac221c685175679
      https://github.com/pytest-dev/pytest/commit/549f5c1a47f510abab4d8d28cac221c685175679
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M AUTHORS
    A changelog/2604.doc
    M doc/en/example/markers.rst

  Log Message:
  -----------
  Merge pull request #2736 from xuanluong/issue-2604-documents-mark.with_args

[DOC] Add examples for mark.with_args


Compare: https://github.com/pytest-dev/pytest/compare/ad36407747da...549f5c1a47f5

From nicoddemus at gmail.com  Thu Sep  7 12:53:57 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 07 Sep 2017 09:53:57 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] c52f87: Preparing release
 version 3.2.2
Message-ID: <59b179a5c42a_ac03fd064463c2c1059ad@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/tags/3.2.2
  Home:   https://github.com/pytest-dev/pytest
  Commit: c52f87ede304f42cb9e8c79e461ccde8a55ea5f8
      https://github.com/pytest-dev/pytest/commit/c52f87ede304f42cb9e8c79e461ccde8a55ea5f8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2604.doc
    R changelog/2653.doc
    R changelog/2681.bugfix
    R changelog/2691.trivial
    R changelog/2699.bugfix
    R changelog/2707.bugfix
    R changelog/2721.trivial
    R changelog/2731.bugfix
    R changelog/2739.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.2.2



From nicoddemus at gmail.com  Thu Sep  7 12:54:32 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 07 Sep 2017 09:54:32 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] c52f87: Preparing release
 version 3.2.2
Message-ID: <59b179c84f268_15b33fbeda233c2c11624c@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: c52f87ede304f42cb9e8c79e461ccde8a55ea5f8
      https://github.com/pytest-dev/pytest/commit/c52f87ede304f42cb9e8c79e461ccde8a55ea5f8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2604.doc
    R changelog/2653.doc
    R changelog/2681.bugfix
    R changelog/2691.trivial
    R changelog/2699.bugfix
    R changelog/2707.bugfix
    R changelog/2721.trivial
    R changelog/2731.bugfix
    R changelog/2739.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.2.2


  Commit: 09349c344ed9de4b245d5a60a28ed0e039a4c944
      https://github.com/pytest-dev/pytest/commit/09349c344ed9de4b245d5a60a28ed0e039a4c944
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2604.doc
    R changelog/2653.doc
    R changelog/2681.bugfix
    R changelog/2691.trivial
    R changelog/2699.bugfix
    R changelog/2707.bugfix
    R changelog/2721.trivial
    R changelog/2731.bugfix
    R changelog/2739.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Merge pull request #2757 from nicoddemus/release-3.2.2

Preparing release version 3.2.2


Compare: https://github.com/pytest-dev/pytest/compare/549f5c1a47f5...09349c344ed9

From nicoddemus at gmail.com  Thu Sep  7 13:24:58 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 07 Sep 2017 10:24:58 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a993ad: Allow tests declared as
 @staticmethod to use fixtu...
Message-ID: <59b180eabd89a_1c3603f9ad0f0bc34673ad@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: a993add78331dbebdc6bc3cec8100644eaa96402
      https://github.com/pytest-dev/pytest/commit/a993add78331dbebdc6bc3cec8100644eaa96402
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-17 (Thu, 17 Aug 2017)

  Changed paths:
    M _pytest/compat.py
    M _pytest/fixtures.py
    A changelog/2699.bugfix
    M testing/python/collect.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Allow tests declared as @staticmethod to use fixtures

Fix #2699


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

  Changed paths:
    M _pytest/compat.py

  Log Message:
  -----------
  Add comment about possible future refactoring in the fixture mechanism


  Commit: ad36407747da6b6efa85fa202031f9f2e45741e3
      https://github.com/pytest-dev/pytest/commit/ad36407747da6b6efa85fa202031f9f2e45741e3
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M _pytest/compat.py
    M _pytest/fixtures.py
    A changelog/2699.bugfix
    M testing/python/collect.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #2700 from nicoddemus/staticmethods-fixtures

Allow tests declared as @staticmethod to use fixtures


  Commit: 3f8ff7f090314a25c3b24dfecc4d38f74393b137
      https://github.com/pytest-dev/pytest/commit/3f8ff7f090314a25c3b24dfecc4d38f74393b137
  Author: Xuan Luong <luonghoaixuan at gmail.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M AUTHORS
    A changelog/2604.doc
    M doc/en/example/markers.rst

  Log Message:
  -----------
  [DOC] Add examples for mark.with_args


  Commit: 549f5c1a47f510abab4d8d28cac221c685175679
      https://github.com/pytest-dev/pytest/commit/549f5c1a47f510abab4d8d28cac221c685175679
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M AUTHORS
    A changelog/2604.doc
    M doc/en/example/markers.rst

  Log Message:
  -----------
  Merge pull request #2736 from xuanluong/issue-2604-documents-mark.with_args

[DOC] Add examples for mark.with_args


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/2604.doc
    R changelog/2653.doc
    R changelog/2681.bugfix
    R changelog/2691.trivial
    R changelog/2699.bugfix
    R changelog/2707.bugfix
    R changelog/2721.trivial
    R changelog/2731.bugfix
    R changelog/2739.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.2.2


  Commit: 09349c344ed9de4b245d5a60a28ed0e039a4c944
      https://github.com/pytest-dev/pytest/commit/09349c344ed9de4b245d5a60a28ed0e039a4c944
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2604.doc
    R changelog/2653.doc
    R changelog/2681.bugfix
    R changelog/2691.trivial
    R changelog/2699.bugfix
    R changelog/2707.bugfix
    R changelog/2721.trivial
    R changelog/2731.bugfix
    R changelog/2739.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Merge pull request #2757 from nicoddemus/release-3.2.2

Preparing release version 3.2.2


  Commit: 9273e11f219b801573e3f79b578c4dc435e2e060
      https://github.com/pytest-dev/pytest/commit/9273e11f219b801573e3f79b578c4dc435e2e060
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/compat.py
    M _pytest/fixtures.py
    R changelog/2653.doc
    R changelog/2681.bugfix
    R changelog/2691.trivial
    R changelog/2707.bugfix
    R changelog/2721.trivial
    R changelog/2731.bugfix
    R changelog/2739.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/reportingdemo.rst
    M testing/python/collect.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge branch 'master' into features


Compare: https://github.com/pytest-dev/pytest/compare/6967f3070eec...9273e11f219b

From nicoddemus at gmail.com  Sat Sep  9 14:15:49 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 09 Sep 2017 11:15:49 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b2a8e0: add warning to skipping
 docs re marker inheritance
Message-ID: <59b42fd5c4475_60fc3fe36011bc2c721e1@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: b2a8e06e4fcad38c65d603f24b8436c4f8a385cf
      https://github.com/pytest-dev/pytest/commit/b2a8e06e4fcad38c65d603f24b8436c4f8a385cf
  Author: Joe Hamman <jhamman1 at uw.edu>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M doc/en/skipping.rst

  Log Message:
  -----------
  add warning to skipping docs re marker inheritance


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

  Changed paths:
    M doc/en/skipping.rst

  Log Message:
  -----------
  Merge pull request #2763 from jhamman/docs/skipif_class_warning

add warning to skipping docs re marker inheritance


Compare: https://github.com/pytest-dev/pytest/compare/25ed4edbc7e8...3c1ca03b9c9f

From nicoddemus at gmail.com  Sat Sep  9 20:03:15 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 09 Sep 2017 17:03:15 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 15222c: Fix typo in example of
 passing a callable to marke...
Message-ID: <59b4814359807_16623f877754fc344592b@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 15222ceca275e2949da115ff6c54d8b80e8ca8b1
      https://github.com/pytest-dev/pytest/commit/15222ceca275e2949da115ff6c54d8b80e8ca8b1
  Author: Xuan Luong <luonghoaixuan at gmail.com>
  Date:   2017-09-09 (Sat, 09 Sep 2017)

  Changed paths:
    A changelog/xxxx.trivial
    M doc/en/example/markers.rst

  Log Message:
  -----------
  Fix typo in example of passing a callable to markers


  Commit: e27a0d69aafb4612dbe236e5577e4e6ea45cffca
      https://github.com/pytest-dev/pytest/commit/e27a0d69aafb4612dbe236e5577e4e6ea45cffca
  Author: Xuan Luong <luonghoaixuan at gmail.com>
  Date:   2017-09-09 (Sat, 09 Sep 2017)

  Changed paths:
    A changelog/2765.trivial
    R changelog/xxxx.trivial

  Log Message:
  -----------
  Rename changelog file to PR id number


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

  Changed paths:
    A changelog/2765.trivial
    M doc/en/example/markers.rst

  Log Message:
  -----------
  Merge pull request #2765 from xuanluong/pass-callable-to-marker-typo

Fix typo in example of passing a callable to markers


Compare: https://github.com/pytest-dev/pytest/compare/3c1ca03b9c9f...bee2c864d89e

From nicoddemus at gmail.com  Sun Sep 10 01:07:07 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 09 Sep 2017 22:07:07 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 696c70: Update documentation on
 multiple calls of metafunc...
Message-ID: <59b4c87b9c362_3f113f9adf169c34109484@hookshot-fe-92cdb05.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 696c702da78ad162294bb6a7dd9d2b36fed6a3aa
      https://github.com/pytest-dev/pytest/commit/696c702da78ad162294bb6a7dd9d2b36fed6a3aa
  Author: Xuan Luong <luonghoaixuan at gmail.com>
  Date:   2017-09-10 (Sun, 10 Sep 2017)

  Changed paths:
    A changelog/1548.doc
    M doc/en/parametrize.rst

  Log Message:
  -----------
  Update documentation on multiple calls of metafunc.parametrize


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

  Changed paths:
    A changelog/1548.doc
    M doc/en/parametrize.rst

  Log Message:
  -----------
  Merge pull request #2766 from xuanluong/issue-1548-docs-multiple-calls-metafunc-parametrize

Update documentation on multiple calls of metafunc.parametrize


Compare: https://github.com/pytest-dev/pytest/compare/bee2c864d89e...e57cc5571979

From nicoddemus at gmail.com  Thu Sep 14 18:20:47 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 14 Sep 2017 15:20:47 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 52c134: Add development guide
 to docs
Message-ID: <59bb00bf47ad_759e3fd076ed9c443601@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 52c134aed3f4769d56818927cab1f0b6a757d13b
      https://github.com/pytest-dev/pytest/commit/52c134aed3f4769d56818927cab1f0b6a757d13b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-13 (Wed, 13 Sep 2017)

  Changed paths:
    M HOWTORELEASE.rst
    M doc/en/contents.rst
    A doc/en/development_guide.rst

  Log Message:
  -----------
  Add development guide to docs


  Commit: 25d2acbdb2ffe8d38cda9bfe1a61ff9d2d4386c0
      https://github.com/pytest-dev/pytest/commit/25d2acbdb2ffe8d38cda9bfe1a61ff9d2d4386c0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-14 (Thu, 14 Sep 2017)

  Changed paths:
    M HOWTORELEASE.rst
    M doc/en/contents.rst
    A doc/en/development_guide.rst

  Log Message:
  -----------
  Merge pull request #2760 from nicoddemus/labels

Add development guide to docs


Compare: https://github.com/pytest-dev/pytest/compare/70cdfaf66107...25d2acbdb2ff

From nicoddemus at gmail.com  Thu Sep 14 19:00:21 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 14 Sep 2017 16:00:21 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 810320: Small fixes to
 development_guide: title and label ...
Message-ID: <59bb0a055212d_4afc3fd04daddc2c20b4@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 810320f591d3c309f89acbd7ab4de15cd7250256
      https://github.com/pytest-dev/pytest/commit/810320f591d3c309f89acbd7ab4de15cd7250256
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-14 (Thu, 14 Sep 2017)

  Changed paths:
    M doc/en/development_guide.rst

  Log Message:
  -----------
  Small fixes to development_guide: title and label names

* Fix title to use a proper "title" section marker
* Fix labels by adding a " " after the ":"
* Fix OS labels after obvious mishap
* Sort labels



From nicoddemus at gmail.com  Thu Sep 14 19:11:44 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 14 Sep 2017 16:11:44 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 6cf515: Fix crash in
 FastFilesCompleter with no prefix
Message-ID: <59bb0cb092f97_47523feeb4c43c306215@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 6cf515b1648061e87bf40ec5a5cbb7f1aa543465
      https://github.com/pytest-dev/pytest/commit/6cf515b1648061e87bf40ec5a5cbb7f1aa543465
  Author: Evan <evanunderscore at gmail.com>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M _pytest/_argcomplete.py
    A changelog/2748.bugfix
    M testing/test_argcomplete.py

  Log Message:
  -----------
  Fix crash in FastFilesCompleter with no prefix


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

  Changed paths:
    M _pytest/_argcomplete.py
    A changelog/2748.bugfix
    M testing/test_argcomplete.py

  Log Message:
  -----------
  Merge pull request #2750 from evanunderscore/fix-filescompleter

Fix crash in FastFilesCompleter with no prefix


Compare: https://github.com/pytest-dev/pytest/compare/810320f591d3...ac5c5cc1efb6

From nicoddemus at gmail.com  Tue Sep 19 11:31:22 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 19 Sep 2017 08:31:22 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 58aaab: fix tox documentation
 link
Message-ID: <59c1384a79422_37cb3fe04108dc3c126957@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 58aaabbb10c7c044ed09b7756c1b5501556f9524
      https://github.com/pytest-dev/pytest/commit/58aaabbb10c7c044ed09b7756c1b5501556f9524
  Author: Oliver Bestwalter <oliver.bestwalter at avira.com>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  fix tox documentation link


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

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Merge pull request #2792 from Avira/fix-tox-docs-link

fix tox documentation link


Compare: https://github.com/pytest-dev/pytest/compare/bf77daa2ee42...9c8847a0cb7d

From nicoddemus at gmail.com  Tue Sep 19 16:34:45 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 19 Sep 2017 13:34:45 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 280213: fix 'DoctestItem'
 object has no attribute '_fixtur...
Message-ID: <59c17f65d0c94_60f73fced0d8dc34111297@hookshot-fe-92cdb05.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 2802135741a69fac1a22fa29832cd9b5605d87d1
      https://github.com/pytest-dev/pytest/commit/2802135741a69fac1a22fa29832cd9b5605d87d1
  Author: Oliver Bestwalter <oliver.bestwalter at avira.com>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    M _pytest/python.py
    A changelog/2788.bugfix
    M testing/python/show_fixtures_per_test.py

  Log Message:
  -----------
  fix 'DoctestItem' object has no attribute '_fixtureinfo'

* doxtests don't seem to have this attribute, so nothing will be written in that case.
* tried to be a good boy scout and tidied up surrounding code a bit (comments, shadowed/unused names, removed random new lines, naming things)


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

  Changed paths:
    M _pytest/python.py
    A changelog/2788.bugfix
    M testing/python/show_fixtures_per_test.py

  Log Message:
  -----------
  Merge pull request #2789 from Avira/master

Don't crash if an item has no _fixtureinfo attribute


Compare: https://github.com/pytest-dev/pytest/compare/9c8847a0cb7d...966391c77e8f

From nicoddemus at gmail.com  Wed Sep 27 14:36:11 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 27 Sep 2017 11:36:11 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 875967: minor: cleanup tox.ini
Message-ID: <59cbef9b791ba_15783fd56155fc3c413b9@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 87596714bf924d2f3ebd23a79ab78a3ad0ea3787
      https://github.com/pytest-dev/pytest/commit/87596714bf924d2f3ebd23a79ab78a3ad0ea3787
  Author: Daniel Hahler <git at thequod.de>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  minor: cleanup tox.ini


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

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2799 from blueyed/cleanup-tox.ini

minor: cleanup tox.ini


Compare: https://github.com/pytest-dev/pytest/compare/de0d19ca098f...c0c859ce9953