From nicoddemus at gmail.com  Tue Aug  1 17:24:18 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 01 Aug 2017 14:24:18 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 51ebad: Fix merge instruction
 after a minor/major release
Message-ID: <5980f1824492f_19853fbb17cfdc3c9197c@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 51ebad76f2b996bf578b9bd89cf1c8eddaf98f42
      https://github.com/pytest-dev/pytest/commit/51ebad76f2b996bf578b9bd89cf1c8eddaf98f42
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  Fix merge instruction after a minor/major release



From nicoddemus at gmail.com  Tue Aug  1 17:56:53 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 01 Aug 2017 14:56:53 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 07dd1c: Preparing release
 version 3.2.0
Message-ID: <5980f9254a250_75473f9da1171c301676fc@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/tags/3.2.0
  Home:   https://github.com/pytest-dev/pytest
  Commit: 07dd1ca7b88f2e1076376270b5cfc4f528de44b3
      https://github.com/pytest-dev/pytest/commit/07dd1ca7b88f2e1076376270b5cfc4f528de44b3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1994.feature
    R changelog/2003.removal
    R changelog/2023.bugfix
    R changelog/2147.removal
    R changelog/2375.bugfix
    R changelog/2427.removal
    R changelog/2444.trivial
    R changelog/2489.trivial
    R changelog/2510.bugfix
    R changelog/2516.feature
    R changelog/2518.feature
    R changelog/2528.feature
    R changelog/2533.trivial
    R changelog/2539.doc
    R changelog/2540.feature
    R changelog/2543.feature
    R changelog/2546.trivial
    R changelog/2548.bugfix
    R changelog/2555.bugfix
    R changelog/2562.trivial
    R changelog/2571.trivial
    R changelog/2574.bugfix
    R changelog/2581.trivial
    R changelog/2582.trivial
    R changelog/2583.feature
    R changelog/2588.trivial
    R changelog/2598.feature
    R changelog/2610.bugfix
    R changelog/2620.trivial
    R changelog/2621.feature
    R changelog/2622.feature
    R changelog/2631.feature
    R changelog/580.feature
    R changelog/920.bugfix
    R changelog/971.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/parametrize.rst

  Log Message:
  -----------
  Preparing release version 3.2.0


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update grammar in changelog as requested


Compare: https://github.com/pytest-dev/pytest/compare/07dd1ca7b88f^...d2bca93109a7

From nicoddemus at gmail.com  Tue Aug  1 18:33:45 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 01 Aug 2017 15:33:45 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 4e6e29: Merge pull request
 #2442 from nicoddemus/merge-mas...
Message-ID: <598101c9f4235_79893ff5d08afc408012@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 4e6e29dbeecb9206ff2299b9997f5056f9e9ebed
      https://github.com/pytest-dev/pytest/commit/4e6e29dbeecb9206ff2299b9997f5056f9e9ebed
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/cacheprovider.py
    M _pytest/compat.py
    M _pytest/doctest.py
    M _pytest/warnings.py
    M doc/en/cache.rst
    M doc/en/example/parametrize.rst
    M doc/en/warnings.rst
    M testing/test_doctest.py
    M testing/test_warnings.py
    M tox.ini

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

Merge master into features


  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


  Commit: c67bf9d82aa7de5576a34337a16a1f1447085fdd
      https://github.com/pytest-dev/pytest/commit/c67bf9d82aa7de5576a34337a16a1f1447085fdd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M AUTHORS
    M _pytest/assertion/rewrite.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/vendored_packages/pluggy.py
    A changelog/1999.bugfix
    A changelog/2121.bugfix
    A changelog/2331.doc
    A changelog/2467.bugfix
    A changelog/810.doc
    M doc/en/skipping.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M testing/test_assertrewrite.py
    M testing/test_conftest.py

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


  Commit: 467c5263071ba9cc24ec9b37214b007c21b2c761
      https://github.com/pytest-dev/pytest/commit/467c5263071ba9cc24ec9b37214b007c21b2c761
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-09 (Fri, 09 Jun 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M _pytest/warnings.py
    R changelog/1999.bugfix
    R changelog/2121.bugfix
    R changelog/2331.doc
    R changelog/2467.bugfix
    R changelog/810.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.2.rst
    M doc/en/skipping.rst
    M testing/code/test_excinfo.py
    M testing/test_warnings.py

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


  Commit: 36251e0db473d2d42d602ee759a80eb6f1d80dfc
      https://github.com/pytest-dev/pytest/commit/36251e0db473d2d42d602ee759a80eb6f1d80dfc
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-11 (Sun, 11 Jun 2017)

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

  Log Message:
  -----------
  move approx to own file


  Commit: 6be57a3711465c70b3cb4e5ddf5ee373608f6fbf
      https://github.com/pytest-dev/pytest/commit/6be57a3711465c70b3cb4e5ddf5ee373608f6fbf
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-11 (Sun, 11 Jun 2017)

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

  Log Message:
  -----------
  move python api helpers out of the python module

this separates exposed normal api from collection elements


  Commit: f8b2277413ad3b61d5c86039a3c8a0fa92480bc4
      https://github.com/pytest-dev/pytest/commit/f8b2277413ad3b61d5c86039a3c8a0fa92480bc4
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-11 (Sun, 11 Jun 2017)

  Changed paths:
    A changelog/2489.trivial

  Log Message:
  -----------
  changelog fragment


  Commit: 9bd890771673a97e65649bc06af93550b3950052
      https://github.com/pytest-dev/pytest/commit/9bd890771673a97e65649bc06af93550b3950052
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-11 (Sun, 11 Jun 2017)

  Changed paths:
    M _pytest/python.py
    A _pytest/python_api.py
    A changelog/2489.trivial
    M pytest.py

  Log Message:
  -----------
  Merge pull request #2489 from RonnyPfannschmidt/move-python-api

Move python api code to own file


  Commit: 9f3122fec68488f2fdd41da40eef227372168ad4
      https://github.com/pytest-dev/pytest/commit/9f3122fec68488f2fdd41da40eef227372168ad4
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-06-11 (Sun, 11 Jun 2017)

  Changed paths:
    M _pytest/python.py
    M testing/python/approx.py

  Log Message:
  -----------
  Add support for numpy arrays (and dicts) to approx.

This fixes #1994.  It turned out to require a lot of refactoring because
subclassing numpy.ndarray was necessary to coerce python into calling
the right `__eq__` operator.


  Commit: 8c22aee256988783f022c9646bbd135bb89b0523
      https://github.com/pytest-dev/pytest/commit/8c22aee256988783f022c9646bbd135bb89b0523
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-06-11 (Sun, 11 Jun 2017)

  Changed paths:
    M _pytest/python.py
    A _pytest/python_api.py
    A changelog/2489.trivial
    M pytest.py

  Log Message:
  -----------
  Resolve merge conflict due to approx being moved.


  Commit: 89292f08dc73ef9d20a3488098b07d794a4b3248
      https://github.com/pytest-dev/pytest/commit/89292f08dc73ef9d20a3488098b07d794a4b3248
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-06-11 (Sun, 11 Jun 2017)

  Changed paths:
    A changelog/1994.feature

  Log Message:
  -----------
  Add a changelog entry.


  Commit: 8badb47db60d43966a56cfe5f0630e38358c309a
      https://github.com/pytest-dev/pytest/commit/8badb47db60d43966a56cfe5f0630e38358c309a
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M _pytest/compat.py
    M _pytest/python_api.py
    M testing/python/approx.py
    M tox.ini

  Log Message:
  -----------
  Implement suggestions from code review.

- Avoid importing numpy unless necessary.

- Mention numpy arrays and dictionaries in the docs.

- Add numpy to the list of tox dependencies.

- Don't unnecessarily copy arrays or allocate empty space for them.

- Use code from compat.py rather than writing py2/3 versions of things
  myself.

- Avoid reimplementing __repr__ for built-in types.

- Add an option to consider NaN == NaN, because sometimes people use NaN
  to mean "missing data".


  Commit: b41852c93b2f7e5f3dae60d09077d83d368aa730
      https://github.com/pytest-dev/pytest/commit/b41852c93b2f7e5f3dae60d09077d83d368aa730
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M doc/en/builtin.rst

  Log Message:
  -----------
  Use `autofunction` to document approx.

It used to be a class, but it's a function now.


  Commit: 50769557e820e3b58d00d2727c9355d6d8dd6833
      https://github.com/pytest-dev/pytest/commit/50769557e820e3b58d00d2727c9355d6d8dd6833
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M _pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  Skip the numpy doctests.

They seem like more trouble that they're worth.


  Commit: 5d2496862a12b0c05896ae6dac04d09f26eaa74b
      https://github.com/pytest-dev/pytest/commit/5d2496862a12b0c05896ae6dac04d09f26eaa74b
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

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

  Log Message:
  -----------
  Only test numpy with py27 and py35.

Travis was not successfully installing numpy with python<=2.6,
python<=3.3, or PyPy.  I decided that it didn't make sense to use numpy
for all the tests, so instead I made new testing environments
specifically for numpy.


  Commit: 4d02863b161108d022b5840f1a8e4b58a75ed088
      https://github.com/pytest-dev/pytest/commit/4d02863b161108d022b5840f1a8e4b58a75ed088
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Remove a dict-comprehension.

Not compatible with python26.


  Commit: d6000e5ab1bc6fd5d8b4d90f230453704d5a9282
      https://github.com/pytest-dev/pytest/commit/d6000e5ab1bc6fd5d8b4d90f230453704d5a9282
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Remove py36 from .travis.yml

I thought the file was just out of date, but adding py36 made Travis
complain "InterpreterNotFound: python3.6", so I guess it was correct as
it was.


  Commit: 9597e674d924f2bc026b9f2743b6716a2a5434c9
      https://github.com/pytest-dev/pytest/commit/9597e674d924f2bc026b9f2743b6716a2a5434c9
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Use sets to compare dictionary keys.


  Commit: bdec2c8f9e1b39914b5e9fbc6d73adc29cf88f3a
      https://github.com/pytest-dev/pytest/commit/bdec2c8f9e1b39914b5e9fbc6d73adc29cf88f3a
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

  Log Message:
  -----------
  move marker transfer to _pytest.mark


  Commit: 64ae6ae25dba3169529ea7ed56d65b749314599b
      https://github.com/pytest-dev/pytest/commit/64ae6ae25dba3169529ea7ed56d65b749314599b
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M _pytest/mark.py

  Log Message:
  -----------
  extract application of marks and legacy markinfos


  Commit: 19b12b22e7e5c23bb9a9a0e74ca36d441481973f
      https://github.com/pytest-dev/pytest/commit/19b12b22e7e5c23bb9a9a0e74ca36d441481973f
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

  Log Message:
  -----------
  store pristine marks on function.pytestmark

fixes #2516


  Commit: c791895c93308699458cdf73fd647b92ed1779c0
      https://github.com/pytest-dev/pytest/commit/c791895c93308699458cdf73fd647b92ed1779c0
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    A changelog/2516.feature

  Log Message:
  -----------
  changelog addition


  Commit: 1d926011a4d684c4bd505a3e7ecc444f43cdc446
      https://github.com/pytest-dev/pytest/commit/1d926011a4d684c4bd505a3e7ecc444f43cdc446
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

  Log Message:
  -----------
  add deprecation warnings for using markinfo attributes


  Commit: 23d016f1149812babbaf42da3f6c21acd70597c2
      https://github.com/pytest-dev/pytest/commit/23d016f1149812babbaf42da3f6c21acd70597c2
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  -----------
  address review comments

* enhance api for fetching marks off an object
* rename functions for storing marks
* enhance deprecation message for MarkInfo


  Commit: b0b6c355f7ab17fbaccfea6f70efe03866ed5940
      https://github.com/pytest-dev/pytest/commit/b0b6c355f7ab17fbaccfea6f70efe03866ed5940
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M changelog/2516.feature

  Log Message:
  -----------
  fixup changelog, thanks Bruno


  Commit: 8d5f2872d3aa7549299a7bfe7dfca1bd8f022bf5
      https://github.com/pytest-dev/pytest/commit/8d5f2872d3aa7549299a7bfe7dfca1bd8f022bf5
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  minor code style fix


  Commit: bab18e10eb1672f1bd320be4a777cc8b0cc4a273
      https://github.com/pytest-dev/pytest/commit/bab18e10eb1672f1bd320be4a777cc8b0cc4a273
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/2516.feature
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #2517 from RonnyPfannschmidt/mark-expose-nontransfered

Mark expose nontransfered marks via pytestmark property


  Commit: 0d0b01bded8ab758118d9be1ea64db493045dcf4
      https://github.com/pytest-dev/pytest/commit/0d0b01bded8ab758118d9be1ea64db493045dcf4
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/mark.py
    A changelog/2427.removal

  Log Message:
  -----------
  introduce deprecation warnings for legacy parametersets, fixes #2427


  Commit: 655d44b41347b97d53f86f91468bbd4e305b0048
      https://github.com/pytest-dev/pytest/commit/655d44b41347b97d53f86f91468bbd4e305b0048
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    A changelog/2147.removal

  Log Message:
  -----------
  Add changelog entry explicitly deprecating old-style classes from pytest API

Related to #2147


  Commit: 1906f8c565cf214ff81c679db4c35fdc7a423f4a
      https://github.com/pytest-dev/pytest/commit/1906f8c565cf214ff81c679db4c35fdc7a423f4a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/mark.py
    A changelog/2427.removal

  Log Message:
  -----------
  Merge pull request #2524 from RonnyPfannschmidt/fix-2427

introduce deprecation warnings for legacy parametersets, fixes #2427


  Commit: 3de93657bde141474f034dba90c1d734874848d3
      https://github.com/pytest-dev/pytest/commit/3de93657bde141474f034dba90c1d734874848d3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    M CHANGELOG.rst
    M LICENSE
    R MANIFEST.in
    M README.rst
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/recwarn.py
    M _pytest/terminal.py
    A changelog/2434.bugfix
    A changelog/2440.bugfix
    A changelog/2464.bugfix
    A changelog/2469.bugfix
    A changelog/2474.trivial
    A changelog/2486.bugfix
    A changelog/2493.doc
    A changelog/2499.trivial
    M changelog/_template.rst
    M doc/en/fixture.rst
    M doc/en/index.rst
    M doc/en/license.rst
    M doc/en/writing_plugins.rst
    M pyproject.toml
    R scripts/check-manifest.py
    M tasks/__init__.py
    A tasks/vendoring.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/python/fixture.py
    M testing/test_collection.py
    M testing/test_doctest.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M tox.ini

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


  Commit: 6eeab45a8f907376a7009b920bb85c40af148913
      https://github.com/pytest-dev/pytest/commit/6eeab45a8f907376a7009b920bb85c40af148913
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    A changelog/2147.removal

  Log Message:
  -----------
  Merge pull request #2525 from nicoddemus/deprecate-old-style

Add changelog entry explicitly deprecating old-style classes from pytest API


  Commit: 9b51fc646c466d847755058823d065b104de1c48
      https://github.com/pytest-dev/pytest/commit/9b51fc646c466d847755058823d065b104de1c48
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    M CHANGELOG.rst
    M LICENSE
    R MANIFEST.in
    M README.rst
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/recwarn.py
    M _pytest/terminal.py
    A changelog/2434.bugfix
    A changelog/2440.bugfix
    A changelog/2464.bugfix
    A changelog/2469.bugfix
    A changelog/2474.trivial
    A changelog/2486.bugfix
    A changelog/2493.doc
    A changelog/2499.trivial
    M changelog/_template.rst
    M doc/en/fixture.rst
    M doc/en/index.rst
    M doc/en/license.rst
    M doc/en/writing_plugins.rst
    M pyproject.toml
    R scripts/check-manifest.py
    M tasks/__init__.py
    A tasks/vendoring.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/python/fixture.py
    M testing/test_collection.py
    M testing/test_doctest.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M tox.ini

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

Merge master into features


  Commit: 9b9fede5beef291887853ebf0d4c2cc60f6fbfc2
      https://github.com/pytest-dev/pytest/commit/9b9fede5beef291887853ebf0d4c2cc60f6fbfc2
  Author: Nathaniel Waisbrot <nathaniel at waisbrot.net>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M AUTHORS
    M _pytest/python.py
    A changelog/2528.feature
    M testing/python/collect.py

  Log Message:
  -----------
  allow staticmethods to be detected as test functions

Allow a class method decorated `@staticmethod` to be collected as a test
function (if it meets the usual criteria).

This feature will not work in Python 2.6 -- static methods will still be
ignored there.


  Commit: 0303d95a53ee909d0149557513af1608e3f4b438
      https://github.com/pytest-dev/pytest/commit/0303d95a53ee909d0149557513af1608e3f4b438
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M AUTHORS
    M _pytest/python.py
    A changelog/2528.feature
    M testing/python/collect.py

  Log Message:
  -----------
  Merge pull request #2531 from waisbrot/staticmethods

Allow staticmethods to be detected as test functions


  Commit: 8524a5707549225f60587ef7d965c5e3eb288681
      https://github.com/pytest-dev/pytest/commit/8524a5707549225f60587ef7d965c5e3eb288681
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M _pytest/python_api.py
    M testing/python/approx.py

  Log Message:
  -----------
  Add "approx" to all the repr-strings.


  Commit: c111e9dac31664fd8398b9231bd3dbf87ad6646f
      https://github.com/pytest-dev/pytest/commit/c111e9dac31664fd8398b9231bd3dbf87ad6646f
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Avoid making multiple ApproxNumpy types.


  Commit: b62aef3372cfa08e9f75b2c720c4d8b58d96f113
      https://github.com/pytest-dev/pytest/commit/b62aef3372cfa08e9f75b2c720c4d8b58d96f113
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/main.py
    R changelog/2434.bugfix
    R changelog/2440.bugfix
    R changelog/2464.bugfix
    R changelog/2469.bugfix
    R changelog/2474.trivial
    R changelog/2486.bugfix
    R changelog/2493.doc
    R changelog/2499.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.1.3.rst
    M doc/en/assert.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/tmpdir.rst
    M doc/en/warnings.rst
    M tasks/requirements.txt

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


  Commit: 7a1a439049c01630665aed04bbe18486f3eeda83
      https://github.com/pytest-dev/pytest/commit/7a1a439049c01630665aed04bbe18486f3eeda83
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Use `cls` instead of `ApproxNumpyBase`.

Slightly more general, probably doesn't make a difference.


  Commit: ef62b86335dc14631f52d7c519f3b553bd5aa0ef
      https://github.com/pytest-dev/pytest/commit/ef62b86335dc14631f52d7c519f3b553bd5aa0ef
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-06 (Thu, 06 Jul 2017)

  Changed paths:
    M .travis.yml
    M _pytest/compat.py
    M _pytest/python_api.py
    M appveyor.yml
    A changelog/1994.feature
    M doc/en/builtin.rst
    M testing/python/approx.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2492 from kalekundert/features

Add support for numpy arrays (and dicts) to approx.


  Commit: f471eef6613d7408faa3e57964c043342a4330a9
      https://github.com/pytest-dev/pytest/commit/f471eef6613d7408faa3e57964c043342a4330a9
  Author: V.Kuznetsov <v.kuznetsov at voskhod.ru>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M _pytest/cacheprovider.py

  Log Message:
  -----------
  ini option cache_dir


  Commit: 7a9fc694358f3d6958de0c7785bcbf67c6784076
      https://github.com/pytest-dev/pytest/commit/7a9fc694358f3d6958de0c7785bcbf67c6784076
  Author: V.Kuznetsov <v.kuznetsov at voskhod.ru>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M testing/test_cache.py

  Log Message:
  -----------
  tests for ini option cache_dir


  Commit: 91418eda3b47504c930d8f46a5f96309a7e6909f
      https://github.com/pytest-dev/pytest/commit/91418eda3b47504c930d8f46a5f96309a7e6909f
  Author: V.Kuznetsov <v.kuznetsov at voskhod.ru>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M doc/en/cache.rst
    M doc/en/customize.rst

  Log Message:
  -----------
  docs for ini option cache_dir


  Commit: bd52eebab4fb840992fc3f2ca99a40920421b221
      https://github.com/pytest-dev/pytest/commit/bd52eebab4fb840992fc3f2ca99a40920421b221
  Author: V.Kuznetsov <v.kuznetsov at voskhod.ru>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    A changelog/2543.feature

  Log Message:
  -----------
  changelog for ini option cache_dir


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

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/2543.feature
    M doc/en/cache.rst
    M doc/en/customize.rst
    M testing/test_cache.py

  Log Message:
  -----------
  Merge pull request #2559 from RockBomber/features

cache_dir ini option for setting cache directory


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

  Changed paths:
    M _pytest/compat.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/python.py
    A changelog/2444.trivial
    A changelog/2533.trivial
    A changelog/2539.doc
    M doc/en/example/markers.rst
    M testing/test_skipping.py

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


  Commit: 89c73582caf9dda84f237bd6d4986d4db7d11a2e
      https://github.com/pytest-dev/pytest/commit/89c73582caf9dda84f237bd6d4986d4db7d11a2e
  Author: John Still <john at jmsdvl.com>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  ignore the active python installation unless told otherwise


  Commit: c2d49e39a2603f3ee8ec3a0e13be4afc3303aca1
      https://github.com/pytest-dev/pytest/commit/c2d49e39a2603f3ee8ec3a0e13be4afc3303aca1
  Author: John Still <john at jmsdvl.com>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    A changelog/2518.feature

  Log Message:
  -----------
  add news item


  Commit: 676c4f970d2d2f3dcece052adc65491e1f9e1588
      https://github.com/pytest-dev/pytest/commit/676c4f970d2d2f3dcece052adc65491e1f9e1588
  Author: John Still <john at jmsdvl.com>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  trim trailing ws


  Commit: b32cfc88daad55f6518fc828db7aa770d4e4c80a
      https://github.com/pytest-dev/pytest/commit/b32cfc88daad55f6518fc828db7aa770d4e4c80a
  Author: John Still <john at jmsdvl.com>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  use presence of activate script rather than sys.prefix to determine if a dir is a virtualenv


  Commit: 67fca040503b30ff7d23f6962c1387c8f621c80c
      https://github.com/pytest-dev/pytest/commit/67fca040503b30ff7d23f6962c1387c8f621c80c
  Author: John Still <john at jmsdvl.com>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    M _pytest/main.py
    M changelog/2518.feature
    M doc/en/customize.rst
    M testing/test_collection.py

  Log Message:
  -----------
  update docs and note; add virtualenv collection tests


  Commit: 1485a3a902bdb50622292eac271e7832c06e4221
      https://github.com/pytest-dev/pytest/commit/1485a3a902bdb50622292eac271e7832c06e4221
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M _pytest/main.py
    A changelog/2518.feature
    M doc/en/customize.rst
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #2566 from jmsdvl/iss2518

Detect and warn/ignore local python installations


  Commit: 4fd92ef9ba270dc5b80864b3d9b4b4d12fd779bb
      https://github.com/pytest-dev/pytest/commit/4fd92ef9ba270dc5b80864b3d9b4b4d12fd779bb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/_argcomplete.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.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/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    A changelog/2562.trivial
    A changelog/2571.trivial
    A changelog/2581.trivial
    M doc/en/_templates/globaltoc.html
    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/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.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_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
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'fix-flake8-issues' into features


  Commit: 7b1870a94ed27b6e4517026d248c756df1ce9b8e
      https://github.com/pytest-dev/pytest/commit/7b1870a94ed27b6e4517026d248c756df1ce9b8e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M _pytest/deprecated.py
    M _pytest/mark.py
    M _pytest/python.py
    M _pytest/python_api.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/test_cache.py
    M testing/test_capture.py
    M testing/test_conftest.py
    M testing/test_mark.py
    M testing/test_runner.py

  Log Message:
  -----------
  Fix flake8 in features branch


  Commit: 3a1c9c0e45de5d05b34b200c2491d24ce4b236b0
      https://github.com/pytest-dev/pytest/commit/3a1c9c0e45de5d05b34b200c2491d24ce4b236b0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  Clarify in the docs how PYTEST_ADDOPTS and addopts ini option work together


  Commit: 637e566d05c677d9ec71177412c787ef1af3548d
      https://github.com/pytest-dev/pytest/commit/637e566d05c677d9ec71177412c787ef1af3548d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Separate all options for running/selecting tests into sections


  Commit: 62556bada660ca209e7e83bc775559d9039f31b1
      https://github.com/pytest-dev/pytest/commit/62556bada660ca209e7e83bc775559d9039f31b1
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M _pytest/mark.py

  Log Message:
  -----------
  remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage

fixes #2573


  Commit: 2c03000b96424677e15e31e016b3dbf13b7d9c28
      https://github.com/pytest-dev/pytest/commit/2c03000b96424677e15e31e016b3dbf13b7d9c28
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M _pytest/mark.py

  Log Message:
  -----------
  Merge pull request #2585 from RonnyPfannschmidt/fix-2573

remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage


  Commit: 2d4f1f022eb83d3029a35c3ef854534263af6c16
      https://github.com/pytest-dev/pytest/commit/2d4f1f022eb83d3029a35c3ef854534263af6c16
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M _pytest/runner.py
    A changelog/2583.feature
    M doc/en/example/simple.rst
    M testing/test_runner.py

  Log Message:
  -----------
  Introduce PYTEST_CURRENT_TEST environment variable

Fix #2583


  Commit: d7f182ac4fcc1a416b456a02b0ed0508c1659d1c
      https://github.com/pytest-dev/pytest/commit/d7f182ac4fcc1a416b456a02b0ed0508c1659d1c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Remove SETUPTOOLS_SCM_PRETEND_VERSION during linting

It was needed because of check-manifest, but we no longer have a
MANIFEST file so it is not necessary


  Commit: eb79fa7825b57bad3144af84d6fe28b1662a5ba7
      https://github.com/pytest-dev/pytest/commit/eb79fa7825b57bad3144af84d6fe28b1662a5ba7
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M _pytest/runner.py
    A changelog/2583.feature
    M doc/en/customize.rst
    M doc/en/example/simple.rst
    M doc/en/usage.rst
    M testing/test_runner.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2590 from nicoddemus/current-test-var

Introduce new PYTEST_CURRENT_TEST environment variable


  Commit: 26ee2355d98cb5654fedb0272dfa1c59f3b3a070
      https://github.com/pytest-dev/pytest/commit/26ee2355d98cb5654fedb0272dfa1c59f3b3a070
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/runner.py
    A changelog/2518.feature
    A changelog/2583.feature
    M doc/en/customize.rst
    M doc/en/example/simple.rst
    M doc/en/usage.rst
    M testing/test_collection.py
    M testing/test_runner.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features' into fix-flake8-errors


  Commit: 24da93832138b048c9126bbd7f1ab7bf6c091edf
      https://github.com/pytest-dev/pytest/commit/24da93832138b048c9126bbd7f1ab7bf6c091edf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M testing/code/test_source.py
    M testing/python/approx.py

  Log Message:
  -----------
  Fix additional flake8 errors


  Commit: d44565f385fac83ed245d076c5ac55b3db2f25fb
      https://github.com/pytest-dev/pytest/commit/d44565f385fac83ed245d076c5ac55b3db2f25fb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M AUTHORS
    R _pytest/impl
    M _pytest/python.py
    A changelog/2574.bugfix
    A changelog/971.doc
    M doc/en/writing_plugins.rst
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into fix-flake8-errors


  Commit: 9e3e58af60691f7a8ec4245a7e1e319eb86d4bcd
      https://github.com/pytest-dev/pytest/commit/9e3e58af60691f7a8ec4245a7e1e319eb86d4bcd
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/_argcomplete.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.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
    R _pytest/impl
    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/python_api.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    A changelog/2562.trivial
    A changelog/2571.trivial
    A changelog/2574.bugfix
    A changelog/2581.trivial
    A changelog/971.doc
    M doc/en/_templates/globaltoc.html
    M doc/en/writing_plugins.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/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.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_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
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2594 from nicoddemus/fix-flake8-errors

Merge master into features and fix flake8 errors


  Commit: abb5d2084192e3d2bc5a68f20d9eb2284cd127cf
      https://github.com/pytest-dev/pytest/commit/abb5d2084192e3d2bc5a68f20d9eb2284cd127cf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    A changelog/2375.trivial
    M testing/test_capture.py

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


  Commit: 7341da1bc127f69b51957784252e1cd00623dfc0
      https://github.com/pytest-dev/pytest/commit/7341da1bc127f69b51957784252e1cd00623dfc0
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M _pytest/warnings.py
    A changelog/2598.feature
    M doc/en/warnings.rst
    M testing/test_warnings.py

  Log Message:
  -----------
  Introduce pytest.mark.filterwarnings


  Commit: cbceef20089889cc06b120ab71a994513e9f3cbb
      https://github.com/pytest-dev/pytest/commit/cbceef20089889cc06b120ab71a994513e9f3cbb
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M _pytest/warnings.py
    A changelog/2598.feature
    M doc/en/warnings.rst
    M testing/test_warnings.py

  Log Message:
  -----------
  Merge pull request #2598 from nicoddemus/filterwarnings-mark

Introduce filter-warnings mark


  Commit: 65b2de13a370ef743bf9be3259fc34ed43da29f1
      https://github.com/pytest-dev/pytest/commit/65b2de13a370ef743bf9be3259fc34ed43da29f1
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M _pytest/mark.py
    A changelog/2540.feature
    M testing/test_mark.py

  Log Message:
  -----------
  fix #2540, introduce mark.with_args


  Commit: 6461dc9fc69dbd916d500fad9b3fd6cf0ee3bdf7
      https://github.com/pytest-dev/pytest/commit/6461dc9fc69dbd916d500fad9b3fd6cf0ee3bdf7
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M _pytest/mark.py
    A changelog/2540.feature
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #2600 from RonnyPfannschmidt/mark_explicit_params

fix #2540, introduce mark.with_args


  Commit: 495f731760341130deeeb05bef504921d20b7473
      https://github.com/pytest-dev/pytest/commit/495f731760341130deeeb05bef504921d20b7473
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Simplify how comparisons with numpy arrays work.

Previously I was subverting the natural order of operations by
subclassing from `ndarray`, but it turns out that you can tell just
numpy to call your operator instead of its by setting the
`__array_priority__` attribute on your class.  This is much simpler, and
it turns out the be a little more robust, too.


  Commit: 4c45bc997149582f05a1c4853838190194a074be
      https://github.com/pytest-dev/pytest/commit/4c45bc997149582f05a1c4853838190194a074be
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Add the numpy tests back into tox.ini

I'm not sure why they were removed...


  Commit: a3b35e1c4b73ee93dc3399d1a0ce8035efaf9e8b
      https://github.com/pytest-dev/pytest/commit/a3b35e1c4b73ee93dc3399d1a0ce8035efaf9e8b
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  Remove `raises` and `approx` from `python.py`.

These two classes were recently moved to `python_api.py`, but it seems
that they found their way back into the original file somehow.  This
commit removes them again to avoid out-of-date code duplication.


  Commit: ebc7346be4da2d56e3c6f1686f545105f70b9c89
      https://github.com/pytest-dev/pytest/commit/ebc7346be4da2d56e3c6f1686f545105f70b9c89
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Raise TypeError for types that can't be compared to arrays.


  Commit: 7e0553267dbe80fc389d68583a16c05d11382607
      https://github.com/pytest-dev/pytest/commit/7e0553267dbe80fc389d68583a16c05d11382607
  Author: Kale Kundert <kale at thekunderts.net>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  Remove unused import.


  Commit: b35554ca2b2f0df2fcc1882c538a61b7db06c68c
      https://github.com/pytest-dev/pytest/commit/b35554ca2b2f0df2fcc1882c538a61b7db06c68c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  Merge pull request #2607 from kalekundert/remove-code-dup

Remove stale copies of raises and approx


  Commit: 1b732fe3612985421d1ad40f1d84a460005f7967
      https://github.com/pytest-dev/pytest/commit/1b732fe3612985421d1ad40f1d84a460005f7967
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M _pytest/python_api.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2606 from kalekundert/simplify-numpy

Make approx more compatible with numpy


  Commit: 0726d9a09f26dece8f0638bb644add34c3e9359f
      https://github.com/pytest-dev/pytest/commit/0726d9a09f26dece8f0638bb644add34c3e9359f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    A changelog/2588.trivial
    M testing/python/collect.py
    M testing/python/metafunc.py
    M testing/python/setup_only.py
    M testing/test_mark.py
    M testing/test_recwarn.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Turn warnings into errors in pytest's own test suite

Fix #2588


  Commit: bda07d8b277ed4d3027a58e932a0444789670ed3
      https://github.com/pytest-dev/pytest/commit/bda07d8b277ed4d3027a58e932a0444789670ed3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M testing/test_unittest.py

  Log Message:
  -----------
  Ignore socket warnings on windows for trial tests


  Commit: d5bb2004f9d1d688a8566547b2e92c409a4e1dbf
      https://github.com/pytest-dev/pytest/commit/d5bb2004f9d1d688a8566547b2e92c409a4e1dbf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-23 (Sun, 23 Jul 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Fix travis build after change from "precise" to "trusty"

Travis recently has changed its dist from "precise" to "trusty", so
some Python versions are no longer installed by default


  Commit: 309152d9fd860d1d29ad35ec7cc8a1262d806706
      https://github.com/pytest-dev/pytest/commit/309152d9fd860d1d29ad35ec7cc8a1262d806706
  Author: Florian Bruhin <me at the-compiler.org>
  Date:   2017-07-23 (Sun, 23 Jul 2017)

  Changed paths:
    M .travis.yml
    A changelog/2588.trivial
    M testing/python/collect.py
    M testing/python/metafunc.py
    M testing/python/setup_only.py
    M testing/test_mark.py
    M testing/test_recwarn.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2599 from nicoddemus/turn-warnings-into-errors

Turn warnings into errors WIP, waiting #2598


  Commit: 73c6122f35283a88f63db9c57c1dd5055a68d75e
      https://github.com/pytest-dev/pytest/commit/73c6122f35283a88f63db9c57c1dd5055a68d75e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M CONTRIBUTING.rst
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/warnings.py
    A changelog/2375.bugfix
    R changelog/2375.trivial
    A changelog/2510.bugfix
    M changelog/2533.trivial
    M changelog/2562.trivial
    M changelog/2574.bugfix
    M changelog/2581.trivial
    A changelog/2582.trivial
    A changelog/2610.bugfix
    M doc/en/cache.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/example/index.rst
    M doc/en/nose.rst
    A doc/en/pythonpath.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M testing/code/test_source.py
    A testing/code/test_source_multiline_block.py
    M testing/test_capture.py
    M testing/test_doctest.py
    M tox.ini

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


  Commit: d3ab1b9df4b8854b75c5fe88157aae2b5c572357
      https://github.com/pytest-dev/pytest/commit/d3ab1b9df4b8854b75c5fe88157aae2b5c572357
  Author: Maik Figura <maiksensi at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Add user documentation

The new doc section explains why we raise a `NotImplementedError`.


  Commit: f0936d42fbb13eb3db4ee4bdf35e981bb7da2a4c
      https://github.com/pytest-dev/pytest/commit/f0936d42fbb13eb3db4ee4bdf35e981bb7da2a4c
  Author: Maik Figura <maiksensi at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Fix linter errors


  Commit: 1851f36beba36a08eb6946a6a187bfc8a0ebcbd4
      https://github.com/pytest-dev/pytest/commit/1851f36beba36a08eb6946a6a187bfc8a0ebcbd4
  Author: Maik Figura <maiksensi at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M AUTHORS
    A changelog/2003.feature

  Log Message:
  -----------
  Add PR requirements changelog and authors


  Commit: 57a232fc5a275f7a0ae813713afba436c658262a
      https://github.com/pytest-dev/pytest/commit/57a232fc5a275f7a0ae813713afba436c658262a
  Author: Maik Figura <maiksensi at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Remove out of scope change


  Commit: 80f4699572c0ccd304f30a9451d1728066b0db27
      https://github.com/pytest-dev/pytest/commit/80f4699572c0ccd304f30a9451d1728066b0db27
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M _pytest/python_api.py
    R changelog/2003.feature
    A changelog/2003.removal
    M testing/python/approx.py

  Log Message:
  -----------
  approx raises TypeError in Python 2 for comparison operators other than != and ==


  Commit: b39f957b88b6f44252c0ad2eb289b92fd7937f8e
      https://github.com/pytest-dev/pytest/commit/b39f957b88b6f44252c0ad2eb289b92fd7937f8e
  Author: Lawrence Mitchell <lawrence.mitchell at imperial.ac.uk>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Add test of issue #920


  Commit: a546a612bde02292488b6f9b3185a950d61fbe94
      https://github.com/pytest-dev/pytest/commit/a546a612bde02292488b6f9b3185a950d61fbe94
  Author: Lawrence Mitchell <lawrence.mitchell at imperial.ac.uk>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/fixtures.py
    A changelog/920.bugfix
    M testing/python/fixture.py
    M tox.ini

  Log Message:
  -----------
  Fix nondeterminism in fixture collection order

fixtures.reorder_items is non-deterministic because it reorders based
on iteration over an (unordered) set.  Change the code to use an
OrderedDict instead so that we get deterministic behaviour, fixes #920.


  Commit: f8bd693f8348dbf5b0536b5529cc5a4884bf06b7
      https://github.com/pytest-dev/pytest/commit/f8bd693f8348dbf5b0536b5529cc5a4884bf06b7
  Author: Lawrence Mitchell <lawrence.mitchell at imperial.ac.uk>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M setup.py
    M tox.ini

  Log Message:
  -----------
  Add ordereddict to install_requires for py26


  Commit: f047e078e2d1c8aba19015e151c1e78c5cbc1cff
      https://github.com/pytest-dev/pytest/commit/f047e078e2d1c8aba19015e151c1e78c5cbc1cff
  Author: Lawrence Mitchell <lawrence.mitchell at imperial.ac.uk>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M changelog/920.bugfix
    M doc/en/getting-started.rst

  Log Message:
  -----------
  Mention new (py26) ordereddict dependency in changelog and docs


  Commit: 3d89905114142a434d867ef2c8c6287cb1cfb8da
      https://github.com/pytest-dev/pytest/commit/3d89905114142a434d867ef2c8c6287cb1cfb8da
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M AUTHORS
    M CONTRIBUTING.rst
    M _pytest/capture.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/skipping.py
    A changelog/2023.bugfix
    A changelog/2546.trivial
    A changelog/2548.bugfix
    A changelog/2555.bugfix
    A changelog/2620.trivial
    M changelog/_template.rst
    M testing/test_capture.py
    M testing/test_skipping.py

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


  Commit: ddf1751e6d749557c689dab874d7a475f60b2387
      https://github.com/pytest-dev/pytest/commit/ddf1751e6d749557c689dab874d7a475f60b2387
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-27 (Thu, 27 Jul 2017)

  Changed paths:
    M AUTHORS
    M CONTRIBUTING.rst
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/doctest.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/skipping.py
    M _pytest/warnings.py
    A changelog/2023.bugfix
    A changelog/2375.bugfix
    R changelog/2375.trivial
    A changelog/2510.bugfix
    M changelog/2533.trivial
    A changelog/2546.trivial
    A changelog/2548.bugfix
    A changelog/2555.bugfix
    M changelog/2562.trivial
    M changelog/2574.bugfix
    M changelog/2581.trivial
    A changelog/2582.trivial
    A changelog/2610.bugfix
    A changelog/2620.trivial
    M changelog/_template.rst
    M doc/en/cache.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/example/index.rst
    M doc/en/nose.rst
    A doc/en/pythonpath.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M testing/code/test_source.py
    A testing/code/test_source_multiline_block.py
    M testing/test_capture.py
    M testing/test_doctest.py
    M testing/test_skipping.py
    M tox.ini

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

Merge master into features


  Commit: 17c544e793f95a7e0423114a435ff51c17e8ad5e
      https://github.com/pytest-dev/pytest/commit/17c544e793f95a7e0423114a435ff51c17e8ad5e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-27 (Thu, 27 Jul 2017)

  Changed paths:
    M _pytest/hookspec.py
    M _pytest/terminal.py
    A changelog/2622.feature
    M doc/en/writing_plugins.rst
    M testing/test_terminal.py

  Log Message:
  -----------
  Introduce new pytest_report_collectionfinish hook

Fix #2622


  Commit: e97fd5ec55fcccbd770fc4bb6549c28fe11a4fb5
      https://github.com/pytest-dev/pytest/commit/e97fd5ec55fcccbd770fc4bb6549c28fe11a4fb5
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-27 (Thu, 27 Jul 2017)

  Changed paths:
    M _pytest/hookspec.py
    M _pytest/terminal.py
    A changelog/2622.feature
    M doc/en/writing_plugins.rst
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #2623 from nicoddemus/post-collection-report-hook

Introduce new pytest_report_collectionfinish hook


  Commit: 62810f61b22341bc2b0a09da30252dfb0f57e027
      https://github.com/pytest-dev/pytest/commit/62810f61b22341bc2b0a09da30252dfb0f57e027
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-27 (Thu, 27 Jul 2017)

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/2621.feature
    M testing/test_cache.py

  Log Message:
  -----------
  Make cache plugin always remember failed tests


  Commit: 22212c4d61823e767de2b34da362960e4882113f
      https://github.com/pytest-dev/pytest/commit/22212c4d61823e767de2b34da362960e4882113f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-27 (Thu, 27 Jul 2017)

  Changed paths:
    M testing/test_cache.py

  Log Message:
  -----------
  Add xfail specific tests


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

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

  Log Message:
  -----------
  xfail and skipped tests are removed from the "last-failed" cache

This accommodates the case where a failing test is marked as
skipped/failed later


  Commit: 17121960b45cffa1dea40a1fa14efa4ee5499f9b
      https://github.com/pytest-dev/pytest/commit/17121960b45cffa1dea40a1fa14efa4ee5499f9b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M _pytest/cacheprovider.py
    A changelog/2621.feature
    M testing/test_cache.py

  Log Message:
  -----------
  Merge pull request #2621 from nicoddemus/cumulative-cache

Make cache plugin cumulative


  Commit: 75e6f7717c12d9fe50a2b0cd0eed86ea0bc4797d
      https://github.com/pytest-dev/pytest/commit/75e6f7717c12d9fe50a2b0cd0eed86ea0bc4797d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

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

  Log Message:
  -----------
  Use new hook to report accurate tests skipped in --lf and --ff


  Commit: 5acb64be900e499087bdff8d2e0a37683617b65f
      https://github.com/pytest-dev/pytest/commit/5acb64be900e499087bdff8d2e0a37683617b65f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M _pytest/hookspec.py

  Log Message:
  -----------
  Add versionadded tag to pytest_report_collectionfinish hook


  Commit: 7a12acb6a1164935ae79030a8220e5be1e999e7d
      https://github.com/pytest-dev/pytest/commit/7a12acb6a1164935ae79030a8220e5be1e999e7d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M _pytest/hookspec.py

  Log Message:
  -----------
  Fix linting


  Commit: 06a49338b2b1be8daed89f779439459a2cb4cbc7
      https://github.com/pytest-dev/pytest/commit/06a49338b2b1be8daed89f779439459a2cb4cbc7
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/main.py
    A _pytest/outcomes.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/unittest.py
    A changelog/580.feature
    M doc/en/builtin.rst
    M pytest.py
    M testing/test_runner.py

  Log Message:
  -----------
  make Test Outcomes inherit from BaseException instead of exception

fixes #580


  Commit: be401bc2f87ee3ab6fb48a2dd4d415581f847a6e
      https://github.com/pytest-dev/pytest/commit/be401bc2f87ee3ab6fb48a2dd4d415581f847a6e
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M _pytest/outcomes.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M testing/test_runner.py

  Log Message:
  -----------
  fix linting issues


  Commit: 768edde899fe3629a69d55289f82bb0d95635c06
      https://github.com/pytest-dev/pytest/commit/768edde899fe3629a69d55289f82bb0d95635c06
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

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

  Log Message:
  -----------
  Merge pull request #2624 from nicoddemus/lf-report-after-collection

Fix --last-failed reported items in terminal


  Commit: 2e61f702c09899bf375dba0c59eec3760fdd8990
      https://github.com/pytest-dev/pytest/commit/2e61f702c09899bf375dba0c59eec3760fdd8990
  Author: Jordan Moldow <jmoldow at box.com>
  Date:   2017-07-29 (Sat, 29 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/_code/code.py
    A changelog/2631.feature
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Support PEP-415's Exception.__suppress_context__

PEP-415 states that `exception.__context__` should be suppressed
in traceback outputs, if `exception.__suppress_context__` is
`True`.

Now if a ``raise exception from None`` is caught by pytest,
pytest will no longer chain the context in the test report.

The algorithm in `FormattedExcinfo` now better matches the one
in `traceback.TracebackException`.

`Exception.__suppress_context__` is available in all of the
versions of Python 3 that are supported by pytest.

Fixes #2631.


  Commit: 4cd87273791d1bfc1b39f1a181e623f80a7c1cfa
      https://github.com/pytest-dev/pytest/commit/4cd87273791d1bfc1b39f1a181e623f80a7c1cfa
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/fixtures.py
    A changelog/920.bugfix
    M doc/en/getting-started.rst
    M setup.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #2617 from wence-/fix/nondeterministic-fixtures

Fix nondeterminism in fixture collection order


  Commit: 713f7636e1d18cf5f817906ae1505cc9633c571b
      https://github.com/pytest-dev/pytest/commit/713f7636e1d18cf5f817906ae1505cc9633c571b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/_code/code.py
    A changelog/2631.feature
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Merge pull request #2632 from jmoldow/pep_0415_suppress_exception_context

Support PEP-415's Exception.__suppress_context__


  Commit: e1aed8cb17871e634a30c21920f15a838b56bf6b
      https://github.com/pytest-dev/pytest/commit/e1aed8cb17871e634a30c21920f15a838b56bf6b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/main.py
    A _pytest/outcomes.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/unittest.py
    A changelog/580.feature
    M doc/en/builtin.rst
    M pytest.py
    M testing/test_runner.py

  Log Message:
  -----------
  Merge pull request #2490 from RonnyPfannschmidt/fix-580

Test Outcomes as BaseException - fix #580


  Commit: 763c580a2a578eeefe72f72206b09b6d01b69350
      https://github.com/pytest-dev/pytest/commit/763c580a2a578eeefe72f72206b09b6d01b69350
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/python_api.py
    A changelog/2003.removal
    M testing/python/approx.py

  Log Message:
  -----------
  Merge pull request #2576 from maiksensi/feat/raise-not-implemented-for-lt-gt-in-approx

#2003 Change behavior of `approx.py` to only support `__eq__` comparison


  Commit: f1467f8f0385c17c02524b70e0bac949d4dbd116
      https://github.com/pytest-dev/pytest/commit/f1467f8f0385c17c02524b70e0bac949d4dbd116
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M doc/en/cache.rst
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/example/attic.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    A doc/en/historical-notes.rst
    M doc/en/parametrize.rst
    R doc/en/setup.rst
    M doc/en/skipping.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst

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


  Commit: 07dd1ca7b88f2e1076376270b5cfc4f528de44b3
      https://github.com/pytest-dev/pytest/commit/07dd1ca7b88f2e1076376270b5cfc4f528de44b3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1994.feature
    R changelog/2003.removal
    R changelog/2023.bugfix
    R changelog/2147.removal
    R changelog/2375.bugfix
    R changelog/2427.removal
    R changelog/2444.trivial
    R changelog/2489.trivial
    R changelog/2510.bugfix
    R changelog/2516.feature
    R changelog/2518.feature
    R changelog/2528.feature
    R changelog/2533.trivial
    R changelog/2539.doc
    R changelog/2540.feature
    R changelog/2543.feature
    R changelog/2546.trivial
    R changelog/2548.bugfix
    R changelog/2555.bugfix
    R changelog/2562.trivial
    R changelog/2571.trivial
    R changelog/2574.bugfix
    R changelog/2581.trivial
    R changelog/2582.trivial
    R changelog/2583.feature
    R changelog/2588.trivial
    R changelog/2598.feature
    R changelog/2610.bugfix
    R changelog/2620.trivial
    R changelog/2621.feature
    R changelog/2622.feature
    R changelog/2631.feature
    R changelog/580.feature
    R changelog/920.bugfix
    R changelog/971.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/parametrize.rst

  Log Message:
  -----------
  Preparing release version 3.2.0


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update grammar in changelog as requested


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

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M _pytest/cacheprovider.py
    M _pytest/compat.py
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/mark.py
    A _pytest/outcomes.py
    M _pytest/python.py
    A _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    M appveyor.yml
    R changelog/2023.bugfix
    R changelog/2375.bugfix
    R changelog/2444.trivial
    R changelog/2510.bugfix
    R changelog/2533.trivial
    R changelog/2539.doc
    R changelog/2546.trivial
    R changelog/2548.bugfix
    R changelog/2555.bugfix
    R changelog/2562.trivial
    R changelog/2571.trivial
    R changelog/2574.bugfix
    R changelog/2581.trivial
    R changelog/2582.trivial
    R changelog/2610.bugfix
    R changelog/2620.trivial
    R changelog/971.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/customize.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/getting-started.rst
    M doc/en/parametrize.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pytest.py
    M setup.py
    M testing/code/test_excinfo.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/setup_only.py
    M testing/test_cache.py
    M testing/test_collection.py
    M testing/test_mark.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

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


Compare: https://github.com/pytest-dev/pytest/compare/51ebad76f2b9...0a15edd57325

From nicoddemus at gmail.com  Tue Aug  1 18:36:44 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 01 Aug 2017 15:36:44 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 07dd1c: Preparing release
 version 3.2.0
Message-ID: <5981027c48015_7d23fdd72c63c2c405a9@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 07dd1ca7b88f2e1076376270b5cfc4f528de44b3
      https://github.com/pytest-dev/pytest/commit/07dd1ca7b88f2e1076376270b5cfc4f528de44b3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1994.feature
    R changelog/2003.removal
    R changelog/2023.bugfix
    R changelog/2147.removal
    R changelog/2375.bugfix
    R changelog/2427.removal
    R changelog/2444.trivial
    R changelog/2489.trivial
    R changelog/2510.bugfix
    R changelog/2516.feature
    R changelog/2518.feature
    R changelog/2528.feature
    R changelog/2533.trivial
    R changelog/2539.doc
    R changelog/2540.feature
    R changelog/2543.feature
    R changelog/2546.trivial
    R changelog/2548.bugfix
    R changelog/2555.bugfix
    R changelog/2562.trivial
    R changelog/2571.trivial
    R changelog/2574.bugfix
    R changelog/2581.trivial
    R changelog/2582.trivial
    R changelog/2583.feature
    R changelog/2588.trivial
    R changelog/2598.feature
    R changelog/2610.bugfix
    R changelog/2620.trivial
    R changelog/2621.feature
    R changelog/2622.feature
    R changelog/2631.feature
    R changelog/580.feature
    R changelog/920.bugfix
    R changelog/971.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/parametrize.rst

  Log Message:
  -----------
  Preparing release version 3.2.0


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update grammar in changelog as requested


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

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  Fix merge instruction after a minor/major release


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

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M _pytest/cacheprovider.py
    M _pytest/compat.py
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/mark.py
    A _pytest/outcomes.py
    M _pytest/python.py
    A _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    M appveyor.yml
    R changelog/2023.bugfix
    R changelog/2375.bugfix
    R changelog/2444.trivial
    R changelog/2510.bugfix
    R changelog/2533.trivial
    R changelog/2539.doc
    R changelog/2546.trivial
    R changelog/2548.bugfix
    R changelog/2555.bugfix
    R changelog/2562.trivial
    R changelog/2571.trivial
    R changelog/2574.bugfix
    R changelog/2581.trivial
    R changelog/2582.trivial
    R changelog/2610.bugfix
    R changelog/2620.trivial
    R changelog/971.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/customize.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/getting-started.rst
    M doc/en/parametrize.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pytest.py
    M setup.py
    M testing/code/test_excinfo.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/setup_only.py
    M testing/test_cache.py
    M testing/test_collection.py
    M testing/test_mark.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

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


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

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/1994.feature
    R changelog/2003.removal
    R changelog/2023.bugfix
    R changelog/2147.removal
    R changelog/2375.bugfix
    R changelog/2427.removal
    R changelog/2444.trivial
    R changelog/2489.trivial
    R changelog/2510.bugfix
    R changelog/2516.feature
    R changelog/2518.feature
    R changelog/2528.feature
    R changelog/2533.trivial
    R changelog/2539.doc
    R changelog/2540.feature
    R changelog/2543.feature
    R changelog/2546.trivial
    R changelog/2548.bugfix
    R changelog/2555.bugfix
    R changelog/2562.trivial
    R changelog/2571.trivial
    R changelog/2574.bugfix
    R changelog/2581.trivial
    R changelog/2582.trivial
    R changelog/2583.feature
    R changelog/2588.trivial
    R changelog/2598.feature
    R changelog/2610.bugfix
    R changelog/2620.trivial
    R changelog/2621.feature
    R changelog/2622.feature
    R changelog/2631.feature
    R changelog/580.feature
    R changelog/920.bugfix
    R changelog/971.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/parametrize.rst

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


Compare: https://github.com/pytest-dev/pytest/compare/6e7547244bc2...40254b64e567

From nicoddemus at gmail.com  Tue Aug  1 19:14:40 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 01 Aug 2017 16:14:40 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 840612: Tiny rst syntax fix
Message-ID: <59810b60bf6e2_74473fba5cb53c3030757@hookshot-fe2-cp1-prd.iad.github.net.mail>

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

  Changed paths:
    M CHANGELOG.rst

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


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

  Changed paths:
    M CHANGELOG.rst

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

Tiny rst syntax fix


Compare: https://github.com/pytest-dev/pytest/compare/0a15edd57325...02da1563512d

From nicoddemus at gmail.com  Sun Aug  6 10:19:12 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 06 Aug 2017 07:19:12 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a0101f: remove os.sep as it
 behaves differently linux and ...
Message-ID: <5987256012dec_7ead3f92a357dc3876272@hookshot-fe3-cp1-prd.iad.github.net.mail>

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

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

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

* on linux it is '/'

* on windows it is '\'


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

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

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

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


Compare: https://github.com/pytest-dev/pytest/compare/d5f4496bdf86...76c55b31c658

From nicoddemus at gmail.com  Mon Aug  7 11:57:56 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 07 Aug 2017 08:57:56 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 110617: First restructure
Message-ID: <59888e042524b_254f3fcce3e8fc34295a2@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/documentation-restructure
  Home:   https://github.com/pytest-dev/pytest
  Commit: 1106177f10e626ea96befcd8cc73e7bd01e6b56b
      https://github.com/pytest-dev/pytest/commit/1106177f10e626ea96befcd8cc73e7bd01e6b56b
  Author: Daniele Procida <daniele at vurt.org>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    A doc/en/about/announce/adopt.rst
    A doc/en/about/announce/index.rst
    A doc/en/about/announce/release-2.0.0.rst
    A doc/en/about/announce/release-2.0.1.rst
    A doc/en/about/announce/release-2.0.2.rst
    A doc/en/about/announce/release-2.0.3.rst
    A doc/en/about/announce/release-2.1.0.rst
    A doc/en/about/announce/release-2.1.1.rst
    A doc/en/about/announce/release-2.1.2.rst
    A doc/en/about/announce/release-2.1.3.rst
    A doc/en/about/announce/release-2.2.0.rst
    A doc/en/about/announce/release-2.2.1.rst
    A doc/en/about/announce/release-2.2.2.rst
    A doc/en/about/announce/release-2.2.4.rst
    A doc/en/about/announce/release-2.3.0.rst
    A doc/en/about/announce/release-2.3.1.rst
    A doc/en/about/announce/release-2.3.2.rst
    A doc/en/about/announce/release-2.3.3.rst
    A doc/en/about/announce/release-2.3.4.rst
    A doc/en/about/announce/release-2.3.5.rst
    A doc/en/about/announce/release-2.4.0.rst
    A doc/en/about/announce/release-2.4.1.rst
    A doc/en/about/announce/release-2.4.2.rst
    A doc/en/about/announce/release-2.5.0.rst
    A doc/en/about/announce/release-2.5.1.rst
    A doc/en/about/announce/release-2.5.2.rst
    A doc/en/about/announce/release-2.6.0.rst
    A doc/en/about/announce/release-2.6.1.rst
    A doc/en/about/announce/release-2.6.2.rst
    A doc/en/about/announce/release-2.6.3.rst
    A doc/en/about/announce/release-2.7.0.rst
    A doc/en/about/announce/release-2.7.1.rst
    A doc/en/about/announce/release-2.7.2.rst
    A doc/en/about/announce/release-2.8.2.rst
    A doc/en/about/announce/release-2.8.3.rst
    A doc/en/about/announce/release-2.8.4.rst
    A doc/en/about/announce/release-2.8.5.rst
    A doc/en/about/announce/release-2.8.6.rst
    A doc/en/about/announce/release-2.8.7.rst
    A doc/en/about/announce/release-2.9.0.rst
    A doc/en/about/announce/release-2.9.1.rst
    A doc/en/about/announce/release-2.9.2.rst
    A doc/en/about/announce/release-3.0.0.rst
    A doc/en/about/announce/release-3.0.1.rst
    A doc/en/about/announce/release-3.0.2.rst
    A doc/en/about/announce/release-3.0.3.rst
    A doc/en/about/announce/release-3.0.4.rst
    A doc/en/about/announce/release-3.0.5.rst
    A doc/en/about/announce/release-3.0.6.rst
    A doc/en/about/announce/release-3.0.7.rst
    A doc/en/about/announce/release-3.1.0.rst
    A doc/en/about/announce/release-3.1.1.rst
    A doc/en/about/announce/release-3.1.2.rst
    A doc/en/about/announce/release-3.1.3.rst
    A doc/en/about/announce/sprint2016.rst
    A doc/en/about/changelog.rst
    A doc/en/about/contact.rst
    A doc/en/about/contributing.rst
    A doc/en/about/index.rst
    A doc/en/about/license.rst
    A doc/en/about/projects.rst
    A doc/en/about/talks.rst
    R doc/en/adopt.rst
    R doc/en/announce/index.rst
    R doc/en/announce/release-2.0.0.rst
    R doc/en/announce/release-2.0.1.rst
    R doc/en/announce/release-2.0.2.rst
    R doc/en/announce/release-2.0.3.rst
    R doc/en/announce/release-2.1.0.rst
    R doc/en/announce/release-2.1.1.rst
    R doc/en/announce/release-2.1.2.rst
    R doc/en/announce/release-2.1.3.rst
    R doc/en/announce/release-2.2.0.rst
    R doc/en/announce/release-2.2.1.rst
    R doc/en/announce/release-2.2.2.rst
    R doc/en/announce/release-2.2.4.rst
    R doc/en/announce/release-2.3.0.rst
    R doc/en/announce/release-2.3.1.rst
    R doc/en/announce/release-2.3.2.rst
    R doc/en/announce/release-2.3.3.rst
    R doc/en/announce/release-2.3.4.rst
    R doc/en/announce/release-2.3.5.rst
    R doc/en/announce/release-2.4.0.rst
    R doc/en/announce/release-2.4.1.rst
    R doc/en/announce/release-2.4.2.rst
    R doc/en/announce/release-2.5.0.rst
    R doc/en/announce/release-2.5.1.rst
    R doc/en/announce/release-2.5.2.rst
    R doc/en/announce/release-2.6.0.rst
    R doc/en/announce/release-2.6.1.rst
    R doc/en/announce/release-2.6.2.rst
    R doc/en/announce/release-2.6.3.rst
    R doc/en/announce/release-2.7.0.rst
    R doc/en/announce/release-2.7.1.rst
    R doc/en/announce/release-2.7.2.rst
    R doc/en/announce/release-2.8.2.rst
    R doc/en/announce/release-2.8.3.rst
    R doc/en/announce/release-2.8.4.rst
    R doc/en/announce/release-2.8.5.rst
    R doc/en/announce/release-2.8.6.rst
    R doc/en/announce/release-2.8.7.rst
    R doc/en/announce/release-2.9.0.rst
    R doc/en/announce/release-2.9.1.rst
    R doc/en/announce/release-2.9.2.rst
    R doc/en/announce/release-3.0.0.rst
    R doc/en/announce/release-3.0.1.rst
    R doc/en/announce/release-3.0.2.rst
    R doc/en/announce/release-3.0.3.rst
    R doc/en/announce/release-3.0.4.rst
    R doc/en/announce/release-3.0.5.rst
    R doc/en/announce/release-3.0.6.rst
    R doc/en/announce/release-3.0.7.rst
    R doc/en/announce/release-3.1.0.rst
    R doc/en/announce/release-3.1.1.rst
    R doc/en/announce/release-3.1.2.rst
    R doc/en/announce/release-3.1.3.rst
    R doc/en/announce/sprint2016.rst
    R doc/en/assert.rst
    A doc/en/background/backwards-compatibility.rst
    A doc/en/background/faq.rst
    A doc/en/background/goodpractices.rst
    A doc/en/background/index.rst
    R doc/en/backwards-compatibility.rst
    R doc/en/bash-completion.rst
    R doc/en/builtin.rst
    R doc/en/cache.rst
    R doc/en/capture.rst
    R doc/en/changelog.rst
    R doc/en/contact.rst
    R doc/en/contents.rst
    R doc/en/contributing.rst
    R doc/en/customize.rst
    R doc/en/doctest.rst
    R doc/en/existingtestsuite.rst
    R doc/en/faq.rst
    R doc/en/fixture.rst
    R doc/en/funcarg_compare.rst
    R doc/en/getting-started.rst
    R doc/en/goodpractices.rst
    A doc/en/how-to/assert.rst
    A doc/en/how-to/bash-completion.rst
    A doc/en/how-to/builtin.rst
    A doc/en/how-to/cache.rst
    A doc/en/how-to/capture.rst
    A doc/en/how-to/customize.rst
    A doc/en/how-to/doctest.rst
    A doc/en/how-to/existingtestsuite.rst
    A doc/en/how-to/fixture.rst
    A doc/en/how-to/funcarg_compare.rst
    A doc/en/how-to/index.rst
    A doc/en/how-to/mark.rst
    A doc/en/how-to/monkeypatch.rst
    A doc/en/how-to/naming20.rst
    A doc/en/how-to/nose.rst
    A doc/en/how-to/parametrize.rst
    A doc/en/how-to/plugins.rst
    A doc/en/how-to/recwarn.rst
    A doc/en/how-to/skipping.rst
    A doc/en/how-to/tmpdir.rst
    A doc/en/how-to/unittest.rst
    A doc/en/how-to/usage.rst
    A doc/en/how-to/warnings.rst
    A doc/en/how-to/writing_plugins.rst
    A doc/en/how-to/xunit_setup.rst
    A doc/en/how-to/yieldfixture.rst
    A doc/en/introduction/getting-started.rst
    A doc/en/introduction/index.rst
    R doc/en/license.rst
    R doc/en/mark.rst
    R doc/en/monkeypatch.rst
    R doc/en/naming20.rst
    R doc/en/nose.rst
    R doc/en/parametrize.rst
    R doc/en/plugins.rst
    R doc/en/projects.rst
    R doc/en/recwarn.rst
    M doc/en/requirements.txt
    R doc/en/skipping.rst
    R doc/en/talks.rst
    R doc/en/tmpdir.rst
    R doc/en/unittest.rst
    R doc/en/usage.rst
    R doc/en/warnings.rst
    R doc/en/writing_plugins.rst
    R doc/en/xunit_setup.rst
    R doc/en/yieldfixture.rst
    A requirements-docs.txt

  Log Message:
  -----------
  First restructure


  Commit: c6fe15c05afdd14b40187e59be9214a19c373d5b
      https://github.com/pytest-dev/pytest/commit/c6fe15c05afdd14b40187e59be9214a19c373d5b
  Author: Daniele Procida <daniele at vurt.org>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/conf.py
    M doc/en/requirements.txt

  Log Message:
  -----------
  improved Makefile and installation configuration


  Commit: fff8103094974f9c19f523e697224db4bd57bc28
      https://github.com/pytest-dev/pytest/commit/fff8103094974f9c19f523e697224db4bd57bc28
  Author: Daniele Procida <daniele at vurt.org>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M doc/en/Makefile
    M doc/en/conf.py
    M doc/en/requirements.txt

  Log Message:
  -----------
  Added autobuild and other configuration


  Commit: af68d5e902da2d86a8d1b8368e4f3004ef8cf35c
      https://github.com/pytest-dev/pytest/commit/af68d5e902da2d86a8d1b8368e4f3004ef8cf35c
  Author: Daniele Procida <daniele at vurt.org>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M doc/en/about/announce/sprint2016.rst
    M doc/en/about/index.rst
    M doc/en/about/projects.rst
    M doc/en/background/faq.rst
    M doc/en/background/goodpractices.rst
    M doc/en/background/index.rst
    M doc/en/conf.py
    M doc/en/example/index.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/how-to/capture.rst
    M doc/en/how-to/existingtestsuite.rst
    M doc/en/how-to/index.rst
    M doc/en/how-to/nose.rst
    M doc/en/how-to/skipping.rst
    M doc/en/how-to/usage.rst
    M doc/en/index.rst
    M doc/en/introduction/getting-started.rst
    A doc/en/reference/index.rst

  Log Message:
  -----------
  Tidied up most sections


  Commit: f05c0b7783f6b3eeeda00ba9e2648c4766930dc5
      https://github.com/pytest-dev/pytest/commit/f05c0b7783f6b3eeeda00ba9e2648c4766930dc5
  Author: Daniele Procida <daniele at vurt.org>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    M doc/en/how-to/bash-completion.rst
    M doc/en/how-to/index.rst
    M doc/en/how-to/plugins.rst
    M doc/en/how-to/writing_plugins.rst
    A doc/en/reference/default_plugins.rst
    M doc/en/reference/index.rst

  Log Message:
  -----------
  Started article-by-article revision (how-tos)


  Commit: 1d0ad66ff9663d909b7c0d7693515a4cd8239183
      https://github.com/pytest-dev/pytest/commit/1d0ad66ff9663d909b7c0d7693515a4cd8239183
  Author: Daniele Procida <daniele at vurt.org>
  Date:   2017-08-07 (Mon, 07 Aug 2017)

  Changed paths:
    A doc/en/about/announce/release-3.2.0.rst
    R doc/en/announce/release-3.2.0.rst
    A doc/en/background/historical-notes.rst
    M doc/en/background/index.rst
    A doc/en/background/pythonpath.rst
    R doc/en/historical-notes.rst
    M doc/en/how-to/index.rst
    R doc/en/pythonpath.rst

  Log Message:
  -----------
  Tidied up after rebasing


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

  Changed paths:
    M doc/en/conf.py

  Log Message:
  -----------
  Fix conf.py to work on Python < 3.6


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

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Add sphinx ReadTheDocs team to build docs locally


Compare: https://github.com/pytest-dev/pytest/compare/1106177f10e6^...4fdc8ad94ca8

From nicoddemus at gmail.com  Wed Aug  9 07:18:28 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 09 Aug 2017 04:18:28 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] c847b8: Use
 `pytest_collection_modifyitems()` in the run/s...
Message-ID: <598aef849b8d6_468c3f961e0e1c3c1111f5@hookshot-fe3-cp1-prd.iad.github.net.mail>

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

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

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


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

  Changed paths:
    A changelog/2653.doc

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


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

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

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

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


Compare: https://github.com/pytest-dev/pytest/compare/523bfa615108...e6020781f6c5

From nicoddemus at gmail.com  Wed Aug  9 16:14:54 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 09 Aug 2017 13:14:54 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 8b322a: Make generated doc in
 simple.rst more reliable
Message-ID: <598b6d3e785fd_4ca43fd99d3bdc2c56067@hookshot-fe6-cp1-prd.iad.github.net.mail>

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

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

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

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


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

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

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


Compare: https://github.com/pytest-dev/pytest/compare/8b322afcdb09^...45d2962e97ea

From nicoddemus at gmail.com  Wed Aug  9 16:15:23 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 09 Aug 2017 13:15:23 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 8b322a: Make generated doc in
 simple.rst more reliable
Message-ID: <598b6d5b6e45f_3f8c3f8fbdebdc2862586@hookshot-fe5-cp1-prd.iad.github.net.mail>

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

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

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

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


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

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

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


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

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

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

Release 3.2.1


Compare: https://github.com/pytest-dev/pytest/compare/e6020781f6c5...fd84c886ee58

From nicoddemus at gmail.com  Thu Aug 10 20:15:24 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 10 Aug 2017 17:15:24 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 021fba: Update number of
 plugins on README and poiint to p...
Message-ID: <598cf71c17b2b_74a63ffdbd283c3c779ec@hookshot-fe1-cp1-prd.iad.github.net.mail>

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

  Changed paths:
    M README.rst

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



From nicoddemus at gmail.com  Mon Aug 14 19:33:17 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 14 Aug 2017 16:33:17 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] eb4625: fix #2675 - store marks
 correctly in callspecs
Message-ID: <5992333d7e49e_5e633fdb92fc1c3499793@hookshot-fe6-cp1-prd.iad.github.net.mail>

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

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/2672.removal
    A changelog/2675.removal
    M testing/python/metafunc.py

  Log Message:
  -----------
  fix #2675 - store marks correctly in callspecs


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

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/2672.removal
    A changelog/2675.removal
    M testing/python/metafunc.py

  Log Message:
  -----------
  Merge pull request #2675 from RonnyPfannschmidt/mark-callspeck

ensure callspecs contain the list of marks


Compare: https://github.com/pytest-dev/pytest/compare/9e62a31b63c9...5f17caa156c1

From nicoddemus at gmail.com  Mon Aug 14 19:29:41 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 14 Aug 2017 16:29:41 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] dc9154: Add default values
 documentation for python_files, ...
Message-ID: <599232653e667_26443fa92587fc401201f1@hookshot-fe2-cp1-prd.iad.github.net.mail>

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

  Changed paths:
    M doc/en/customize.rst

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


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

  Changed paths:
    M doc/en/customize.rst

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

Add default values documentation for python_files, python_classes and python_functions


Compare: https://github.com/pytest-dev/pytest/compare/5c0c1977e36e...e9bfccdf2d59

From nicoddemus at gmail.com  Tue Aug 15 22:05:26 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 15 Aug 2017 19:05:26 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] bfc9f6: Update the number of
 plugins in index.rst
Message-ID: <5993a8662d465_6f173ff0f0811c285852b@hookshot-fe5-cp1-prd.iad.github.net.mail>

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

  Changed paths:
    M doc/en/index.rst

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



From nicoddemus at gmail.com  Tue Aug 29 20:01:29 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 29 Aug 2017 17:01:29 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 657976: update raises
 documentation regarding regex match
Message-ID: <59a6005934f19_208e3fb2d257bc2c8949@hookshot-fe6-cp1-prd.iad.github.net.mail>

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

  Changed paths:
    M doc/en/assert.rst

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


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

  Changed paths:
    M doc/en/assert.rst

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

[DOC] update raises documentation regarding regex match


Compare: https://github.com/pytest-dev/pytest/compare/539523cfee4c...0824076e119c

From nicoddemus at gmail.com  Tue Aug 29 21:08:22 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 29 Aug 2017 18:08:22 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 1c891d: Fix typo in
 goodpractices.rst
Message-ID: <59a610064f43e_4d223ff2bedd3c2c98380@hookshot-fe2-cp1-prd.iad.github.net.mail>

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

  Changed paths:
    M doc/en/goodpractices.rst

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


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

  Changed paths:
    A changelog/2721.trivial

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


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

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

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

Fix typo in goodpractices.rst


Compare: https://github.com/pytest-dev/pytest/compare/0824076e119c...709b8b65a430