From nicoddemus at gmail.com  Fri May 12 17:25:13 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 12 May 2017 14:25:13 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 8bcf88: try to consider all
 modules after registration as ...
Message-ID: <59162839a2838_5fbc3f90fe2d5c3446290@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 8bcf88ec121215788b5edcd8fd6da8f8c15e6432
      https://github.com/pytest-dev/pytest/commit/8bcf88ec121215788b5edcd8fd6da8f8c15e6432
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-05 (Fri, 05 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  try to consider all modules after registration as plugin


  Commit: a92e397011c02d0a6f336812934750fd95688058
      https://github.com/pytest-dev/pytest/commit/a92e397011c02d0a6f336812934750fd95688058
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  add changelog for fixing #2391


  Commit: 456925b6045470b1d306eea146ab8a82b65b7606
      https://github.com/pytest-dev/pytest/commit/456925b6045470b1d306eea146ab8a82b65b7606
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/config.py

  Log Message:
  -----------
  Merge pull request #2395 from RonnyPfannschmidt/consider-all-modules

Consider all modules


Compare: https://github.com/pytest-dev/pytest/compare/b6125d9a139e...456925b60454

From nicoddemus at gmail.com  Mon May 15 18:40:47 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 15 May 2017 15:40:47 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f1c4e2: regendoc: reduce
 version noise by replacing minor/...
Message-ID: <591a2e6f98408_59a3fad8389dc3890871@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: f1c4e2c032795652cd0c7cf08a38f2e5221b2e57
      https://github.com/pytest-dev/pytest/commit/f1c4e2c032795652cd0c7cf08a38f2e5221b2e57
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  regendoc: reduce version noise by replacing minor/patch with placeholders


  Commit: c765fa6d042babcbb8ba9baaea4fcebe8c978c25
      https://github.com/pytest-dev/pytest/commit/c765fa6d042babcbb8ba9baaea4fcebe8c978c25
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/getting-started.rst

  Log Message:
  -----------
  add regendoc normaliz for pytest --version


  Commit: d1e44d16e7f2a510be0a3c885435ed4226abb777
      https://github.com/pytest-dev/pytest/commit/d1e44d16e7f2a510be0a3c885435ed4226abb777
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  regenerate docs from the pytest env


  Commit: 03753ca201fcd9d0720a3e4ff2f8dd20dff1a4f0
      https://github.com/pytest-dev/pytest/commit/03753ca201fcd9d0720a3e4ff2f8dd20dff1a4f0
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-13 (Sat, 13 May 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  intermediate state after attempt with the plain env, DONT MERGE


  Commit: bd708068ab359b192903ae0a15a3852034f43a9c
      https://github.com/pytest-dev/pytest/commit/bd708068ab359b192903ae0a15a3852034f43a9c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-14 (Sun, 14 May 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/config.py
    M _pytest/junitxml.py
    M doc/en/usage.rst
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge branch 'features' into regendoc-reduce-version-noise


  Commit: 3c41349fe147b449785857cf5fed33d46aa4b600
      https://github.com/pytest-dev/pytest/commit/3c41349fe147b449785857cf5fed33d46aa4b600
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Merge pull request #2406 from RonnyPfannschmidt/regendoc-reduce-version-noise

regendoc: reduce version noise by replacing minor/patch with placeholders


Compare: https://github.com/pytest-dev/pytest/compare/783670b84e73...3c41349fe147

From nicoddemus at gmail.com  Wed May 17 16:17:00 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 17 May 2017 13:17:00 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 70bcd1: Add a reference to
 Python testing book to talks do...
Message-ID: <591cafbc90413_2de53ff4ff4d9c3c10036@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/pytest-book-ref
  Home:   https://github.com/pytest-dev/pytest
  Commit: 70bcd1fb7bb45bbbc896fdc1550a095049d077df
      https://github.com/pytest-dev/pytest/commit/70bcd1fb7bb45bbbc896fdc1550a095049d077df
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M doc/en/talks.rst

  Log Message:
  -----------
  Add a reference to Python testing book to talks docs



From nicoddemus at gmail.com  Wed May 17 19:57:52 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 17 May 2017 16:57:52 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f7247d: Remove past training
Message-ID: <591ce38059431_17693fdf8f9a3c341287ee@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: f7247dc99dddefe16d827dd9fd86b395008c2a50
      https://github.com/pytest-dev/pytest/commit/f7247dc99dddefe16d827dd9fd86b395008c2a50
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M doc/en/talks.rst

  Log Message:
  -----------
  Remove past training

Leaving the sidebar as an example for in the future.


  Commit: 7af0e6bda13b625641930e656ef1c1bbf82a7b28
      https://github.com/pytest-dev/pytest/commit/7af0e6bda13b625641930e656ef1c1bbf82a7b28
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M doc/en/talks.rst

  Log Message:
  -----------
  Merge pull request #2415 from flub/training

Remove past training


Compare: https://github.com/pytest-dev/pytest/compare/e484f4760f21...7af0e6bda13b

From nicoddemus at gmail.com  Thu May 18 11:25:08 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 18 May 2017 08:25:08 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 598aef: small fix in an example
 from the docs
Message-ID: <591dbcd41f9bf_3c9c3ff801421c2c12632f@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 598aefc686cf2149807342583856bd503c2743b5
      https://github.com/pytest-dev/pytest/commit/598aefc686cf2149807342583856bd503c2743b5
  Author: Lev Maximov <lev.maximov at gmail.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

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

  Log Message:
  -----------
  small fix in an example from the docs


  Commit: 637550b249883c420928988933393dc399de5d3e
      https://github.com/pytest-dev/pytest/commit/637550b249883c420928988933393dc399de5d3e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

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

  Log Message:
  -----------
  Merge pull request #2418 from axil/master

small fix in an example from the docs


Compare: https://github.com/pytest-dev/pytest/compare/7af0e6bda13b...637550b24988

From nicoddemus at gmail.com  Fri May 19 17:58:48 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 19 May 2017 14:58:48 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d86c89: Revert refactor of
 old-style to new-style classes
Message-ID: <591f6a985bcd2_6fe3fc8cd779c34125734@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: d86c89e19338f78e9f757a860eefbf9bb9994ab7
      https://github.com/pytest-dev/pytest/commit/d86c89e19338f78e9f757a860eefbf9bb9994ab7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/_argcomplete.py
    M _pytest/assertion/__init__.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py

  Log Message:
  -----------
  Revert refactor of old-style to new-style classes

As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398).

This reverts commit d4afa1554b225d11565d5fb81136edea51c54b0d from PR #2179.


  Commit: 3a4d37248d5289591e5703cb3f5a65d557d9960a
      https://github.com/pytest-dev/pytest/commit/3a4d37248d5289591e5703cb3f5a65d557d9960a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/_argcomplete.py
    M _pytest/assertion/__init__.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py

  Log Message:
  -----------
  Merge pull request #2414 from nicoddemus/revert-new-style-classes

Revert refactor of old-style to new-style classes


Compare: https://github.com/pytest-dev/pytest/compare/6f407ef308d1...3a4d37248d52

From nicoddemus at gmail.com  Sat May 20 09:00:14 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sat, 20 May 2017 06:00:14 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 6d2e11: Extract method for
 _mark_plugins_for_rewrite
Message-ID: <59203ddea9cc2_4ada3f84bec39c2c64445@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 6d2e11b7d1481a7bf3209f65ba94d1ca20f8bd39
      https://github.com/pytest-dev/pytest/commit/6d2e11b7d1481a7bf3209f65ba94d1ca20f8bd39
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Extract method for _mark_plugins_for_rewrite


  Commit: ce0ff0040f2c05f90270e84e519df68292268bf4
      https://github.com/pytest-dev/pytest/commit/ce0ff0040f2c05f90270e84e519df68292268bf4
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Reindent and add docstring


  Commit: 2abf2070f2a486dab8e0592b0a774d588afcfc78
      https://github.com/pytest-dev/pytest/commit/2abf2070f2a486dab8e0592b0a774d588afcfc78
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Collapse nested for loops into a generator expression


  Commit: 43aa037ebd9324a628cb0e4e52e52b3fa01c7761
      https://github.com/pytest-dev/pytest/commit/43aa037ebd9324a628cb0e4e52e52b3fa01c7761
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Reindent


  Commit: 9beeef970e17fa5bb717681b1d7e89414d8eb21c
      https://github.com/pytest-dev/pytest/commit/9beeef970e17fa5bb717681b1d7e89414d8eb21c
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Parse the filename in the generator expression


  Commit: c9c2c34b44c47dd00f0917bf9e7d351f00e13697
      https://github.com/pytest-dev/pytest/commit/c9c2c34b44c47dd00f0917bf9e7d351f00e13697
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Remove unused parameter


  Commit: 69343310c651d3db387ea45958e4018700442a89
      https://github.com/pytest-dev/pytest/commit/69343310c651d3db387ea45958e4018700442a89
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Merge pull request #2422 from pytest-dev/refactor-config

Refactor config


Compare: https://github.com/pytest-dev/pytest/compare/637550b24988...69343310c651

From nicoddemus at gmail.com  Sat May 20 09:00:16 2017
From: nicoddemus at gmail.com (nicoddemus)
Date: Sat, 20 May 2017 06:00:16 -0700
Subject: [Pytest-commit] [pytest-dev/pytest]
Message-ID: <59203de05df2d_445b3fa2f6cf1c2c79717@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/refactor-config
  Home:   https://github.com/pytest-dev/pytest

From nicoddemus at gmail.com  Mon May 22 17:54:51 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 22 May 2017 14:54:51 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 36cf89: Merge remote-tracking
 branch 'upstream/master' int...
Message-ID: <59235e2bbbf7f_20f73fcfb92ffc3851823@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/tags/3.1.0
  Home:   https://github.com/pytest-dev/pytest
  Commit: 36cf89a2de01e0f4a941a0f202b02845387a3611
      https://github.com/pytest-dev/pytest/commit/36cf89a2de01e0f4a941a0f202b02845387a3611
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

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

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


  Commit: 0ff7f5d0c6fe7c4cb206fa92bba8a418f1d2c50b
      https://github.com/pytest-dev/pytest/commit/0ff7f5d0c6fe7c4cb206fa92bba8a418f1d2c50b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Prepare CHANGELOG for version 3.1.0


  Commit: 9b48613baa9ee1ab4e1e233bfe956de03e89b23e
      https://github.com/pytest-dev/pytest/commit/9b48613baa9ee1ab4e1e233bfe956de03e89b23e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.0.rst
    M doc/en/cache.rst
    M doc/en/example/parametrize.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.1.0


Compare: https://github.com/pytest-dev/pytest/compare/36cf89a2de01^...9b48613baa9e

From nicoddemus at gmail.com  Mon May 22 18:11:49 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 22 May 2017 15:11:49 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 70bcd1: Add a reference to
 Python testing book to talks do...
Message-ID: <59236225224f1_3d713fc8d5161c2c17349f@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 70bcd1fb7bb45bbbc896fdc1550a095049d077df
      https://github.com/pytest-dev/pytest/commit/70bcd1fb7bb45bbbc896fdc1550a095049d077df
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M doc/en/talks.rst

  Log Message:
  -----------
  Add a reference to Python testing book to talks docs


  Commit: e484f4760f21feabeabcabfac8ff9551684d77ec
      https://github.com/pytest-dev/pytest/commit/e484f4760f21feabeabcabfac8ff9551684d77ec
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M doc/en/talks.rst

  Log Message:
  -----------
  Merge pull request #2412 from pytest-dev/pytest-book-ref

Add a reference to Python testing book to talks docs


  Commit: f7247dc99dddefe16d827dd9fd86b395008c2a50
      https://github.com/pytest-dev/pytest/commit/f7247dc99dddefe16d827dd9fd86b395008c2a50
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M doc/en/talks.rst

  Log Message:
  -----------
  Remove past training

Leaving the sidebar as an example for in the future.


  Commit: 7af0e6bda13b625641930e656ef1c1bbf82a7b28
      https://github.com/pytest-dev/pytest/commit/7af0e6bda13b625641930e656ef1c1bbf82a7b28
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M doc/en/talks.rst

  Log Message:
  -----------
  Merge pull request #2415 from flub/training

Remove past training


  Commit: 598aefc686cf2149807342583856bd503c2743b5
      https://github.com/pytest-dev/pytest/commit/598aefc686cf2149807342583856bd503c2743b5
  Author: Lev Maximov <lev.maximov at gmail.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

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

  Log Message:
  -----------
  small fix in an example from the docs


  Commit: 637550b249883c420928988933393dc399de5d3e
      https://github.com/pytest-dev/pytest/commit/637550b249883c420928988933393dc399de5d3e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

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

  Log Message:
  -----------
  Merge pull request #2418 from axil/master

small fix in an example from the docs


  Commit: 36cf89a2de01e0f4a941a0f202b02845387a3611
      https://github.com/pytest-dev/pytest/commit/36cf89a2de01e0f4a941a0f202b02845387a3611
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

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

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


  Commit: 0ff7f5d0c6fe7c4cb206fa92bba8a418f1d2c50b
      https://github.com/pytest-dev/pytest/commit/0ff7f5d0c6fe7c4cb206fa92bba8a418f1d2c50b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Prepare CHANGELOG for version 3.1.0


  Commit: 9b48613baa9ee1ab4e1e233bfe956de03e89b23e
      https://github.com/pytest-dev/pytest/commit/9b48613baa9ee1ab4e1e233bfe956de03e89b23e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.0.rst
    M doc/en/cache.rst
    M doc/en/example/parametrize.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.1.0


  Commit: 6d2e11b7d1481a7bf3209f65ba94d1ca20f8bd39
      https://github.com/pytest-dev/pytest/commit/6d2e11b7d1481a7bf3209f65ba94d1ca20f8bd39
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Extract method for _mark_plugins_for_rewrite


  Commit: ce0ff0040f2c05f90270e84e519df68292268bf4
      https://github.com/pytest-dev/pytest/commit/ce0ff0040f2c05f90270e84e519df68292268bf4
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Reindent and add docstring


  Commit: 2abf2070f2a486dab8e0592b0a774d588afcfc78
      https://github.com/pytest-dev/pytest/commit/2abf2070f2a486dab8e0592b0a774d588afcfc78
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Collapse nested for loops into a generator expression


  Commit: 43aa037ebd9324a628cb0e4e52e52b3fa01c7761
      https://github.com/pytest-dev/pytest/commit/43aa037ebd9324a628cb0e4e52e52b3fa01c7761
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Reindent


  Commit: 9beeef970e17fa5bb717681b1d7e89414d8eb21c
      https://github.com/pytest-dev/pytest/commit/9beeef970e17fa5bb717681b1d7e89414d8eb21c
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Parse the filename in the generator expression


  Commit: c9c2c34b44c47dd00f0917bf9e7d351f00e13697
      https://github.com/pytest-dev/pytest/commit/c9c2c34b44c47dd00f0917bf9e7d351f00e13697
  Author: Jason R. Coombs <jaraco at jaraco.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Remove unused parameter


  Commit: 69343310c651d3db387ea45958e4018700442a89
      https://github.com/pytest-dev/pytest/commit/69343310c651d3db387ea45958e4018700442a89
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  Merge pull request #2422 from pytest-dev/refactor-config

Refactor config


  Commit: d343f9497ca176d4af2e52ae69fffda0d8516d5b
      https://github.com/pytest-dev/pytest/commit/d343f9497ca176d4af2e52ae69fffda0d8516d5b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
    M .gitignore
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M HOWTORELEASE.rst
    M MANIFEST.in
    M _pytest/__init__.py
    M _pytest/_argcomplete.py
    M _pytest/_code/__init__.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    A _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    A _pytest/warnings.py
    M doc/en/Makefile
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.0.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/attic.rst
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/recwarn.rst
    M doc/en/skipping.rst
    M doc/en/test/attic.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    A doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pytest.py
    M scripts/check-manifest.py
    M setup.cfg
    M setup.py
    A tasks/__init__.py
    A tasks/generate.py
    A tasks/release.minor.rst
    A tasks/release.patch.rst
    A tasks/requirements.txt
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    A testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    A testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'release-3.1'


Compare: https://github.com/pytest-dev/pytest/compare/3a4d37248d52...d343f9497ca1

From nicoddemus at gmail.com  Mon May 22 18:39:36 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 22 May 2017 15:39:36 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f9df75: Update 3.1.0 release
 date
Message-ID: <592368a8a3172_285a3fb627a83c3075418@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: f9df7500256ad7805e7ebaa0e6c8e72c8699cbbd
      https://github.com/pytest-dev/pytest/commit/f9df7500256ad7805e7ebaa0e6c8e72c8699cbbd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update 3.1.0 release date



From nicoddemus at gmail.com  Mon May 22 18:39:52 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 22 May 2017 15:39:52 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] f9df75: Update 3.1.0 release
 date
Message-ID: <592368b83e4dd_4cac3fe1fb00bc3063710@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: f9df7500256ad7805e7ebaa0e6c8e72c8699cbbd
      https://github.com/pytest-dev/pytest/commit/f9df7500256ad7805e7ebaa0e6c8e72c8699cbbd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update 3.1.0 release date



From nicoddemus at gmail.com  Tue May 23 13:20:08 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 23 May 2017 10:20:08 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 519219: Create task for
 publishing a release
Message-ID: <59246f489c732_4fb03f887bba3c341197ce@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 5192191c38f17d88509e804e830fc68b4de14633
      https://github.com/pytest-dev/pytest/commit/5192191c38f17d88509e804e830fc68b4de14633
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
    M HOWTORELEASE.rst
    M tasks/generate.py
    M tasks/release.minor.rst

  Log Message:
  -----------
  Create task for publishing a release


  Commit: f9953fbe7c0794bb25ecd0687e6c5c8e9d89f1ad
      https://github.com/pytest-dev/pytest/commit/f9953fbe7c0794bb25ecd0687e6c5c8e9d89f1ad
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-05-23 (Tue, 23 May 2017)

  Changed paths:
    M HOWTORELEASE.rst
    M tasks/generate.py
    M tasks/release.minor.rst

  Log Message:
  -----------
  Merge pull request #2425 from nicoddemus/publish-task

Create task for publishing a release


  Commit: 17f64704c2f72282eb0e6132e81f2d84c6b4bd42
      https://github.com/pytest-dev/pytest/commit/17f64704c2f72282eb0e6132e81f2d84c6b4bd42
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-23 (Tue, 23 May 2017)

  Changed paths:
    M HOWTORELEASE.rst
    M tasks/generate.py
    M tasks/release.minor.rst

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


Compare: https://github.com/pytest-dev/pytest/compare/0ea80eb63c07...17f64704c2f7

From nicoddemus at gmail.com  Mon May 22 18:10:31 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 22 May 2017 15:10:31 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 6b135c: Initial commit.
Message-ID: <592361d7e316d_302f3fdf9291fc3862150@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 6b135c83be8cef769dbc860a4706a95603d01d09
      https://github.com/pytest-dev/pytest/commit/6b135c83be8cef769dbc860a4706a95603d01d09
  Author: Florian Schulze <florian.schulze at gmx.net>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    A .gitignore
    A LICENSE
    A README.rst
    A pytest_warnings.py
    A setup.py
    A test_warnings.py
    A test_warnings2.py
    A tox.ini

  Log Message:
  -----------
  Initial commit.


  Commit: b9c4ecf5a86aa9054234f4f2f7b99a7030b5b1d7
      https://github.com/pytest-dev/pytest/commit/b9c4ecf5a86aa9054234f4f2f7b99a7030b5b1d7
  Author: Florian Schulze <florian.schulze at gmx.net>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    A MANIFEST.in

  Log Message:
  -----------
  Add MANIFEST.in.


  Commit: 3feee0c48386f172effd8056361cce4a1b87ef4e
      https://github.com/pytest-dev/pytest/commit/3feee0c48386f172effd8056361cce4a1b87ef4e
  Author: Florian Schulze <florian.schulze at gmx.net>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Prepare 0.1 release.


  Commit: bc5a8c761e596fbfc661adb26889951140622203
      https://github.com/pytest-dev/pytest/commit/bc5a8c761e596fbfc661adb26889951140622203
  Author: Florian Schulze <florian.schulze at gmx.net>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Fix version in readme.


  Commit: db922403cc6ec06a0cab54b59f5e65ea8ced215c
      https://github.com/pytest-dev/pytest/commit/db922403cc6ec06a0cab54b59f5e65ea8ced215c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/__init__.py

  Log Message:
  -----------
  Bump version to 3.1.0.dev


  Commit: 7704f73db9319c256766855d80f5acbd005db1aa
      https://github.com/pytest-dev/pytest/commit/7704f73db9319c256766855d80f5acbd005db1aa
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R ISSUES.txt
    M MANIFEST.in
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/python.py
    M _pytest/runner.py
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-3.0.0.rst
    A doc/en/announce/release-3.0.1.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    R doc/en/example/layout1/setup.cfg
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/writing_plugins.rst
    M testing/acceptance_test.py
    M testing/python/metafunc.py
    M testing/test_runner.py
    M testing/test_skipping.py
    M tox.ini

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


  Commit: 6359894fe4314cfedfef62833f5cc291e2a1363a
      https://github.com/pytest-dev/pytest/commit/6359894fe4314cfedfef62833f5cc291e2a1363a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R ISSUES.txt
    M MANIFEST.in
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/python.py
    M _pytest/runner.py
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-3.0.0.rst
    A doc/en/announce/release-3.0.1.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    R doc/en/example/layout1/setup.cfg
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/writing_plugins.rst
    M testing/acceptance_test.py
    M testing/python/metafunc.py
    M testing/test_runner.py
    M testing/test_skipping.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #1859 from nicoddemus/merge-master-into-features

Merge master into features


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Remove merge-conflict marker merged by accident

Unfortunately rst-lint didn't catch that


  Commit: 1b259f70f3e0eac4eb0af441b7a18779b2c4ac58
      https://github.com/pytest-dev/pytest/commit/1b259f70f3e0eac4eb0af441b7a18779b2c4ac58
  Author: John Towler <john.towler at clover.com>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/junitxml.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Testcase reports with a url attribute will now properly write this to junitxml


  Commit: 9d2149d9c0c0ce515de33517616d03bb258a1b62
      https://github.com/pytest-dev/pytest/commit/9d2149d9c0c0ce515de33517616d03bb258a1b62
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M README.rst
    M _pytest/_code/code.py
    M _pytest/capture.py
    M _pytest/debugging.py
    M _pytest/python.py
    M appveyor.yml
    M doc/en/adopt.rst
    M doc/en/announce/release-2.9.1.rst
    M doc/en/announce/release-2.9.2.rst
    M doc/en/announce/sprint2016.rst
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/conf.py
    M doc/en/contents.rst
    M doc/en/doctest.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    R doc/en/feedback.rst
    M doc/en/funcarg_compare.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/monkeypatch.rst
    M doc/en/nose.rst
    R doc/en/overview.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    M doc/en/recwarn.rst
    R doc/en/status.rst
    M doc/en/unittest.rst
    M doc/en/writing_plugins.rst
    R doc/en/xdist.rst
    M doc/en/yieldfixture.rst
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_capture.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #1884 from pytest-dev/master

merge master into features


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

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M _pytest/__init__.py
    M _pytest/assertion/__init__.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/unittest.py
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.0.2.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M testing/test_assertion.py
    M testing/test_pdb.py

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


  Commit: 98ac1dd34bebc070e1ea4f6dbdaa3b5f4f47a66b
      https://github.com/pytest-dev/pytest/commit/98ac1dd34bebc070e1ea4f6dbdaa3b5f4f47a66b
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M _pytest/__init__.py
    M _pytest/assertion/__init__.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/unittest.py
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.0.2.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M testing/test_assertion.py
    M testing/test_pdb.py

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

Merge master into features after 3.0.2


  Commit: e572c16d3f1f619b94137ca8226acba83054d566
      https://github.com/pytest-dev/pytest/commit/e572c16d3f1f619b94137ca8226acba83054d566
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2016-09-05 (Mon, 05 Sep 2016)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  remove memoizedcall in Module


  Commit: e1674f60e75da82dafd0685f32b97af4967d971c
      https://github.com/pytest-dev/pytest/commit/e1674f60e75da82dafd0685f32b97af4967d971c
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2016-09-05 (Mon, 05 Sep 2016)

  Changed paths:
    M _pytest/main.py
    M _pytest/pytester.py
    M _pytest/runner.py

  Log Message:
  -----------
  remove memocollect anmd memoized_call


  Commit: 28b1896e9a9aebb4e73d23498977b6c859420445
      https://github.com/pytest-dev/pytest/commit/28b1896e9a9aebb4e73d23498977b6c859420445
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2016-09-05 (Mon, 05 Sep 2016)

  Changed paths:
    M _pytest/assertion/util.py
    M _pytest/python.py
    M testing/python/raises.py

  Log Message:
  -----------
  Remove BuiltinAssertionError

We used to have this when we where patching the real Python
AssertionError for use with reinterpret, but reinterpret is now
gone so we no longer need this as it is not used by rewrite.


  Commit: 1c9bd9278e9be744a9648975b35ef223a6b31d11
      https://github.com/pytest-dev/pytest/commit/1c9bd9278e9be744a9648975b35ef223a6b31d11
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2016-09-05 (Mon, 05 Sep 2016)

  Changed paths:
    M _pytest/assertion/util.py
    M _pytest/python.py
    M testing/python/raises.py

  Log Message:
  -----------
  Merge pull request #1913 from flub/builtin-assertion

Remove BuiltinAssertionError


  Commit: 10094a3f091ab64a608bc5107e91cafc9faa0c4c
      https://github.com/pytest-dev/pytest/commit/10094a3f091ab64a608bc5107e91cafc9faa0c4c
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2016-09-08 (Thu, 08 Sep 2016)

  Changed paths:
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/skipping.py
    M testing/test_mark.py

  Log Message:
  -----------
  use consistent inner repressentation for marks


  Commit: 1812387bf0c2cb36630afa3942f553c9540a5f47
      https://github.com/pytest-dev/pytest/commit/1812387bf0c2cb36630afa3942f553c9540a5f47
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2016-09-08 (Thu, 08 Sep 2016)

  Changed paths:
    M _pytest/compat.py
    M _pytest/mark.py

  Log Message:
  -----------
  Mark: fix python 3 compatibility


  Commit: 45524241a5e9ac349961a803907c1394ad289390
      https://github.com/pytest-dev/pytest/commit/45524241a5e9ac349961a803907c1394ad289390
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2016-09-08 (Thu, 08 Sep 2016)

  Changed paths:
    M _pytest/compat.py

  Log Message:
  -----------
  mark: fix introduced linting error


  Commit: 5b260d80f9ff2947fd63b6f85546342126fd6559
      https://github.com/pytest-dev/pytest/commit/5b260d80f9ff2947fd63b6f85546342126fd6559
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M _pytest/main.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py

  Log Message:
  -----------
  Merge pull request #1883 from RonnyPfannschmidt/kill-memoized-call

Kill memoized call


  Commit: dc16fe2bb9572177cf8b66a814c463feaf52e85b
      https://github.com/pytest-dev/pytest/commit/dc16fe2bb9572177cf8b66a814c463feaf52e85b
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/junitxml.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge junit-xml url attribute branch

Merge branch 'url_attr' of https://github.com/fushi/pytest into junitxml-url


  Commit: dd64d823b90f87fca2bb77a61da0912d91f8d7ea
      https://github.com/pytest-dev/pytest/commit/dd64d823b90f87fca2bb77a61da0912d91f8d7ea
  Author: Matthew Duck <matt at mattduck.com>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M _pytest/assertion/util.py
    M testing/test_assertion.py

  Log Message:
  -----------
  Don't display dict common items if verbosity=1

Part one of https://github.com/pytest-dev/pytest/issues/1512.

If verbosity=1, assertion explanations are truncated at 10 lines. In this
situation, it's more important to tell the user which dictionary items are
different than which are the same.


  Commit: 999e7c65417f1e97fc89bf66e0da4c5cd84442ec
      https://github.com/pytest-dev/pytest/commit/999e7c65417f1e97fc89bf66e0da4c5cd84442ec
  Author: Matthew Duck <matt at mattduck.com>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M _pytest/assertion/__init__.py

  Log Message:
  -----------
  Tidy formatting of assertion truncation

Part two of https://github.com/pytest-dev/pytest/issues/1512. Update the format
of the truncation message to help make it clear that pytest truncates the
entire assertion output when verbosity < 2.


  Commit: 4df74a5cfb20c0898f046315dd5b1d0053922062
      https://github.com/pytest-dev/pytest/commit/4df74a5cfb20c0898f046315dd5b1d0053922062
  Author: Matthew Duck <matt at mattduck.com>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst

  Log Message:
  -----------
  Add AUTHORS and CHANGELOG for #1512


  Commit: 01db0f1cd1b0d559db4da30540a5750bd6a57d41
      https://github.com/pytest-dev/pytest/commit/01db0f1cd1b0d559db4da30540a5750bd6a57d41
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M _pytest/compat.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/skipping.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #1923 from RonnyPfannschmidt/mark-internal-value

use consistent inner repressentation for marks


  Commit: 887c097f8ee928078b14b4815094afa4dcd199f7
      https://github.com/pytest-dev/pytest/commit/887c097f8ee928078b14b4815094afa4dcd199f7
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/assertion/__init__.py
    M _pytest/assertion/util.py
    M testing/test_assertion.py

  Log Message:
  -----------
  Merge pull request #1951 from mattduck/feat/1512-dict-compare-output

Feat/1512 dict compare output


  Commit: 0ac85218d1b761f09d67eb55e10d66575285c99c
      https://github.com/pytest-dev/pytest/commit/0ac85218d1b761f09d67eb55e10d66575285c99c
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M _pytest/debugging.py

  Log Message:
  -----------
  allow pdbcls without implying usepdb


  Commit: c7b4b8cf6fe3b2bb608f392839a2638857d6509a
      https://github.com/pytest-dev/pytest/commit/c7b4b8cf6fe3b2bb608f392839a2638857d6509a
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  test


  Commit: d75748ef6f158aca7e253d0632615bc67072d946
      https://github.com/pytest-dev/pytest/commit/d75748ef6f158aca7e253d0632615bc67072d946
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  test for calling set_trace with custom pdb cls


  Commit: 5e96edd43556fad89eb33cb962a14d4375d1dd56
      https://github.com/pytest-dev/pytest/commit/5e96edd43556fad89eb33cb962a14d4375d1dd56
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-09-25 (Sun, 25 Sep 2016)

  Changed paths:
    M _pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #1952 from davidszotten/pdbcls_without_pdb_on_fail

Pdbcls without pdb on fail


  Commit: 3fce78498fad121c75ec23fce7da06cd1c3470d2
      https://github.com/pytest-dev/pytest/commit/3fce78498fad121c75ec23fce7da06cd1c3470d2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-09-25 (Sun, 25 Sep 2016)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Mention #1952 on the CHANGELOG

Also created "New Features" and "Changes" sections.


  Commit: 8985c0be3ec5294deb173d4161e2125adab18f37
      https://github.com/pytest-dev/pytest/commit/8985c0be3ec5294deb173d4161e2125adab18f37
  Author: Vlad Dragos <hello at vlad-dragos.com>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  Change exception raised by DontReadFromInput.fileno() from ValueError to io.UnsupportedOperation


  Commit: ff492ca73fc038fcbe7f233594a9a19e4dbbe988
      https://github.com/pytest-dev/pytest/commit/ff492ca73fc038fcbe7f233594a9a19e4dbbe988
  Author: Vlad Dragos <hello at vlad-dragos.com>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst

  Log Message:
  -----------
  Thanked my self in the change log :)


  Commit: 3444796f3e4ba147ccef4df735a8a09ea62b9e48
      https://github.com/pytest-dev/pytest/commit/3444796f3e4ba147ccef4df735a8a09ea62b9e48
  Author: Vlad Dragos <hello at vlad-dragos.com>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  Fix formating error.


  Commit: acac78adc0a5145e2b89c8db74ac8c8b0bc0c136
      https://github.com/pytest-dev/pytest/commit/acac78adc0a5145e2b89c8db74ac8c8b0bc0c136
  Author: Vlad Dragos <hello at vlad-dragos.com>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Add link to profile.


  Commit: 654af0ba25c56583b4977a02bade686cac756066
      https://github.com/pytest-dev/pytest/commit/654af0ba25c56583b4977a02bade686cac756066
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/util.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/mark.py
    M _pytest/python.py
    M appveyor.yml
    M doc/en/Makefile
    R doc/en/_getdoctarget.py
    M doc/en/_templates/links.html
    M doc/en/conf.py
    M doc/en/monkeypatch.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M tox.ini

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


  Commit: 4667b4decc309cf5ffab95188102d459fc9ec683
      https://github.com/pytest-dev/pytest/commit/4667b4decc309cf5ffab95188102d459fc9ec683
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-09-29 (Thu, 29 Sep 2016)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/vendored_packages/README.md
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/DESCRIPTION.rst
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/METADATA
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/RECORD
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/WHEEL
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/metadata.json
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/pbr.json
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/top_level.txt
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/INSTALLER
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/RECORD
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/WHEEL
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/metadata.json
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/top_level.txt
    M _pytest/vendored_packages/pluggy.py
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.0.3.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst

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


  Commit: b629da424efa894a37c9d49eb94b14803afa8332
      https://github.com/pytest-dev/pytest/commit/b629da424efa894a37c9d49eb94b14803afa8332
  Author: Matthew Duck <matt at mattduck.com>
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
    M _pytest/assertion/__init__.py
    A _pytest/assertion/truncate.py
    M testing/test_assertion.py

  Log Message:
  -----------
  Restructure truncation of assertion messages

This addresses ref https://github.com/pytest-dev/pytest/issues/1954.

The current truncation for assertion explanations does not deal with long lines
properly:

- Previously if lines were too long it would display a "-n more lines"
  message.

- 999e7c65417f1e97fc89bf66e0da4c5cd84442ec introduced a bug where long lines can
  cause index errors if there are < 10 lines.

Extract the truncation logic into its own file and ensure it can deal with
long lines properly.


  Commit: 0061d9bd3ded0c1580211cb01d11ce38fe40b342
      https://github.com/pytest-dev/pytest/commit/0061d9bd3ded0c1580211cb01d11ce38fe40b342
  Author: Matthew Duck <matt at mattduck.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M _pytest/assertion/__init__.py
    M testing/test_assertion.py

  Log Message:
  -----------
  Fix flake8 (unused import, trailng whitespace)


  Commit: acee88a118544b74a4cbb9f57ff6a6a8ffb70516
      https://github.com/pytest-dev/pytest/commit/acee88a118544b74a4cbb9f57ff6a6a8ffb70516
  Author: Matthew Duck <matt at mattduck.com>
  Date:   2016-10-16 (Sun, 16 Oct 2016)

  Changed paths:
    M testing/test_assertion.py

  Log Message:
  -----------
  Fix truncation tests: pyruntest() match

Fix issue with truncation tests for -vv and CI, where the test for
non-truncated output would return a positive match even on truncated output.


  Commit: 9d00615bbf9579c110066540510be527e47467d6
      https://github.com/pytest-dev/pytest/commit/9d00615bbf9579c110066540510be527e47467d6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/helpconfig.py
    M _pytest/python.py
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    M doc/en/monkeypatch.rst
    M doc/en/usage.rst
    M testing/acceptance_test.py
    M testing/python/collect.py
    M testing/test_collection.py
    M testing/test_parseopt.py
    M testing/test_pluginmanager.py
    M testing/test_skipping.py
    M testing/test_terminal.py

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


  Commit: bc94a51a965ef20e9a66fc678718ce20746a1a0b
      https://github.com/pytest-dev/pytest/commit/bc94a51a965ef20e9a66fc678718ce20746a1a0b
  Author: Matthias Bussonnier <bussonniermatthias at gmail.com>
  Date:   2016-10-22 (Sat, 22 Oct 2016)

  Changed paths:
    M README.rst
    A helper_test_a.py
    A helper_test_b.py
    M pytest_warnings.py
    M test_warnings.py

  Log Message:
  -----------
  Add a warning option which does not escape its arguments.

This is useful when to use regular expressions, like for example ignore
a bunch of dynamic messages
    --filterwarnigns 'ignore:Please use assert.* instead.:'

Or ignore all the warnings in a sub-backage
    --filterwarnigns 'ignore:::package.submodule.*'

This is also available in the ini file as the filterwarnigns options


  Commit: 28621b05101a71a63faebe93ff6050c6742a4099
      https://github.com/pytest-dev/pytest/commit/28621b05101a71a63faebe93ff6050c6742a4099
  Author: Florian Schulze <florian.schulze at gmx.net>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M README.rst
    A helper_test_a.py
    A helper_test_b.py
    M pytest_warnings.py
    M test_warnings.py

  Log Message:
  -----------
  Merge pull request #2 from Carreau/filter-regex

Add a warning option which does not escape its arguments.


  Commit: f229b573fa57d69fa55ad3280f03c5a3525aa9bc
      https://github.com/pytest-dev/pytest/commit/f229b573fa57d69fa55ad3280f03c5a3525aa9bc
  Author: Florian Schulze <florian.schulze at gmx.net>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M .gitignore
    M MANIFEST.in
    M README.rst
    R helper_test_a.py
    R helper_test_b.py
    R pytest_warnings.py
    A pytest_warnings/__init__.py
    M setup.py
    R test_warnings.py
    R test_warnings2.py
    A tests/helper_test_a.py
    A tests/helper_test_b.py
    A tests/test_warnings.py
    A tests/test_warnings2.py
    M tox.ini

  Log Message:
  -----------
  Bump version, add changelog entry and move stuff around for added coverage reporting.


  Commit: ce138060acd9107efac1365a96b14ee8e839c0d9
      https://github.com/pytest-dev/pytest/commit/ce138060acd9107efac1365a96b14ee8e839c0d9
  Author: Florian Schulze <florian.schulze at gmx.net>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Prepare pytest-warnings 0.2.0.


  Commit: 6ec0c3f3690efb500155a44b65c0f1719dad905b
      https://github.com/pytest-dev/pytest/commit/6ec0c3f3690efb500155a44b65c0f1719dad905b
  Author: Florian Schulze <florian.schulze at gmx.net>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M README.rst
    M setup.py

  Log Message:
  -----------
  Bump.


  Commit: 377e649e615f36e6c526dceb8249211633952cce
      https://github.com/pytest-dev/pytest/commit/377e649e615f36e6c526dceb8249211633952cce
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/capture.py

  Log Message:
  -----------
  local merge of #1967 - Change exception raised by capture.DontReadFromInput.fileno()


  Commit: e9668d75b80057441b53c65c84c9a6351b6c87cb
      https://github.com/pytest-dev/pytest/commit/e9668d75b80057441b53c65c84c9a6351b6c87cb
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M _pytest/recwarn.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  turn RecordedWarning into a namedtuple

fixes #2013


  Commit: b3c337db005770d15f5717b4ec27b5ccbce751a3
      https://github.com/pytest-dev/pytest/commit/b3c337db005770d15f5717b4ec27b5ccbce751a3
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/recwarn.rst

  Log Message:
  -----------
  add changelog entry and documentation note about RecordedWarning


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

  Changed paths:
    M CHANGELOG.rst
    M _pytest/recwarn.py
    M doc/en/recwarn.rst
    M testing/test_recwarn.py

  Log Message:
  -----------
  Merge pull request #2014 from RonnyPfannschmidt/warning-record-namedtuple

turn RecordedWarning into a namedtuple


  Commit: efc54b2e561b101bffd79c711a4e1038814a4ce5
      https://github.com/pytest-dev/pytest/commit/efc54b2e561b101bffd79c711a4e1038814a4ce5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M MANIFEST.in
    M README.rst
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/junitxml.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    M appveyor.yml
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.0.4.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/talks.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    R plugin-test.sh
    R requirements-docs.txt
    R runtox.py
    M setup.py
    M testing/code/test_excinfo.py
    M testing/python/raises.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_junitxml.py
    M testing/test_pdb.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M tox.ini

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


  Commit: 0fab78ee8f444a8815fcd7603b35c2cbb7301fed
      https://github.com/pytest-dev/pytest/commit/0fab78ee8f444a8815fcd7603b35c2cbb7301fed
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M MANIFEST.in
    M README.rst
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/junitxml.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    M appveyor.yml
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.0.4.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/talks.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    R plugin-test.sh
    R requirements-docs.txt
    R runtox.py
    M setup.py
    M testing/code/test_excinfo.py
    M testing/python/raises.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_junitxml.py
    M testing/test_pdb.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2054 from nicoddemus/merge-master-features

Merge master into features after 3.0.4 release


  Commit: 6876ba9ba6b6a54e132d6fbadcad56038109ad44
      https://github.com/pytest-dev/pytest/commit/6876ba9ba6b6a54e132d6fbadcad56038109ad44
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-11-13 (Sun, 13 Nov 2016)

  Changed paths:
    M _pytest/assertion/__init__.py
    A _pytest/assertion/truncate.py
    M testing/test_assertion.py

  Log Message:
  -----------
  Merge pull request #1995 from mattduck/feat/restructure-assert-truncation

Restructure truncation of assertion messages


  Commit: 75740337d19d20d4e098d5fb5384989388b6d3f6
      https://github.com/pytest-dev/pytest/commit/75740337d19d20d4e098d5fb5384989388b6d3f6
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2016-11-13 (Sun, 13 Nov 2016)

  Changed paths:
    M .travis.yml
    M MANIFEST.in
    M appveyor.yml
    M doc/en/talks.rst
    A scripts/check-manifest.py
    A scripts/install-pypy.bat
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2060 from pytest-dev/master

Merge master into features due to recent CI updates


  Commit: e31421a5d242739f44531cfc6525984c5f99046d
      https://github.com/pytest-dev/pytest/commit/e31421a5d242739f44531cfc6525984c5f99046d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    R .gitignore
    R LICENSE
    R MANIFEST.in
    R README.rst
    R pytest_warnings/__init__.py
    R setup.py
    R tests/helper_test_a.py
    R tests/helper_test_b.py
    R tests/test_warnings.py
    R tests/test_warnings2.py
    R tox.ini
    A warnings-root/.gitignore
    A warnings-root/LICENSE
    A warnings-root/MANIFEST.in
    A warnings-root/README.rst
    A warnings-root/pytest_warnings/__init__.py
    A warnings-root/setup.py
    A warnings-root/tests/helper_test_a.py
    A warnings-root/tests/helper_test_b.py
    A warnings-root/tests/test_warnings.py
    A warnings-root/tests/test_warnings2.py
    A warnings-root/tox.ini

  Log Message:
  -----------
  Moving all stuff to a subdirectory to try to retain history


  Commit: 9db32aea48a945f00fc29409dc2a7fad566e9cd3
      https://github.com/pytest-dev/pytest/commit/9db32aea48a945f00fc29409dc2a7fad566e9cd3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    A warnings-root/.gitignore
    A warnings-root/LICENSE
    A warnings-root/MANIFEST.in
    A warnings-root/README.rst
    A warnings-root/pytest_warnings/__init__.py
    A warnings-root/setup.py
    A warnings-root/tests/helper_test_a.py
    A warnings-root/tests/helper_test_b.py
    A warnings-root/tests/test_warnings.py
    A warnings-root/tests/test_warnings2.py
    A warnings-root/tox.ini

  Log Message:
  -----------
  Merge c:\pytest-warnings\ into integrate-pytest-warnings


  Commit: 1da19064839d7773ddc01489ae237c389cf35514
      https://github.com/pytest-dev/pytest/commit/1da19064839d7773ddc01489ae237c389cf35514
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    A _pytest/warnings.py
    R warnings-root/.gitignore
    R warnings-root/LICENSE
    R warnings-root/MANIFEST.in
    R warnings-root/README.rst
    R warnings-root/pytest_warnings/__init__.py
    R warnings-root/setup.py
    R warnings-root/tests/helper_test_a.py
    R warnings-root/tests/helper_test_b.py
    R warnings-root/tests/test_warnings.py
    R warnings-root/tests/test_warnings2.py
    R warnings-root/tox.ini

  Log Message:
  -----------
  Rename code to _pytest.warnings and delete old files from the repository


  Commit: 26ca5a702e2655302a1aeec08a82c8f474f8425f
      https://github.com/pytest-dev/pytest/commit/26ca5a702e2655302a1aeec08a82c8f474f8425f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M _pytest/config.py
    A testing/test_warnings.py

  Log Message:
  -----------
  Add tests and integrated the original code into the core


  Commit: 5ce551e469fa16a292227815e8fb1a8dd779bfa9
      https://github.com/pytest-dev/pytest/commit/5ce551e469fa16a292227815e8fb1a8dd779bfa9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/junitxml.py
    M _pytest/mark.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_runner.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2075 from pytest-dev/master

Merge master into features after fixing flake8 errors


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

  Changed paths:
    M CHANGELOG.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/junitxml.py
    M _pytest/mark.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_runner.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings


  Commit: b30a6d22c5329f6befe88fb35023fe7e4f1e17fe
      https://github.com/pytest-dev/pytest/commit/b30a6d22c5329f6befe88fb35023fe7e4f1e17fe
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-11-27 (Sun, 27 Nov 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    M _pytest/assertion/rewrite.py
    M _pytest/config.py
    M _pytest/main.py
    M _pytest/python.py
    M appveyor.yml
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/recwarn.rst
    A scripts/call-tox.bat
    M testing/python/approx.py
    M testing/test_assertrewrite.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M tox.ini

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


  Commit: 36eb5b36d1c4b29ac217b1faddef16336843b3a5
      https://github.com/pytest-dev/pytest/commit/36eb5b36d1c4b29ac217b1faddef16336843b3a5
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2016-11-27 (Sun, 27 Nov 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    M _pytest/assertion/rewrite.py
    M _pytest/config.py
    M _pytest/main.py
    M _pytest/python.py
    M appveyor.yml
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/recwarn.rst
    A scripts/call-tox.bat
    M testing/python/approx.py
    M testing/test_assertrewrite.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2096 from nicoddemus/merge-master-into-features

Merge master into features


  Commit: ed977513ec6af2e9015e6f6eee6e6b2a0b48e2c5
      https://github.com/pytest-dev/pytest/commit/ed977513ec6af2e9015e6f6eee6e6b2a0b48e2c5
  Author: Manuel Krebber <manuel.krebber at granikos.eu>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M _pytest/doctest.py
    M doc/en/doctest.rst

  Log Message:
  -----------
  Added a console option to specify the encoding to use for doctest files. Defaults to UTF-8.


  Commit: d254c6b0aeb872a791889d5e3497fa3ca679c482
      https://github.com/pytest-dev/pytest/commit/d254c6b0aeb872a791889d5e3497fa3ca679c482
  Author: Manuel Krebber <manuel.krebber at granikos.eu>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

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

  Log Message:
  -----------
  Added some tests for --docstring-encoding option. Added option to specify encoding for internal testdir._makefile() for the tests.


  Commit: 929912de2920fdf82a2b5303e9585803368234cd
      https://github.com/pytest-dev/pytest/commit/929912de2920fdf82a2b5303e9585803368234cd
  Author: Manuel Krebber <manuel.krebber at granikos.eu>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M testing/test_doctest.py

  Log Message:
  -----------
  Changed the tests to pass on python 2 as well.


  Commit: c043bbb8545eecf991cda9bfab95b78bae9ecd08
      https://github.com/pytest-dev/pytest/commit/c043bbb8545eecf991cda9bfab95b78bae9ecd08
  Author: Manuel Krebber <manuel.krebber at granikos.eu>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M _pytest/doctest.py
    M testing/test_doctest.py

  Log Message:
  -----------
  Changed the doctest_encoding option to an ini option.
Parametrized the tests for it.


  Commit: 1f62e5b5a0fd0ec8ab13e409eb2cd5e198ec88a0
      https://github.com/pytest-dev/pytest/commit/1f62e5b5a0fd0ec8ab13e409eb2cd5e198ec88a0
  Author: Manuel Krebber <manuel.krebber at granikos.eu>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst

  Log Message:
  -----------
  Added CHANGELOG entry and myself to AUTHORS.


  Commit: b7fb9fac91069d2d193b78265567f0d3c5673669
      https://github.com/pytest-dev/pytest/commit/b7fb9fac91069d2d193b78265567f0d3c5673669
  Author: Manuel Krebber <manuel.krebber at granikos.eu>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M doc/en/doctest.rst

  Log Message:
  -----------
  Fixed the documentation for doctest_encoding.


  Commit: f8fef07b4c1399ff84b41a3fa4d28d93cc578fc4
      https://github.com/pytest-dev/pytest/commit/f8fef07b4c1399ff84b41a3fa4d28d93cc578fc4
  Author: Manuel Krebber <manuel.krebber at granikos.eu>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M testing/test_doctest.py

  Log Message:
  -----------
  Fixed the tests for python 2.6


  Commit: f5afd8cb541549aaf595dbd7ea730becf23e3ee3
      https://github.com/pytest-dev/pytest/commit/f5afd8cb541549aaf595dbd7ea730becf23e3ee3
  Author: Luke Murphy <lukewm at riseup.net>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/compat.py
    M _pytest/python.py
    M testing/test_collection.py

  Log Message:
  -----------
  Add missing `__test__` check for test discovery.


  Commit: 2edfc805afefbbabdeccdb9b4e9fd6ab89335008
      https://github.com/pytest-dev/pytest/commit/2edfc805afefbbabdeccdb9b4e9fd6ab89335008
  Author: Wheerd <admin at wheerd.de>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M doc/en/doctest.rst

  Log Message:
  -----------
  Added "versionadded" for doctest_encoding ini option to docs.


  Commit: 9c224c94f07ab214b8b3666e4b5a8dcc57f3f628
      https://github.com/pytest-dev/pytest/commit/9c224c94f07ab214b8b3666e4b5a8dcc57f3f628
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/compat.py
    M _pytest/python.py
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #2099 from lwm/fixup-2007

Add missing `__test__` check for discovery


  Commit: 669332b7e0e75f2d3a362622663ba95854c6639e
      https://github.com/pytest-dev/pytest/commit/669332b7e0e75f2d3a362622663ba95854c6639e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/doctest.py
    M _pytest/pytester.py
    M doc/en/doctest.rst
    M testing/test_doctest.py

  Log Message:
  -----------
  Merge pull request #2101 from wheerd/doctest-encoding

Added doctest encoding command line option


  Commit: 402fbe503aa6aaf2039356069c4b4297f980c60d
      https://github.com/pytest-dev/pytest/commit/402fbe503aa6aaf2039356069c4b4297f980c60d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-12-27 (Tue, 27 Dec 2016)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/helpconfig.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/setuponly.py
    M appveyor.yml
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.0.5.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M setup.py
    M testing/python/approx.py
    M testing/test_assertrewrite.py
    A testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_pluginmanager.py
    M testing/test_recwarn.py
    M tox.ini

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


  Commit: 964ccb93bbdcb2a07f6ad6148c3a91071dc05b56
      https://github.com/pytest-dev/pytest/commit/964ccb93bbdcb2a07f6ad6148c3a91071dc05b56
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2016-12-28 (Wed, 28 Dec 2016)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/helpconfig.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/setuponly.py
    M appveyor.yml
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.0.5.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M setup.py
    M testing/python/approx.py
    M testing/test_assertrewrite.py
    A testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_pluginmanager.py
    M testing/test_recwarn.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2163 from nicoddemus/merge-master-into-features

Merge master into features


  Commit: a9193a15310138981b2b56f7db69c1c2a6471ea1
      https://github.com/pytest-dev/pytest/commit/a9193a15310138981b2b56f7db69c1c2a6471ea1
  Author: Rafael Bertoldi <bertoldi at esss.com.br>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/python.py
    M testing/python/metafunc.py

  Log Message:
  -----------
  No longer silently ignore errors in parametrize callable ids


  Commit: 8f1450114f2b7f147d022db4535f14645beebc3b
      https://github.com/pytest-dev/pytest/commit/8f1450114f2b7f147d022db4535f14645beebc3b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/python.py
    M testing/python/metafunc.py

  Log Message:
  -----------
  Merge pull request #2167 from fogo/parametrize-ids-silent-failure

No longer silently ignore errors in parametrize callable ids


  Commit: 6fd0394c6317dc8acf2d1c58e2bad2379703214a
      https://github.com/pytest-dev/pytest/commit/6fd0394c6317dc8acf2d1c58e2bad2379703214a
  Author: Lo?c Est?ve <loic.esteve at ymail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/recwarn.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  pytest.warns checks for subclass relationship

rather than class equality. This makes it more similar to
pytest.raises.


  Commit: 56d1858ea2915e6ba765d6bf337b1b19de832f25
      https://github.com/pytest-dev/pytest/commit/56d1858ea2915e6ba765d6bf337b1b19de832f25
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Remove duplicate '@lesteve' link from CHANGELOG


  Commit: 0bd8159b608c57a1467ee1b67b6170335beb6b61
      https://github.com/pytest-dev/pytest/commit/0bd8159b608c57a1467ee1b67b6170335beb6b61
  Author: Lo?c Est?ve <loic.esteve at ymail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M testing/test_recwarn.py

  Log Message:
  -----------
  Add a test when multiple classes are specified in warns


  Commit: 7930a8373dbc520412a36203ca945e83e98b2a1c
      https://github.com/pytest-dev/pytest/commit/7930a8373dbc520412a36203ca945e83e98b2a1c
  Author: Lo?c Est?ve <loic.esteve at ymail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M testing/test_recwarn.py

  Log Message:
  -----------
  Newline for flake8


  Commit: 9e9547a9e4436bd6e7af2590e6f5bf3b1b024ad8
      https://github.com/pytest-dev/pytest/commit/9e9547a9e4436bd6e7af2590e6f5bf3b1b024ad8
  Author: Lo?c Est?ve <loic.esteve at ymail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M _pytest/recwarn.py

  Log Message:
  -----------
  Simplify condition


  Commit: 3494dd06fe3ad8978ecf67e7123969826c5fba08
      https://github.com/pytest-dev/pytest/commit/3494dd06fe3ad8978ecf67e7123969826c5fba08
  Author: Lo?c Est?ve <loic.esteve at ymail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Remove duplicate target in rst


  Commit: d4afa1554b225d11565d5fb81136edea51c54b0d
      https://github.com/pytest-dev/pytest/commit/d4afa1554b225d11565d5fb81136edea51c54b0d
  Author: mandeep <mandeep at users.noreply.github.com>
  Date:   2017-01-08 (Sun, 08 Jan 2017)

  Changed paths:
    M _pytest/_argcomplete.py
    M _pytest/assertion/__init__.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/vendored_packages/pluggy.py

  Log Message:
  -----------
  Refactored old style classes to new style classes


  Commit: e412ea1d5a245ecb5f06b17a6ae0f6abdc391418
      https://github.com/pytest-dev/pytest/commit/e412ea1d5a245ecb5f06b17a6ae0f6abdc391418
  Author: mandeep <mandeep at users.noreply.github.com>
  Date:   2017-01-10 (Tue, 10 Jan 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst

  Log Message:
  -----------
  Added name to AUTHORS and change to CHANGELOG


  Commit: 6c011f43e9804f3cf1123ac8ae9f183fb98a8788
      https://github.com/pytest-dev/pytest/commit/6c011f43e9804f3cf1123ac8ae9f183fb98a8788
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-01-10 (Tue, 10 Jan 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_argcomplete.py
    M _pytest/assertion/__init__.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/vendored_packages/pluggy.py

  Log Message:
  -----------
  Merge pull request #2179 from mandeep/new-style-classes

Refactored old style classes to new style classes


  Commit: 123289a88ee01cfc3083fee22e0161cf4c9e4087
      https://github.com/pytest-dev/pytest/commit/123289a88ee01cfc3083fee22e0161cf4c9e4087
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/compat.py
    M testing/test_compat.py

  Log Message:
  -----------
  fixes #2208 by introducing a iteration limit


  Commit: 250597d468149121fd6d8ae8f867fbe8faf843a2
      https://github.com/pytest-dev/pytest/commit/250597d468149121fd6d8ae8f867fbe8faf843a2
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M _pytest/compat.py

  Log Message:
  -----------
  get_real_func: use saferepr when formatting the error message


  Commit: 88f7befabb8ec53fb165bd892db66a9d43d8ec77
      https://github.com/pytest-dev/pytest/commit/88f7befabb8ec53fb165bd892db66a9d43d8ec77
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/compat.py
    M testing/test_compat.py

  Log Message:
  -----------
  Merge pull request #2209 from RonnyPfannschmidt/bugfix-2208/get_real_func_loop_limit

fixes #2208 by introducing a iteration limit


  Commit: c848d0a771c41b25a3bd8ff8e29cc5493b116a25
      https://github.com/pytest-dev/pytest/commit/c848d0a771c41b25a3bd8ff8e29cc5493b116a25
  Author: Ravi Chandra <rc at braveface.nz>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/hookspec.py
    M _pytest/python.py
    M testing/python/metafunc.py

  Log Message:
  -----------
  Pass parameter name to `make_parametrize_id` hook function


  Commit: 0e58c3fa80465a009c9c4d5b4500e73dd32ca80f
      https://github.com/pytest-dev/pytest/commit/0e58c3fa80465a009c9c4d5b4500e73dd32ca80f
  Author: Ravi Chandra <rc at braveface.nz>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/hookspec.py
    M testing/python/metafunc.py

  Log Message:
  -----------
  updates for PR review #2198


  Commit: 34e98bce0aecbe16cf76be8e594c5700e092f9b0
      https://github.com/pytest-dev/pytest/commit/34e98bce0aecbe16cf76be8e594c5700e092f9b0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/hookspec.py
    M _pytest/python.py
    M testing/python/metafunc.py

  Log Message:
  -----------
  Merge pull request #2198 from unsignedint/make-parametrize-enhancement

Enhancement to `make_parametrize_id`hook function


  Commit: 713bdc1f9f3c5e86e6ee1b0913c8a94470a4223e
      https://github.com/pytest-dev/pytest/commit/713bdc1f9f3c5e86e6ee1b0913c8a94470a4223e
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/config.py
    M _pytest/main.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/skipping.py
    M appveyor.yml
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.2.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.1.rst
    M doc/en/announce/release-2.9.2.rst
    A doc/en/announce/release-3.0.6.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/conf.py
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/faq.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/monkeypatch.rst
    M doc/en/parametrize.rst
    M doc/en/projects.rst
    M doc/en/skipping.rst
    M doc/en/test/plugin/xdist.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M setup.cfg
    M setup.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_config.py
    M testing/test_monkeypatch.py
    M testing/test_pytester.py
    M tox.ini

  Log Message:
  -----------
  merge master into features


  Commit: 3f30c228944f1a7ee93c80162954ca7fdc3dd896
      https://github.com/pytest-dev/pytest/commit/3f30c228944f1a7ee93c80162954ca7fdc3dd896
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  fix changelog merge mistake


  Commit: 3b47cb45e6e442a4a45934b4d885be12191c2358
      https://github.com/pytest-dev/pytest/commit/3b47cb45e6e442a4a45934b4d885be12191c2358
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/config.py
    M _pytest/main.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/skipping.py
    M appveyor.yml
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.2.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.1.rst
    M doc/en/announce/release-2.9.2.rst
    A doc/en/announce/release-3.0.6.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/conf.py
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/faq.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/monkeypatch.rst
    M doc/en/parametrize.rst
    M doc/en/projects.rst
    M doc/en/skipping.rst
    M doc/en/test/plugin/xdist.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M setup.cfg
    M setup.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_config.py
    M testing/test_monkeypatch.py
    M testing/test_pytester.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2222 from RonnyPfannschmidt/features

merge master into features


  Commit: 43662ce789cdc87c478ff3c1a8314c7b51efa3bc
      https://github.com/pytest-dev/pytest/commit/43662ce789cdc87c478ff3c1a8314c7b51efa3bc
  Author: Thomas Kriechbaumer <thomas at kriechbaumer.name>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/python.py
    M testing/python/raises.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  allow error message matching in pytest.raises


  Commit: abbff681babdfc788871b77cc7126bf0a63e9f6b
      https://github.com/pytest-dev/pytest/commit/abbff681babdfc788871b77cc7126bf0a63e9f6b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    M testing/python/raises.py

  Log Message:
  -----------
  Fix '{0}' format for py26


  Commit: 208fae5bf0ecbbb5a6da7017e4f689ede92a6246
      https://github.com/pytest-dev/pytest/commit/208fae5bf0ecbbb5a6da7017e4f689ede92a6246
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/python.py
    M testing/python/raises.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  Merge pull request #2227 from Kriechi/raises-info

add matching the error message to pytest.raises


  Commit: 91c6bef77a674d5cd79af464e5c19745427b5510
      https://github.com/pytest-dev/pytest/commit/91c6bef77a674d5cd79af464e5c19745427b5510
  Author: Florian Bruhin <git at the-compiler.org>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/main.py
    M doc/en/customize.rst

  Log Message:
  -----------
  Add venv to the default norecursedirs

venv (without a dot) is commonly used as a name for a virtualenv directory, and
we don't want to collect that.


  Commit: da828aac055a65a2127ba4208d973be6d4150a31
      https://github.com/pytest-dev/pytest/commit/da828aac055a65a2127ba4208d973be6d4150a31
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/main.py
    M doc/en/customize.rst

  Log Message:
  -----------
  Merge pull request #2253 from The-Compiler/norecursedirs

Add venv to the default norecursedirs


  Commit: fb0b90646ec86ced32d146ee42e25f4cd72d2229
      https://github.com/pytest-dev/pytest/commit/fb0b90646ec86ced32d146ee42e25f4cd72d2229
  Author: Michal Wajszczuk <wajszczuk.m at gmail.com>
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/vendored_packages/pluggy.py
    M doc/en/assert.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/attic.rst
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/skipping.rst
    M doc/en/test/attic.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py

  Log Message:
  -----------
  New-style classes implemented for python 2.7 - #2147


  Commit: abd6ad37515ba12da0e91c6c7a68af77a37395ef
      https://github.com/pytest-dev/pytest/commit/abd6ad37515ba12da0e91c6c7a68af77a37395ef
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/vendored_packages/pluggy.py
    M doc/en/assert.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/attic.rst
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/skipping.rst
    M doc/en/test/attic.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Merge pull request #2260 from MichalTHEDUDE/feature/NewStyleClasses-2147

New-style classes implemented for python 2.7 - #2147


  Commit: f1900bbea6d7402fb511d84d2b1e58e17b59a03d
      https://github.com/pytest-dev/pytest/commit/f1900bbea6d7402fb511d84d2b1e58e17b59a03d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-02-18 (Sat, 18 Feb 2017)

  Changed paths:
    M _pytest/vendored_packages/pluggy.py

  Log Message:
  -----------
  Revert subclassing explicitly from object introduced by accident in #2260


  Commit: a7643a5fbe462acfee2759f76f5b4bc08689194f
      https://github.com/pytest-dev/pytest/commit/a7643a5fbe462acfee2759f76f5b4bc08689194f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-02-18 (Sat, 18 Feb 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/vendored_packages/pluggy.py
    M appveyor.yml
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.2.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.1.rst
    M doc/en/announce/release-2.9.2.rst
    A doc/en/announce/release-3.0.5.rst
    A doc/en/announce/release-3.0.6.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/conf.py
    M doc/en/customize.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/attic.rst
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/faq.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/monkeypatch.rst
    M doc/en/parametrize.rst
    M doc/en/projects.rst
    M doc/en/recwarn.rst
    M doc/en/skipping.rst
    M doc/en/test/attic.rst
    M doc/en/test/plugin/xdist.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    A scripts/call-tox.bat
    M setup.cfg
    M setup.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    A testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'features' into integrate-pytest-warnings


  Commit: 82785fcd4025c6827f504ce082d99116bff54e11
      https://github.com/pytest-dev/pytest/commit/82785fcd4025c6827f504ce082d99116bff54e11
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-02-18 (Sat, 18 Feb 2017)

  Changed paths:
    M _pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Use warnings.catch_warnings instead of WarningsRecorder

This has the benefical side-effect of not calling the original
warnings.showwarnings function, which in its original form
only writes the formatted warning to sys.stdout.

Calling the original warnings.showwarnings has the effect that nested WarningsRecorder all catch the warnings:

with WarningsRecorder() as rec1:
    with WarningsRecorder() as rec2:
  warnings.warn(UserWarning, 'some warning')

(both rec1 and rec2 sees the warning)

When running tests with `testdir`, the main pytest session would then see the warnings created by
the internal code being tested (if any), and the main pytest session would end up with warnings as well.


  Commit: 44ad369c17b2e878875cfa809a4908462aac1b1d
      https://github.com/pytest-dev/pytest/commit/44ad369c17b2e878875cfa809a4908462aac1b1d
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-02-19 (Sun, 19 Feb 2017)

  Changed paths:
    M _pytest/vendored_packages/pluggy.py

  Log Message:
  -----------
  Merge pull request #2263 from nicoddemus/revert-pluggy

Revert subclassing explicitly from object introduced by accident in #2260


  Commit: 6ba3475448d3ab78b4bf7de9aa81baa47357a70d
      https://github.com/pytest-dev/pytest/commit/6ba3475448d3ab78b4bf7de9aa81baa47357a70d
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2017-02-23 (Thu, 23 Feb 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/capture.py
    M _pytest/compat.py
    M testing/test_capture.py

  Log Message:
  -----------
  Make capsys more like stdio streams in python3.  Resolves #1407.


  Commit: 8b598f00e9f06a366eef36826070e42e7673fa24
      https://github.com/pytest-dev/pytest/commit/8b598f00e9f06a366eef36826070e42e7673fa24
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2017-02-23 (Thu, 23 Feb 2017)

  Changed paths:
    M _pytest/pytester.py

  Log Message:
  -----------
  Make pytester use pytest's capture implementation


  Commit: 0f3d7acdc476c65318e454c26927af4d08217fd3
      https://github.com/pytest-dev/pytest/commit/0f3d7acdc476c65318e454c26927af4d08217fd3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/pytester.py
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2266 from asottile/capture_v2

Make capsys more like stdio streams in python3. Resolves #1407.


  Commit: 26e50f116233e64d56aef40d491679e76e8d38a1
      https://github.com/pytest-dev/pytest/commit/26e50f116233e64d56aef40d491679e76e8d38a1
  Author: Katerina Koukiou <kkoukiou at redhat.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/junitxml.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  junitxml: adjust junitxml output file to comply with JUnit xsd

Change XML file structure in the manner that failures in call and errors
in teardown in one test will appear under separate testcase elements in
the XML report.


  Commit: 0c94f517a18bc135fe80a07a64c8c74c27b41dcb
      https://github.com/pytest-dev/pytest/commit/0c94f517a18bc135fe80a07a64c8c74c27b41dcb
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/junitxml.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #2236 from KKoukiou/junitxml-change-schema

Change junitxml.py to produce results that comply with Junitxml schema


  Commit: e24081bf76568cb4fc7b96b981c752647231fc5b
      https://github.com/pytest-dev/pytest/commit/e24081bf76568cb4fc7b96b981c752647231fc5b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M _pytest/terminal.py
    M _pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Change warning output


  Commit: de09023e450462f78a562ea802b9d327af19661d
      https://github.com/pytest-dev/pytest/commit/de09023e450462f78a562ea802b9d327af19661d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M _pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Also capture warnings during setup/teardown


  Commit: bddb922f7bd39c378fb97d42ed04d49108c27362
      https://github.com/pytest-dev/pytest/commit/bddb922f7bd39c378fb97d42ed04d49108c27362
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M _pytest/terminal.py

  Log Message:
  -----------
  Rename internal option to disable_warnings


  Commit: 272afa9422abff0070b47973ab69ccaca6fadeb1
      https://github.com/pytest-dev/pytest/commit/272afa9422abff0070b47973ab69ccaca6fadeb1
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M _pytest/terminal.py
    M _pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Display node ids and the warnings generated by it

The rationale of using node ids is that users can copy/paste it to run a chosen test


  Commit: 1e0cf5ce4dcd8b110a45261595d69a502dd0226a
      https://github.com/pytest-dev/pytest/commit/1e0cf5ce4dcd8b110a45261595d69a502dd0226a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/cacheprovider.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M doc/en/assert.rst
    M doc/en/fixture.rst
    M doc/en/talks.rst
    M doc/en/writing_plugins.rst
    M testing/python/collect.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_pdb.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

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

# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py


  Commit: d1ea7c8cc8f304ba90900bdef0cfa73395a0fbd5
      https://github.com/pytest-dev/pytest/commit/d1ea7c8cc8f304ba90900bdef0cfa73395a0fbd5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/cacheprovider.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M doc/en/assert.rst
    M doc/en/fixture.rst
    M doc/en/talks.rst
    M doc/en/writing_plugins.rst
    M testing/python/collect.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_pdb.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2301 from nicoddemus/merge-master-into-features

Merge master into features


  Commit: 22864b75ee080c8c600813b4f8985d2a70870dcb
      https://github.com/pytest-dev/pytest/commit/22864b75ee080c8c600813b4f8985d2a70870dcb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M _pytest/recwarn.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  Refactor recwarn to use warnings.catch_warnings instead of custom code

Since we dropped 2.5, we can now use warnings.catch_warnings to do the
"catch warnings" magic for us, simplifying the code a bit.


  Commit: 3c07072bfd3580bcd1b7334f77d2352cb8a9814d
      https://github.com/pytest-dev/pytest/commit/3c07072bfd3580bcd1b7334f77d2352cb8a9814d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M testing/test_recwarn.py

  Log Message:
  -----------
  Fix test_recwarn in Python 3.6

No longer test for implementation details of recwarn since warnings.catch_warnings has changed
significantly in 3.6.


  Commit: 6c9011c12fd3b14d09562c6d391319e70883eef9
      https://github.com/pytest-dev/pytest/commit/6c9011c12fd3b14d09562c6d391319e70883eef9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.0.7.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Merge branch 'master' into merge-master-into-features-post-3.0.7


  Commit: 55b891ddd01dffaa6468afdead5719c807517670
      https://github.com/pytest-dev/pytest/commit/55b891ddd01dffaa6468afdead5719c807517670
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.0.7.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Merge pull request #2312 from nicoddemus/merge-master-into-features-post-3.0.7

Merge master into features post 3.0.7


  Commit: 5482dfe0f3cf313e69c83cdd21f661a8c05a64ac
      https://github.com/pytest-dev/pytest/commit/5482dfe0f3cf313e69c83cdd21f661a8c05a64ac
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M _pytest/recwarn.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  Merge pull request #2303 from nicoddemus/recwarn-refactor

Refactor recwarn to use warnings.catch_warnings instead of custom code


  Commit: 337f891d7808b081161238bbb2391f7e8e2d66ec
      https://github.com/pytest-dev/pytest/commit/337f891d7808b081161238bbb2391f7e8e2d66ec
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M testing/deprecated_test.py
    M testing/test_assertion.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_pluginmanager.py
    M testing/test_terminal.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Fixed tests


  Commit: 0baed781fe417b1c5e4481088245ecb48a8abc56
      https://github.com/pytest-dev/pytest/commit/0baed781fe417b1c5e4481088245ecb48a8abc56
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/vendored_packages/pluggy.py
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.0.7.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/talks.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M testing/python/collect.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_pdb.py
    M testing/test_recwarn.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings


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

  Changed paths:
    M _pytest/recwarn.py
    M _pytest/warnings.py
    M testing/test_recwarn.py

  Log Message:
  -----------
  Capture warnings around the entire runtestprotocol

This is necessary for the warnings plugin to play nice with the
recwarn fixture


  Commit: 78194093afe6bbb82aa2e636b67046ce96b7c238
      https://github.com/pytest-dev/pytest/commit/78194093afe6bbb82aa2e636b67046ce96b7c238
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/terminal.py
    M testing/deprecated_test.py
    M testing/python/collect.py
    M testing/test_assertion.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Improve warning representation in terminal plugin and fix tests


  Commit: 7684b3af7b33fc02887d608029b1000b1ac286af
      https://github.com/pytest-dev/pytest/commit/7684b3af7b33fc02887d608029b1000b1ac286af
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Recommend using py36 for testing on CONTRIBUTING


  Commit: 42a5d6bdfa620fc13809c861a05077ef6d6f2a6a
      https://github.com/pytest-dev/pytest/commit/42a5d6bdfa620fc13809c861a05077ef6d6f2a6a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M _pytest/_argcomplete.py
    M _pytest/_code/__init__.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Add __future__ imports to all pytest modules

This prevents silly errors from creeping in Python 2 when testing in Python 3


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

  Changed paths:
    M _pytest/pytester.py
    M _pytest/resultlog.py
    M testing/python/collect.py
    M testing/test_capture.py
    M testing/test_mark.py

  Log Message:
  -----------
  Replace py.builtin.print_() calls by builtin print() function


  Commit: 4d947077bbed4862d4e0a055ce967ba490be96af
      https://github.com/pytest-dev/pytest/commit/4d947077bbed4862d4e0a055ce967ba490be96af
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Fix test in py26 that expected a floor division error message


  Commit: a122ae85e9bc7cd494c505818dea4032c916ae1d
      https://github.com/pytest-dev/pytest/commit/a122ae85e9bc7cd494c505818dea4032c916ae1d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-03-17 (Fri, 17 Mar 2017)

  Changed paths:
    M CONTRIBUTING.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/__init__.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    M testing/python/collect.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Merge pull request #2316 from nicoddemus/add-future-imports

Add __future__ imports to all pytest modules


  Commit: e368fb4b29912fe618d523b2ca9197016738d7d6
      https://github.com/pytest-dev/pytest/commit/e368fb4b29912fe618d523b2ca9197016738d7d6
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-17 (Fri, 17 Mar 2017)

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    M doc/en/parametrize.rst
    M testing/python/metafunc.py
    M testing/test_mark.py

  Log Message:
  -----------
  implement pytest.param

this allows a clear addition of parameterization parameters that carry along marks
instead of nesting multiple mark objects and destroying the possibility of creating
function valued parameters,
it just folders everything together into one object carrfying parameters, and the marks.


  Commit: e8a1b36c82aa987364452b1a40bcc1b82000fda0
      https://github.com/pytest-dev/pytest/commit/e8a1b36c82aa987364452b1a40bcc1b82000fda0
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  add changelog


  Commit: de8607deb23e34dfd8dfc22adce00e79f23a1459
      https://github.com/pytest-dev/pytest/commit/de8607deb23e34dfd8dfc22adce00e79f23a1459
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/mark.py
    M _pytest/python.py
    M doc/en/parametrize.rst
    M testing/python/metafunc.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #1921 from RonnyPfannschmidt/marked-value

introduce pytest.Marked as holder for marked parameter values


  Commit: 9f85584656c08648fb2f78ab60b43f1048f4a04d
      https://github.com/pytest-dev/pytest/commit/9f85584656c08648fb2f78ab60b43f1048f4a04d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M _pytest/_argcomplete.py
    M _pytest/_code/__init__.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M doc/en/parametrize.rst
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    M testing/python/collect.py
    M testing/python/metafunc.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings


  Commit: 3373e02eaeaec826d64de6dc6dff36d6072fe767
      https://github.com/pytest-dev/pytest/commit/3373e02eaeaec826d64de6dc6dff36d6072fe767
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M _pytest/warnings.py

  Log Message:
  -----------
  Add __future__ imports to warnings module


  Commit: d027f760c0aad45d038617971846c20f71b9b590
      https://github.com/pytest-dev/pytest/commit/d027f760c0aad45d038617971846c20f71b9b590
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M _pytest/warnings.py

  Log Message:
  -----------
  Avoid displaying the same warning multiple times for an item


  Commit: fa56114115d8948c5960895034f6481700ffe6f2
      https://github.com/pytest-dev/pytest/commit/fa56114115d8948c5960895034f6481700ffe6f2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M _pytest/python.py
    M testing/acceptance_test.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_config.py
    M testing/test_parseopt.py
    M tox.ini

  Log Message:
  -----------
  Clean up warnings generated by pytest's own suite


  Commit: eabe3eed6b853b68b54cffe295adaf73be468eef
      https://github.com/pytest-dev/pytest/commit/eabe3eed6b853b68b54cffe295adaf73be468eef
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/recwarn.rst
    A doc/en/warnings.rst

  Log Message:
  -----------
  Add docs for the warnings functionality


  Commit: 916d272c443bf22ff73759e797be29979ec70b7a
      https://github.com/pytest-dev/pytest/commit/916d272c443bf22ff73759e797be29979ec70b7a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M testing/test_cache.py

  Log Message:
  -----------
  Fix test on linux


  Commit: 2c730743f1b80b38b044ecc08c98609df60ba375
      https://github.com/pytest-dev/pytest/commit/2c730743f1b80b38b044ecc08c98609df60ba375
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M _pytest/pytester.py
    M _pytest/runner.py
    M tox.ini

  Log Message:
  -----------
  Fix errors related to warnings raised by xdist

- pytester was creating a 'pexpect' directory to serve as temporary dir, but due to the fact that
   xdist adds the current directory to sys.path, that directory was being considered as candidate
   for import as a package. The directory is empty and a warning was being raised about
   it missing __init__ file, which is now turned into an error by our filterwarnings config
   in pytest.ini.

- Decided to play it safe and ignore any warnings during `pytest.importorskip`.

- pytest-xdist and execnet raise two warnings which should be fixed upstream:
   pytest-dev/pytest-xdist/issues/133


  Commit: 74b54ac0ec9c64d8a6693afdb3e2a6da4eef92c6
      https://github.com/pytest-dev/pytest/commit/74b54ac0ec9c64d8a6693afdb3e2a6da4eef92c6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M testing/acceptance_test.py

  Log Message:
  -----------
  Fix errors related to warnings raised on pypy test environment

For some reason pypy raises this warning in the line that the catch_warnings block was added:

______________________________ ERROR collecting  ______________________________
C:\ProgramData\chocolatey\lib\python.pypy\tools\pypy2-v5.4.1-win32\lib-python\2.7\pkgutil.py:476: in find_loader
    loader = importer.find_module(fullname)
c:\pytest\.tox\pypy\site-packages\_pytest\assertion\rewrite.py:75: in find_module
    fd, fn, desc = imp.find_module(lastname, path)
<builtin>/?:3: in anonymous
    ???
E   ImportWarning: Not importing directory 'c:\users\bruno\appdata\local\temp\pytest-of-Bruno\pytest-3192\testdir\test_cmdline_python_package0' missing __init__.py


  Commit: 0c1c2580d0d3c8d037ab3e4f5524b626068c33e5
      https://github.com/pytest-dev/pytest/commit/0c1c2580d0d3c8d037ab3e4f5524b626068c33e5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-03-22 (Wed, 22 Mar 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Add CHANGELOG entry


  Commit: 2a130daae666b294d27674afe28fef72937c927b
      https://github.com/pytest-dev/pytest/commit/2a130daae666b294d27674afe28fef72937c927b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-03-22 (Wed, 22 Mar 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/terminal.py
    A _pytest/warnings.py
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/recwarn.rst
    A doc/en/warnings.rst
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_cache.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_parseopt.py
    M testing/test_pluginmanager.py
    M testing/test_recwarn.py
    M testing/test_terminal.py
    A testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2072 from nicoddemus/integrate-pytest-warnings

Integrate pytest warnings


  Commit: 5818e65cf3407f672bfc9b50c54385e45a1ef98b
      https://github.com/pytest-dev/pytest/commit/5818e65cf3407f672bfc9b50c54385e45a1ef98b
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/assertion/__init__.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest/assertion


  Commit: fab9b993f80ce696e7be41bcd76a415a9fdce7c6
      https://github.com/pytest-dev/pytest/commit/fab9b993f80ce696e7be41bcd76a415a9fdce7c6
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/freeze_support.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.freeze_support


  Commit: 794fd5658c53a22c304c94a8f703d3e05edaa7ac
      https://github.com/pytest-dev/pytest/commit/794fd5658c53a22c304c94a8f703d3e05edaa7ac
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/debugging.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest/debugging.py


  Commit: c74103f395f5ff1d338c79fe8daa50ce472c5552
      https://github.com/pytest-dev/pytest/commit/c74103f395f5ff1d338c79fe8daa50ce472c5552
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/recwarn.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from recwarn and fixture decorators


  Commit: 6a02cdbb35cdd37518ff6522deb38ba8e3b97b97
      https://github.com/pytest-dev/pytest/commit/6a02cdbb35cdd37518ff6522deb38ba8e3b97b97
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/runner.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest/runner.py


  Commit: 90788defb24076663f8f0a89828885fd49e16076
      https://github.com/pytest-dev/pytest/commit/90788defb24076663f8f0a89828885fd49e16076
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/mark.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.mark and fix latent pytest nesting bug


  Commit: 9b755f6ec6077c2e6d49b2d893f147cc7d35cce2
      https://github.com/pytest-dev/pytest/commit/9b755f6ec6077c2e6d49b2d893f147cc7d35cce2
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/skipping.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.skipping


  Commit: 7d797b7dbfc07915c421c91a007e29ea7467bdc6
      https://github.com/pytest-dev/pytest/commit/7d797b7dbfc07915c421c91a007e29ea7467bdc6
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/hookspec.py

  Log Message:
  -----------
  add a note about the deprecation of the pytest_namespace hook


  Commit: 839c9361539aec8bf90a56cdea89ddccc8c40754
      https://github.com/pytest-dev/pytest/commit/839c9361539aec8bf90a56cdea89ddccc8c40754
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/mark.py

  Log Message:
  -----------
  _pytest.mark: fix unconfigure after bad configure, still potential bug


  Commit: 9b58d6eaca17758551929f0ebb390ad900e03581
      https://github.com/pytest-dev/pytest/commit/9b58d6eaca17758551929f0ebb390ad900e03581
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/compat.py
    M pytest.py

  Log Message:
  -----------
  prepare a own pytest.collect fake module in oder to remove the nested builtin namespaces


  Commit: 61f418a26750bd89d26aff9ad3f3cb1eb534b838
      https://github.com/pytest-dev/pytest/commit/61f418a26750bd89d26aff9ad3f3cb1eb534b838
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/fixtures.py
    M pytest.py

  Log Message:
  -----------
  hollow out pytest_namespace in _pytest.fixtures


  Commit: 99c8f2d4035a15543fefc6cef2c3abb883a97d23
      https://github.com/pytest-dev/pytest/commit/99c8f2d4035a15543fefc6cef2c3abb883a97d23
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/main.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.main


  Commit: ae234786eabeae89ece706f826dcac5dcdaca012
      https://github.com/pytest-dev/pytest/commit/ae234786eabeae89ece706f826dcac5dcdaca012
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/python.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.python


  Commit: 23bc9815c4aaf6f247df462dab665f9311e875ca
      https://github.com/pytest-dev/pytest/commit/23bc9815c4aaf6f247df462dab665f9311e875ca
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.fixtures


  Commit: 809c36e1f6d5cd837da798026f20aa62c6c7a4e2
      https://github.com/pytest-dev/pytest/commit/809c36e1f6d5cd837da798026f20aa62c6c7a4e2
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  add a changelog note for pytest_namespace


  Commit: 92f6ab188137a44479b0c6bcf209c3bf2ea31b41
      https://github.com/pytest-dev/pytest/commit/92f6ab188137a44479b0c6bcf209c3bf2ea31b41
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/compat.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/monkeypatch.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py

  Log Message:
  -----------
  fix all singular internal module imports and add a test for them


  Commit: bb750a794566c2e2b10066d37ceba49cdfba7238
      https://github.com/pytest-dev/pytest/commit/bb750a794566c2e2b10066d37ceba49cdfba7238
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    A testing/test_modimport.py

  Log Message:
  -----------
  add missed file


  Commit: 4d31ea83160331d8eb97de477bc3476d1a39653f
      https://github.com/pytest-dev/pytest/commit/4d31ea83160331d8eb97de477bc3476d1a39653f
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M testing/test_modimport.py

  Log Message:
  -----------
  add a comment explaining the modimport tests


  Commit: 7cdefce656119ec023bf371f14076c76f6782ceb
      https://github.com/pytest-dev/pytest/commit/7cdefce656119ec023bf371f14076c76f6782ceb
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/skipping.py
    M pytest.py

  Log Message:
  -----------
  fix up oversights


  Commit: 147bb8aea5b4c50f0ce432bf6d0cdf547c24cf90
      https://github.com/pytest-dev/pytest/commit/147bb8aea5b4c50f0ce432bf6d0cdf547c24cf90
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  correct setting pytest.config


  Commit: c9ab4213986c5f074a69b7abd68f0dfca8db89ba
      https://github.com/pytest-dev/pytest/commit/c9ab4213986c5f074a69b7abd68f0dfca8db89ba
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  fix python2 only import loop failure


  Commit: efe03400d8a1a32666fdbc8b9f1c38d7c085322d
      https://github.com/pytest-dev/pytest/commit/efe03400d8a1a32666fdbc8b9f1c38d7c085322d
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/nose.py
    M _pytest/unittest.py

  Log Message:
  -----------
  fixup nose/pytest plugins


  Commit: 6165939b0d957497208a93e0737ec0d937cd791b
      https://github.com/pytest-dev/pytest/commit/6165939b0d957497208a93e0737ec0d937cd791b
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  fix rebase mistakes


  Commit: ebeba79be373a06b4a5fccce3fe1fadff60eddaa
      https://github.com/pytest-dev/pytest/commit/ebeba79be373a06b4a5fccce3fe1fadff60eddaa
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/mark.py
    M pytest.py

  Log Message:
  -----------
  remove the namespace hook from mark after the param feature merge


  Commit: afb1778294bf4d4cd93d8695873d0101c3db18bf
      https://github.com/pytest-dev/pytest/commit/afb1778294bf4d4cd93d8695873d0101c3db18bf
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  put in a singular namespace hook to work around the strange issue


  Commit: 417b54abed921e4520b435cfcc87f342d376a278
      https://github.com/pytest-dev/pytest/commit/417b54abed921e4520b435cfcc87f342d376a278
  Author: reut <reut at cyberint.com>
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  added option to unicode plugin name


  Commit: 333ce9849d55b9f8de16d1c1ca4138a27281b6cf
      https://github.com/pytest-dev/pytest/commit/333ce9849d55b9f8de16d1c1ca4138a27281b6cf
  Author: reut <reut at cyberint.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M testing/acceptance_test.py

  Log Message:
  -----------
  added acceptance test for unicode plugin names


  Commit: 24ac923938efb30469ede4457a0d06f9976dade2
      https://github.com/pytest-dev/pytest/commit/24ac923938efb30469ede4457a0d06f9976dade2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Add CHANGELOG entry


  Commit: 83b241b449b0127d3d370a012f04a8f9572b3cdb
      https://github.com/pytest-dev/pytest/commit/83b241b449b0127d3d370a012f04a8f9572b3cdb
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/config.py
    M testing/acceptance_test.py

  Log Message:
  -----------
  Merge pull request #2347 from reutsharabani/features

added option to unicode plugin name


  Commit: 1b5f898dc56dca92dc8a9a2ca10daf1e7cf9291f
      https://github.com/pytest-dev/pytest/commit/1b5f898dc56dca92dc8a9a2ca10daf1e7cf9291f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Ensure rewritten modules don't inherit __future__ flags from pytest

In a recent refactoring we enabled all __future__ features in pytest
modules, but that has the unwanted side effect of propagating those
features to compile()'d modules inside assertion rewriting, unless
we pass dont_inherit=False to compile().


  Commit: 0ab85e7a9cfc6f36a37a6e79dbb73b2b83c997bc
      https://github.com/pytest-dev/pytest/commit/0ab85e7a9cfc6f36a37a6e79dbb73b2b83c997bc
  Author: Jonas Obrist <jonas.obrist at hde.co.jp>
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
    M _pytest/cacheprovider.py
    M testing/test_cache.py

  Log Message:
  -----------
  Changed behavior if --lf and --ff are both used.

When using both --last-failed/--lf and --failed-first/--ff pytest would
run all tests with failed tests first (as if --lf was not provied). This
patch changes it so that when using both flags, only the last failed
tests are run. This makes it easier to set --ff as the default behavior
via the config file and then selectively use --lf to only run the last
failed tests.


  Commit: 08d83a5c6a7c74cd00d21887731ad26a4412d7fd
      https://github.com/pytest-dev/pytest/commit/08d83a5c6a7c74cd00d21887731ad26a4412d7fd
  Author: Jonas Obrist <jonas.obrist at hde.co.jp>
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst

  Log Message:
  -----------
  updated changelog and authors files


  Commit: 1125786e787b320dd26d8c720c6ce81c72a1c838
      https://github.com/pytest-dev/pytest/commit/1125786e787b320dd26d8c720c6ce81c72a1c838
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M testing/test_cache.py

  Log Message:
  -----------
  Improve --lf/--ff test as commented during review


  Commit: 02da278894ae5b760f61b06f71c806b5366b8f1f
      https://github.com/pytest-dev/pytest/commit/02da278894ae5b760f61b06f71c806b5366b8f1f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/cacheprovider.py
    M testing/test_cache.py

  Log Message:
  -----------
  Merge pull request #2357 from ojii/lastfailed-failedfirst

Changed behavior if --lf and --ff are both used.


  Commit: 78ac1bf5d17bbf4792d045c2fea025c79f532d84
      https://github.com/pytest-dev/pytest/commit/78ac1bf5d17bbf4792d045c2fea025c79f532d84
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Merge pull request #2350 from nicoddemus/future-imports-rewrite

Ensure rewritten modules don't inherit __future__ flags from pytest


  Commit: 83c508eea3dfc4f79f85c8bc95e3649a4a15617a
      https://github.com/pytest-dev/pytest/commit/83c508eea3dfc4f79f85c8bc95e3649a4a15617a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/config.py
    M _pytest/main.py
    M testing/acceptance_test.py

  Log Message:
  -----------
  Verify hooks after collection completes

Fix #1821


  Commit: 0baf5e149988c55da937385aa0a4e40bd23663b5
      https://github.com/pytest-dev/pytest/commit/0baf5e149988c55da937385aa0a4e40bd23663b5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M testing/test_helpconfig.py

  Log Message:
  -----------
  Fix test that expected "unknown hook" error on stderr


  Commit: 731776702d6f50b65b353709f206257bb2a73b78
      https://github.com/pytest-dev/pytest/commit/731776702d6f50b65b353709f206257bb2a73b78
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M _pytest/pytester.py

  Log Message:
  -----------
  Fix hook name in LsofFdLeakChecker


  Commit: d9a2e70155a85e769d32a1e1fbe7e655203e9575
      https://github.com/pytest-dev/pytest/commit/d9a2e70155a85e769d32a1e1fbe7e655203e9575
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M _pytest/pytester.py

  Log Message:
  -----------
  Change LsofFdLeakChecker to emit a warning instead of failing when detecting leaked FDs

Related to #2366


  Commit: cac82e71d84a192a8d325618fa60bc25f9aa6158
      https://github.com/pytest-dev/pytest/commit/cac82e71d84a192a8d325618fa60bc25f9aa6158
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M _pytest/main.py
    M _pytest/terminal.py

  Log Message:
  -----------
  Improve item.warn handling of fslocation parameter

Just pass fslocation forward and let the hook implementer decide what to do with the parameter


  Commit: 80cabca21abab95884347839461a34f1aeccb464
      https://github.com/pytest-dev/pytest/commit/80cabca21abab95884347839461a34f1aeccb464
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/config.py
    M _pytest/main.py
    M _pytest/pytester.py
    M _pytest/terminal.py
    M testing/acceptance_test.py
    M testing/test_helpconfig.py

  Log Message:
  -----------
  Merge pull request #2292 from nicoddemus/defer-hook-checking

Verify hooks after collection completes


  Commit: c3aee4b1e64efa7893bcacbfde793e04f01a8dda
      https://github.com/pytest-dev/pytest/commit/c3aee4b1e64efa7893bcacbfde793e04f01a8dda
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
    M .gitignore
    M HOWTORELEASE.rst
    M _pytest/__init__.py
    M setup.py

  Log Message:
  -----------
  second take at setuptools_scm

since setuptools 18.6 fixes the issues with develop installs

https://github.com/pypa/setuptools/blob/master/CHANGES.rst#186

https://github.com/pypa/setuptools/issues/439


  Commit: 31e6fe8f52ef90adcb6a8bafcf08b26b8796b931
      https://github.com/pytest-dev/pytest/commit/31e6fe8f52ef90adcb6a8bafcf08b26b8796b931
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  HOWTORELEASE.tst: use restructuredtext autonumbering


  Commit: c0a51f56624fef1b1977a285dcf1d5430e59a94e
      https://github.com/pytest-dev/pytest/commit/c0a51f56624fef1b1977a285dcf1d5430e59a94e
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
    M scripts/check-manifest.py
    M tox.ini

  Log Message:
  -----------
  restore check-manifst functionality


  Commit: 2cf422733c0fadb43a707eb6c942425f2cc312a1
      https://github.com/pytest-dev/pytest/commit/2cf422733c0fadb43a707eb6c942425f2cc312a1
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
    M _pytest/__init__.py
    M setup.py
    M tox.ini

  Log Message:
  -----------
  restore linting, drop _pytest._version for check-manifest


  Commit: 4242bf62627f90d895f32889da43dda62775a1fa
      https://github.com/pytest-dev/pytest/commit/4242bf62627f90d895f32889da43dda62775a1fa
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-20 (Thu, 20 Apr 2017)

  Changed paths:
    M _pytest/__init__.py

  Log Message:
  -----------
  use unknown to specify unknown versions


  Commit: 25371ddbfd07c1064e26f29a7bc45df3b9928c18
      https://github.com/pytest-dev/pytest/commit/25371ddbfd07c1064e26f29a7bc45df3b9928c18
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-21 (Fri, 21 Apr 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/assertion/__init__.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/unittest.py
    M doc/en/writing_plugins.rst
    M pytest.py
    A testing/test_modimport.py

  Log Message:
  -----------
  Merge pull request #2315 from RonnyPfannschmidt/namespace-hook

remove pytest internal usage of the namespace hook


  Commit: e02cb6d7ce804d242496e50cb7e892b740290dcd
      https://github.com/pytest-dev/pytest/commit/e02cb6d7ce804d242496e50cb7e892b740290dcd
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-23 (Sun, 23 Apr 2017)

  Changed paths:
    M _pytest/__init__.py
    M setup.cfg
    M setup.py

  Log Message:
  -----------
  restore setuptools_scm write_to usage


  Commit: a280e43949a489192dd7a80ee9c982843d9b153e
      https://github.com/pytest-dev/pytest/commit/a280e43949a489192dd7a80ee9c982843d9b153e
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-26 (Wed, 26 Apr 2017)

  Changed paths:
    M _pytest/__init__.py

  Log Message:
  -----------
  fix import error


  Commit: cccb2cc92ba56033ef21c8627bb00debd6575aef
      https://github.com/pytest-dev/pytest/commit/cccb2cc92ba56033ef21c8627bb00debd6575aef
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
    M .gitignore
    M HOWTORELEASE.rst
    M _pytest/__init__.py
    M scripts/check-manifest.py
    M setup.cfg
    M setup.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #1834 from RonnyPfannschmidt/setuptools-scm-take-2

second take at setuptools_scm


  Commit: f3b359f5b88946f8ff65e3a5e5cea2cfacce59e6
      https://github.com/pytest-dev/pytest/commit/f3b359f5b88946f8ff65e3a5e5cea2cfacce59e6
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-03 (Wed, 03 May 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M README.rst
    M _pytest/_code/code.py
    M _pytest/compat.py
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/python.py
    M doc/en/assert.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    A doc/en/existingtestsuite.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/nose.rst
    A doc/en/requirements.txt
    M doc/en/usage.rst
    M testing/python/collect.py
    M testing/test_capture.py
    M testing/test_mark.py
    M tox.ini

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

# Conflicts:
#	_pytest/capture.py
#	_pytest/compat.py
#	_pytest/python.py
#	testing/python/collect.py
#	testing/test_mark.py


  Commit: daca6180123d95ed2371eb0caf0e240a1806a92b
      https://github.com/pytest-dev/pytest/commit/daca6180123d95ed2371eb0caf0e240a1806a92b
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2017-05-04 (Thu, 04 May 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M README.rst
    M _pytest/_code/code.py
    M _pytest/compat.py
    M _pytest/fixtures.py
    M _pytest/pytester.py
    M _pytest/python.py
    M doc/en/assert.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    A doc/en/existingtestsuite.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/nose.rst
    A doc/en/requirements.txt
    M doc/en/usage.rst
    M testing/python/collect.py
    M testing/test_capture.py
    M testing/test_mark.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2389 from nicoddemus/merge-master-into-features

Merge master into features


  Commit: 8bcf88ec121215788b5edcd8fd6da8f8c15e6432
      https://github.com/pytest-dev/pytest/commit/8bcf88ec121215788b5edcd8fd6da8f8c15e6432
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-05 (Fri, 05 May 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  try to consider all modules after registration as plugin


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

  Changed paths:
    M HOWTORELEASE.rst
    M MANIFEST.in
    A tasks/__init__.py
    A tasks/generate.py
    A tasks/release.minor.rst
    A tasks/release.patch.rst

  Log Message:
  -----------
  Introduce a task to generate the announcement file for releases


  Commit: b6125d9a139e43a2cdb16f685cd096687717583c
      https://github.com/pytest-dev/pytest/commit/b6125d9a139e43a2cdb16f685cd096687717583c
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-05-11 (Thu, 11 May 2017)

  Changed paths:
    M HOWTORELEASE.rst
    M MANIFEST.in
    A tasks/__init__.py
    A tasks/generate.py
    A tasks/release.minor.rst
    A tasks/release.patch.rst

  Log Message:
  -----------
  Merge pull request #2397 from nicoddemus/announce-task

Introduce a task to generate the announcement file for releases


  Commit: a92e397011c02d0a6f336812934750fd95688058
      https://github.com/pytest-dev/pytest/commit/a92e397011c02d0a6f336812934750fd95688058
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  add changelog for fixing #2391


  Commit: f1c4e2c032795652cd0c7cf08a38f2e5221b2e57
      https://github.com/pytest-dev/pytest/commit/f1c4e2c032795652cd0c7cf08a38f2e5221b2e57
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  regendoc: reduce version noise by replacing minor/patch with placeholders


  Commit: c765fa6d042babcbb8ba9baaea4fcebe8c978c25
      https://github.com/pytest-dev/pytest/commit/c765fa6d042babcbb8ba9baaea4fcebe8c978c25
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/getting-started.rst

  Log Message:
  -----------
  add regendoc normaliz for pytest --version


  Commit: fe7d89f03370d087769c6093d7dac70f83160e0c
      https://github.com/pytest-dev/pytest/commit/fe7d89f03370d087769c6093d7dac70f83160e0c
  Author: Dmitri Pribysh <dmand at yandex.ru>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M _pytest/junitxml.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Add '--junit-suite-name' CLI option


  Commit: 204db4d1e20032f986730c6e9844d22f310c51c8
      https://github.com/pytest-dev/pytest/commit/204db4d1e20032f986730c6e9844d22f310c51c8
  Author: Dmitri Pribysh <dmand at yandex.ru>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update Changelog


  Commit: bcfa6264f114f574bc7870c5fb50752db8da9349
      https://github.com/pytest-dev/pytest/commit/bcfa6264f114f574bc7870c5fb50752db8da9349
  Author: Dmitri Pribysh <dmand at yandex.ru>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Update AUTHORS list


  Commit: c9282f9e948a928dabfafa3b217ebb006a8ac223
      https://github.com/pytest-dev/pytest/commit/c9282f9e948a928dabfafa3b217ebb006a8ac223
  Author: Dmitri Pribysh <dmand at yandex.ru>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M _pytest/junitxml.py
    M testing/test_junitxml.py

  Log Message:
  -----------
  Transition to using ini option for suite name


  Commit: 2ab8d12fe3ebed9716786408798da7e25789b8af
      https://github.com/pytest-dev/pytest/commit/2ab8d12fe3ebed9716786408798da7e25789b8af
  Author: Dmitri Pribysh <dmand at yandex.ru>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Update changelog and add usage info


  Commit: d1e44d16e7f2a510be0a3c885435ed4226abb777
      https://github.com/pytest-dev/pytest/commit/d1e44d16e7f2a510be0a3c885435ed4226abb777
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  regenerate docs from the pytest env


  Commit: f39f416c5d84530f6839b9ea7a3c5303a61329f8
      https://github.com/pytest-dev/pytest/commit/f39f416c5d84530f6839b9ea7a3c5303a61329f8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M testing/test_junitxml.py

  Log Message:
  -----------
  Improve tests a bit

Use a normal function instead of a lambda
Parametrize test about suite name option


  Commit: 456925b6045470b1d306eea146ab8a82b65b7606
      https://github.com/pytest-dev/pytest/commit/456925b6045470b1d306eea146ab8a82b65b7606
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/config.py

  Log Message:
  -----------
  Merge pull request #2395 from RonnyPfannschmidt/consider-all-modules

Consider all modules


  Commit: 03753ca201fcd9d0720a3e4ff2f8dd20dff1a4f0
      https://github.com/pytest-dev/pytest/commit/03753ca201fcd9d0720a3e4ff2f8dd20dff1a4f0
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-13 (Sat, 13 May 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  intermediate state after attempt with the plain env, DONT MERGE


  Commit: 783670b84e732eff098451d1a4eecfafed46a918
      https://github.com/pytest-dev/pytest/commit/783670b84e732eff098451d1a4eecfafed46a918
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-05-13 (Sat, 13 May 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/junitxml.py
    M doc/en/usage.rst
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #2274 from dmand/feat/junitxml/suite-name-option

Add `junit_suite_name` ini option


  Commit: bd708068ab359b192903ae0a15a3852034f43a9c
      https://github.com/pytest-dev/pytest/commit/bd708068ab359b192903ae0a15a3852034f43a9c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-14 (Sun, 14 May 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/config.py
    M _pytest/junitxml.py
    M doc/en/usage.rst
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge branch 'features' into regendoc-reduce-version-noise


  Commit: 3c41349fe147b449785857cf5fed33d46aa4b600
      https://github.com/pytest-dev/pytest/commit/3c41349fe147b449785857cf5fed33d46aa4b600
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/Makefile
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.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
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Merge pull request #2406 from RonnyPfannschmidt/regendoc-reduce-version-noise

regendoc: reduce version noise by replacing minor/patch with placeholders


  Commit: fe49c78f322dadb4d10303f4783b9452c2f60a1e
      https://github.com/pytest-dev/pytest/commit/fe49c78f322dadb4d10303f4783b9452c2f60a1e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M doc/en/parametrize.rst

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


  Commit: 00e7ee532e1f692d508a2cb9241f4b78921f6f4c
      https://github.com/pytest-dev/pytest/commit/00e7ee532e1f692d508a2cb9241f4b78921f6f4c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/unittest.rst
    M doc/en/warnings.rst
    M tox.ini

  Log Message:
  -----------
  Fix minor regendoc issues


  Commit: feab3ba70ffcdca646d00080c1bdf32b4f1ed308
      https://github.com/pytest-dev/pytest/commit/feab3ba70ffcdca646d00080c1bdf32b4f1ed308
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M HOWTORELEASE.rst
    M tasks/generate.py
    A tasks/requirements.txt

  Log Message:
  -----------
  Implement tasks to improve release automation


  Commit: 6f407ef308d1ecbbac5fd778a7985ac7e04052e8
      https://github.com/pytest-dev/pytest/commit/6f407ef308d1ecbbac5fd778a7985ac7e04052e8
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M HOWTORELEASE.rst
    M doc/en/Makefile
    M doc/en/parametrize.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst
    M tasks/generate.py
    A tasks/requirements.txt
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2411 from nicoddemus/automate-pre-release

Automate pre release steps


  Commit: d86c89e19338f78e9f757a860eefbf9bb9994ab7
      https://github.com/pytest-dev/pytest/commit/d86c89e19338f78e9f757a860eefbf9bb9994ab7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/_argcomplete.py
    M _pytest/assertion/__init__.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py

  Log Message:
  -----------
  Revert refactor of old-style to new-style classes

As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398).

This reverts commit d4afa1554b225d11565d5fb81136edea51c54b0d from PR #2179.


  Commit: 3a4d37248d5289591e5703cb3f5a65d557d9960a
      https://github.com/pytest-dev/pytest/commit/3a4d37248d5289591e5703cb3f5a65d557d9960a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/_argcomplete.py
    M _pytest/assertion/__init__.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/pytester.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py

  Log Message:
  -----------
  Merge pull request #2414 from nicoddemus/revert-new-style-classes

Revert refactor of old-style to new-style classes


  Commit: 36cf89a2de01e0f4a941a0f202b02845387a3611
      https://github.com/pytest-dev/pytest/commit/36cf89a2de01e0f4a941a0f202b02845387a3611
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

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

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


  Commit: 0ff7f5d0c6fe7c4cb206fa92bba8a418f1d2c50b
      https://github.com/pytest-dev/pytest/commit/0ff7f5d0c6fe7c4cb206fa92bba8a418f1d2c50b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Prepare CHANGELOG for version 3.1.0


  Commit: 9b48613baa9ee1ab4e1e233bfe956de03e89b23e
      https://github.com/pytest-dev/pytest/commit/9b48613baa9ee1ab4e1e233bfe956de03e89b23e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.0.rst
    M doc/en/cache.rst
    M doc/en/example/parametrize.rst
    M doc/en/unittest.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.1.0


  Commit: d343f9497ca176d4af2e52ae69fffda0d8516d5b
      https://github.com/pytest-dev/pytest/commit/d343f9497ca176d4af2e52ae69fffda0d8516d5b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
    M .gitignore
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M HOWTORELEASE.rst
    M MANIFEST.in
    M _pytest/__init__.py
    M _pytest/_argcomplete.py
    M _pytest/_code/__init__.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/_pluggy.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    A _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    A _pytest/warnings.py
    M doc/en/Makefile
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.0.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/attic.rst
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/parametrize.rst
    M doc/en/recwarn.rst
    M doc/en/skipping.rst
    M doc/en/test/attic.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    A doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pytest.py
    M scripts/check-manifest.py
    M setup.cfg
    M setup.py
    A tasks/__init__.py
    A tasks/generate.py
    A tasks/release.minor.rst
    A tasks/release.patch.rst
    A tasks/requirements.txt
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/deprecated_test.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    A testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    A testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'release-3.1'


Compare: https://github.com/pytest-dev/pytest/compare/69343310c651...d343f9497ca1

From nicoddemus at gmail.com  Fri May 26 06:24:29 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 26 May 2017 03:24:29 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] c39689: Correct warnings with
 unicode message.
Message-ID: <5928025dd6bb4_27ac3fd8ff159c2c128860@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: c39689da41eee6656d2956d20c09b6725151583d
      https://github.com/pytest-dev/pytest/commit/c39689da41eee6656d2956d20c09b6725151583d
  Author: wanghui <wh_linux at 126.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M _pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Correct warnings with unicode message.


  Commit: d7a5c5716f2386c083a2658708c4a3d9eda522c4
      https://github.com/pytest-dev/pytest/commit/d7a5c5716f2386c083a2658708c4a3d9eda522c4
  Author: wanghui <wh_linux at 126.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M _pytest/compat.py
    M _pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Add UnicodeWarning for unicode warnings in Python2


  Commit: 53add4435f64363cb2d79299013ea850024dcd86
      https://github.com/pytest-dev/pytest/commit/53add4435f64363cb2d79299013ea850024dcd86
  Author: wanghui <wh_linux at 126.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Add ChangeLog


  Commit: 8df3e55a3132e1f7dd38cf5ad57abce4b67721bd
      https://github.com/pytest-dev/pytest/commit/8df3e55a3132e1f7dd38cf5ad57abce4b67721bd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/compat.py
    M _pytest/warnings.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Merge pull request #2437 from coldnight/master

Correct warnings that contains Unicode message


Compare: https://github.com/pytest-dev/pytest/compare/17f64704c2f7...8df3e55a3132

From nicoddemus at gmail.com  Fri May 26 07:08:58 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 26 May 2017 04:08:58 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7950c2: Add Hui Wang to AUTHORS
 list
Message-ID: <59280ccade10e_3ff93fb3ddcefc2c2917af@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7950c26a8efa6f819d6ed954c4be1897a57d9f34
      https://github.com/pytest-dev/pytest/commit/7950c26a8efa6f819d6ed954c4be1897a57d9f34
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Add Hui Wang to AUTHORS list



From flub at devork.be  Mon May 29 07:34:41 2017
From: flub at devork.be (Floris Bruynooghe)
Date: Mon, 29 May 2017 04:34:41 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 313a88: Warn that
 warning-capture can break existing suite...
Message-ID: <592c07512febe_16003ff737d5fc2828806c@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 313a884459385adf41d966523659f710febcd7de
      https://github.com/pytest-dev/pytest/commit/313a884459385adf41d966523659f710febcd7de
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/warnings.rst
    M tox.ini

  Log Message:
  -----------
  Warn that warning-capture can break existing suites in the docs and CHANGELOG

Related to discussion in #2430


  Commit: 7bb06b6dad7ffab94cfa4d14cce326d84572cbe5
      https://github.com/pytest-dev/pytest/commit/7bb06b6dad7ffab94cfa4d14cce326d84572cbe5
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/warnings.rst
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2439 from nicoddemus/warnings-docs

Warn that warning-capture can break existing suites in the docs and CHANGELOG


Compare: https://github.com/pytest-dev/pytest/compare/7950c26a8efa...7bb06b6dad7f

From flub at devork.be  Mon May 29 07:36:08 2017
From: flub at devork.be (Floris Bruynooghe)
Date: Mon, 29 May 2017 04:36:08 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 836dc4: Fix unicode issue while
 running doctests in Python...
Message-ID: <592c07a8c17d9_302f3fdf9291fc381457d2@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 836dc451f46f63ea7ae0f1ec0132b507838466f2
      https://github.com/pytest-dev/pytest/commit/836dc451f46f63ea7ae0f1ec0132b507838466f2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/doctest.py
    M testing/test_doctest.py

  Log Message:
  -----------
  Fix unicode issue while running doctests in Python 2

Fix #2434


  Commit: 61179306420318bf690e85c0cd63219bec765c4d
      https://github.com/pytest-dev/pytest/commit/61179306420318bf690e85c0cd63219bec765c4d
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/doctest.py
    M testing/test_doctest.py

  Log Message:
  -----------
  Merge pull request #2438 from nicoddemus/issue-2434

Fix unicode issue while running doctests in Python 2


Compare: https://github.com/pytest-dev/pytest/compare/7bb06b6dad7f...611793064203

From nicoddemus at gmail.com  Tue May 30 11:41:39 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 30 May 2017 08:41:39 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b74c62: switch changelog
 management to towncrier
Message-ID: <592d92b3e8f55_394d3fd808bedc302873d@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: b74c626026d6144d884f6809b24c82c2355f4ba1
      https://github.com/pytest-dev/pytest/commit/b74c626026d6144d884f6809b24c82c2355f4ba1
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M CHANGELOG.rst
    M MANIFEST.in
    A changelog/2390.doc
    A changelog/2434.bugfix
    A changelog/2436.bugfix
    A changelog/_template.rst
    A pyproject.toml
    M scripts/check-manifest.py
    A scripts/check-rst.py
    M tasks/generate.py
    M tasks/requirements.txt
    M tox.ini

  Log Message:
  -----------
  switch changelog management to towncrier


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

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M CHANGELOG.rst
    M MANIFEST.in
    A changelog/2390.doc
    A changelog/2434.bugfix
    A changelog/2436.bugfix
    A changelog/_template.rst
    A pyproject.toml
    M scripts/check-manifest.py
    A scripts/check-rst.py
    M tasks/generate.py
    M tasks/requirements.txt
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2431 from RonnyPfannschmidt/towncrier

initial addition of towncrier


Compare: https://github.com/pytest-dev/pytest/compare/611793064203...ee0844dbd837

From nicoddemus at gmail.com  Tue May 30 17:14:02 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 30 May 2017 14:14:02 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 32e264: No longer override
 existing warning filters during...
Message-ID: <592de09ac9878_27523fda38327c40493c6@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 32e2642233aa7a2270df485d57b44280e695ce19
      https://github.com/pytest-dev/pytest/commit/32e2642233aa7a2270df485d57b44280e695ce19
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M _pytest/warnings.py
    M changelog/2390.doc
    A changelog/2430.bugfix
    M doc/en/warnings.rst
    M testing/test_recwarn.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  No longer override existing warning filters during warnings capture

Fix #2430


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

  Changed paths:
    M _pytest/warnings.py
    M changelog/2390.doc
    A changelog/2430.bugfix
    M doc/en/warnings.rst
    M testing/test_recwarn.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2445 from nicoddemus/warnings-remove-filter

No longer override existing warning filters during warnings capture


Compare: https://github.com/pytest-dev/pytest/compare/454426cba579...1dee443c2b41

From nicoddemus at gmail.com  Wed May 31 07:53:49 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 31 May 2017 04:53:49 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 0540d7: Add extra space between
 changelog items
Message-ID: <592eaecd622a4_1d703f8a4f813c24107825@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/tags/3.1.1
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0540d72c87618c384b722bfe608c66c446f8fd7d
      https://github.com/pytest-dev/pytest/commit/0540d72c87618c384b722bfe608c66c446f8fd7d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M changelog/_template.rst

  Log Message:
  -----------
  Add extra space between changelog items


  Commit: 2fd7626046f55e4c1c8d64990c47fe92a00729fb
      https://github.com/pytest-dev/pytest/commit/2fd7626046f55e4c1c8d64990c47fe92a00729fb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2390.doc
    R changelog/2430.bugfix
    R changelog/2434.bugfix
    R changelog/2436.bugfix
    R changelog/2441.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.1.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.1.1


Compare: https://github.com/pytest-dev/pytest/compare/0540d72c8761^...2fd7626046f5

From nicoddemus at gmail.com  Wed May 31 07:55:41 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 31 May 2017 04:55:41 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 0540d7: Add extra space between
 changelog items
Message-ID: <592eaf3d69c02_731b3fc121565c301079f4@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0540d72c87618c384b722bfe608c66c446f8fd7d
      https://github.com/pytest-dev/pytest/commit/0540d72c87618c384b722bfe608c66c446f8fd7d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M changelog/_template.rst

  Log Message:
  -----------
  Add extra space between changelog items


  Commit: 2fd7626046f55e4c1c8d64990c47fe92a00729fb
      https://github.com/pytest-dev/pytest/commit/2fd7626046f55e4c1c8d64990c47fe92a00729fb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2390.doc
    R changelog/2430.bugfix
    R changelog/2434.bugfix
    R changelog/2436.bugfix
    R changelog/2441.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.1.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.1.1


  Commit: cca4de20cfb976bb2730e3417bf1f26b24e41d5a
      https://github.com/pytest-dev/pytest/commit/cca4de20cfb976bb2730e3417bf1f26b24e41d5a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2390.doc
    R changelog/2430.bugfix
    R changelog/2434.bugfix
    R changelog/2436.bugfix
    R changelog/2441.bugfix
    M changelog/_template.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.1.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Merge pull request #2450 from nicoddemus/release-3.1.1

Release 3.1.1


Compare: https://github.com/pytest-dev/pytest/compare/3871810d1c42...cca4de20cfb9

From nicoddemus at gmail.com  Wed May 31 12:52:07 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 31 May 2017 09:52:07 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] b74c62: switch changelog
 management to towncrier
Message-ID: <592ef4b7ce6aa_70f23ff6457a3c3c1006bf@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: b74c626026d6144d884f6809b24c82c2355f4ba1
      https://github.com/pytest-dev/pytest/commit/b74c626026d6144d884f6809b24c82c2355f4ba1
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M CHANGELOG.rst
    M MANIFEST.in
    A changelog/2390.doc
    A changelog/2434.bugfix
    A changelog/2436.bugfix
    A changelog/_template.rst
    A pyproject.toml
    M scripts/check-manifest.py
    A scripts/check-rst.py
    M tasks/generate.py
    M tasks/requirements.txt
    M tox.ini

  Log Message:
  -----------
  switch changelog management to towncrier


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

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M CHANGELOG.rst
    M MANIFEST.in
    A changelog/2390.doc
    A changelog/2434.bugfix
    A changelog/2436.bugfix
    A changelog/_template.rst
    A pyproject.toml
    M scripts/check-manifest.py
    A scripts/check-rst.py
    M tasks/generate.py
    M tasks/requirements.txt
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2431 from RonnyPfannschmidt/towncrier

initial addition of towncrier


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

  Changed paths:
    M _pytest/recwarn.py
    A changelog/2441.bugfix
    M testing/test_recwarn.py

  Log Message:
  -----------
  pytest.deprecated_call now captures PendingDeprecationWarning in context manager form

Fix #2441


  Commit: 454426cba579000d5b87579e37cc05d1900e9b03
      https://github.com/pytest-dev/pytest/commit/454426cba579000d5b87579e37cc05d1900e9b03
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M _pytest/recwarn.py
    A changelog/2441.bugfix
    M testing/test_recwarn.py

  Log Message:
  -----------
  Merge pull request #2446 from nicoddemus/issue-2441

pytest.deprecated_call now captures PendingDeprecationWarning in context manager form


  Commit: 32e2642233aa7a2270df485d57b44280e695ce19
      https://github.com/pytest-dev/pytest/commit/32e2642233aa7a2270df485d57b44280e695ce19
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M _pytest/warnings.py
    M changelog/2390.doc
    A changelog/2430.bugfix
    M doc/en/warnings.rst
    M testing/test_recwarn.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  No longer override existing warning filters during warnings capture

Fix #2430


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

  Changed paths:
    M _pytest/warnings.py
    M changelog/2390.doc
    A changelog/2430.bugfix
    M doc/en/warnings.rst
    M testing/test_recwarn.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2445 from nicoddemus/warnings-remove-filter

No longer override existing warning filters during warnings capture


  Commit: 0540d72c87618c384b722bfe608c66c446f8fd7d
      https://github.com/pytest-dev/pytest/commit/0540d72c87618c384b722bfe608c66c446f8fd7d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M changelog/_template.rst

  Log Message:
  -----------
  Add extra space between changelog items


  Commit: 2fd7626046f55e4c1c8d64990c47fe92a00729fb
      https://github.com/pytest-dev/pytest/commit/2fd7626046f55e4c1c8d64990c47fe92a00729fb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2390.doc
    R changelog/2430.bugfix
    R changelog/2434.bugfix
    R changelog/2436.bugfix
    R changelog/2441.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.1.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Preparing release version 3.1.1


  Commit: 281fcd5a58f6c16d5d27dd52954f3bcb8736bb33
      https://github.com/pytest-dev/pytest/commit/281fcd5a58f6c16d5d27dd52954f3bcb8736bb33
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  Update HOWTORELEASE

* Remove the CHANGELOG step now that it is automated;
* Overall clean-up and formatting, trying to make the steps more
  explicit;


  Commit: 3871810d1c42d73785b3b94043f73a0f1810ca3a
      https://github.com/pytest-dev/pytest/commit/3871810d1c42d73785b3b94043f73a0f1810ca3a
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  Merge pull request #2451 from nicoddemus/update-release-howto

Update HOWTORELEASE


  Commit: cca4de20cfb976bb2730e3417bf1f26b24e41d5a
      https://github.com/pytest-dev/pytest/commit/cca4de20cfb976bb2730e3417bf1f26b24e41d5a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2390.doc
    R changelog/2430.bugfix
    R changelog/2434.bugfix
    R changelog/2436.bugfix
    R changelog/2441.bugfix
    M changelog/_template.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.1.rst
    M doc/en/warnings.rst

  Log Message:
  -----------
  Merge pull request #2450 from nicoddemus/release-3.1.1

Release 3.1.1


  Commit: 9adf513c4b28dd9c6d0a3b03a54e321e7795fbeb
      https://github.com/pytest-dev/pytest/commit/9adf513c4b28dd9c6d0a3b03a54e321e7795fbeb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M MANIFEST.in
    M _pytest/recwarn.py
    M _pytest/warnings.py
    A changelog/_template.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.1.rst
    M doc/en/warnings.rst
    A pyproject.toml
    M scripts/check-manifest.py
    A scripts/check-rst.py
    M tasks/generate.py
    M tasks/requirements.txt
    M testing/test_recwarn.py
    M testing/test_warnings.py
    M tox.ini

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


Compare: https://github.com/pytest-dev/pytest/compare/4e6e29dbeecb...9adf513c4b28