[Pytest-commit] [pytest-dev/pytest] 3d18c9: 'xfail' markers without a condition no longer rely...

Sun Mar 12 11:32:47 EDT 2017

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 3d18c9c1c6e58e30da97e74fc79efb91f1aae24e
      https://github.com/pytest-dev/pytest/commit/3d18c9c1c6e58e30da97e74fc79efb91f1aae24e
  Author: Barney Gale <barney.gale at gmail.com>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M _pytest/skipping.py

  Log Message:
  -----------
  'xfail' markers without a condition no longer rely on the underlying `Item`
deriving from `PyobjMixin`

  Commit: 8db9915374f60d00780b758b98ada8d3f80af9bb
      https://github.com/pytest-dev/pytest/commit/8db9915374f60d00780b758b98ada8d3f80af9bb
  Author: Barney Gale <barney.gale at gmail.com>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst

  Log Message:
  -----------
  Update AUTHORS, CHANGELOG

  Commit: df409a0c0ee9948d3725ee79c4a0a91960466af7
      https://github.com/pytest-dev/pytest/commit/df409a0c0ee9948d3725ee79c4a0a91960466af7
  Author: Barney Gale <barney.gale at gmail.com>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix CHANGELOG.rst

  Commit: d1c725078a8c2fccfc573772e1944b9fe2a902e6
      https://github.com/pytest-dev/pytest/commit/d1c725078a8c2fccfc573772e1944b9fe2a902e6
  Author: mbyt <random.seed at web.de>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/unittest.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Allow to skip unittests if --pdb active

closes #2137

  Commit: 36b6f17727589defa28101142009410c9c771289
      https://github.com/pytest-dev/pytest/commit/36b6f17727589defa28101142009410c9c771289
  Author: mbyt <random.seed at web.de>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M _pytest/unittest.py

  Log Message:
  -----------
  fixing code-style, keep flake8 happy

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

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

  Log Message:
  -----------
  Replace 'raise StopIteration' usages in the code by 'return's in accordance to PEP-479

Fix #2160

  Commit: da5a3dba8747c1497782ebf7e1b6824d915577a4
      https://github.com/pytest-dev/pytest/commit/da5a3dba8747c1497782ebf7e1b6824d915577a4
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

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

  Log Message:
  -----------
  Merge pull request #2226 from nicoddemus/raise-stop-iteration

Replace 'raise StopIteration' usages in the code by 'return's in accordance to PEP-479

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

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

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

  Commit: ad56cd8027756a8bc1aa83402bbfffeae3520129
      https://github.com/pytest-dev/pytest/commit/ad56cd8027756a8bc1aa83402bbfffeae3520129
  Author: mbyt <random.seed at web.de>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

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

  Log Message:
  -----------
  extract a _handle_skip method, secure PY2 branch

  Commit: bad261279c5af15e2126023a03f08389c189b2d5
      https://github.com/pytest-dev/pytest/commit/bad261279c5af15e2126023a03f08389c189b2d5
  Author: Vidar Tonaas Fauske <vidartf at gmail.com>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M _pytest/skipping.py

  Log Message:
  -----------
  Do not asssume `Item.obj` in 'skipping' plugin

See #2231 for discussion.

  Commit: 1a88a91c7a04ed996bee3c8957e07d9a0c735de1
      https://github.com/pytest-dev/pytest/commit/1a88a91c7a04ed996bee3c8957e07d9a0c735de1
  Author: Vidar Tonaas Fauske <vidartf at gmail.com>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst

  Log Message:
  -----------
  Update authors/history

  Commit: 832c89dd5fa7c310ae05ddcffc81025bed7a3c14
      https://github.com/pytest-dev/pytest/commit/832c89dd5fa7c310ae05ddcffc81025bed7a3c14
  Author: Vidar Tonaas Fauske <vidartf at gmail.com>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M testing/test_skipping.py

  Log Message:
  -----------
  Test for `pytest.mark.xfail` with non-Python Item

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

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

  Log Message:
  -----------
  Merge pull request #2142 from barneygale/xfail_without_condition_getglobals

'xfail' markers without a condition no longer rely on the underlying `Item` objects deriving from `PyobjMixin`

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

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/skipping.py
    M testing/test_skipping.py

  Log Message:
  -----------
  Merge pull request #2232 from vidartf/patch-1

Do not asssume `Item.obj` in 'skipping' plugin

  Commit: 87fb689ab1d05935bfd75ff29fcbc1de4161f606
      https://github.com/pytest-dev/pytest/commit/87fb689ab1d05935bfd75ff29fcbc1de4161f606
  Author: Ran Benita <ran234 at gmail.com>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Remove an unneeded `except KeyboardInterrupt`

KeyboardInterrupt is a subclass of BaseException, but not of Exception.
Hence if we remove this except, KeyboardInterrupts will still be raised
so the behavior stays the same.

  Commit: 3a0a0c2df93ecfcf4fb09a0f7c24bf3a06d1bae5
      https://github.com/pytest-dev/pytest/commit/3a0a0c2df93ecfcf4fb09a0f7c24bf3a06d1bae5
  Author: Ran Benita <ran234 at gmail.com>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/fixtures.py
    M testing/python/collect.py

  Log Message:
  -----------
  Ignore errors raised from descriptors when collecting fixtures

Descriptors (e.g. properties) such as in the added test case are
triggered during collection, executing arbitrary code which can raise.
Previously, such exceptions were propagated and failed the collection.
Now these exceptions are caught and the corresponding attributes are
silently ignored.

A better solution would be to completely skip access to all custom
descriptors, such that the offending code doesn't even trigger. However
I think this requires manually going through the instance and all of its
MRO for each and every attribute checking if it might be a proper
fixture before accessing it. So I took the easy route here.

In other words, putting something like this in your test class is still
a bad idea...:

    @property
    def innocent(self):
  os.system('rm -rf /')

Fixes #2234.

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

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/fixtures.py
    M testing/python/collect.py

  Log Message:
  -----------
  Merge pull request #2235 from bluetech/dont-execute-properties

ignore property errors when parsing fixure factories

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

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/fixtures.py
    M _pytest/skipping.py
    M testing/python/collect.py
    M testing/test_skipping.py

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

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

  Changed paths:
    M CHANGELOG.rst
    M _pytest/unittest.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #2225 from mbyt/allow_skipping_unittests_with_pdb_active

Allow to skip unittests if --pdb active

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

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

  Log Message:
  -----------
  --override-ini now correctly overrides some fundamental options like "python_files"

#2238

  Commit: b536fb7ace7ab4da584b942395235e12d962ae36
      https://github.com/pytest-dev/pytest/commit/b536fb7ace7ab4da584b942395235e12d962ae36
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M doc/en/talks.rst

  Log Message:
  -----------
  Mention next training event.

  Commit: 427bf42a52b524e846bcd2320a511832ac9233f3
      https://github.com/pytest-dev/pytest/commit/427bf42a52b524e846bcd2320a511832ac9233f3
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M doc/en/talks.rst

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

Mention next training event.

  Commit: 58ce3a9e8c48fe557bfdc644a96df234936247e1
      https://github.com/pytest-dev/pytest/commit/58ce3a9e8c48fe557bfdc644a96df234936247e1
  Author: Patrick Hayes <pfhayes at gmail.com>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py

  Log Message:
  -----------
  Safer sys.modules delete

  Commit: 00ec30353b090f8bc5ab36b7a6738f74477df0ba
      https://github.com/pytest-dev/pytest/commit/00ec30353b090f8bc5ab36b7a6738f74477df0ba
  Author: Patrick Hayes <pfhayes at gmail.com>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst

  Log Message:
  -----------
  Update docs as requested

  Commit: 49289fed52eb99f3a3258d71e2e6ab24a850658a
      https://github.com/pytest-dev/pytest/commit/49289fed52eb99f3a3258d71e2e6ab24a850658a
  Author: Patrick Hayes <pfhayes at gmail.com>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix docs

  Commit: 6b5566db66300f9a566efecf1d9389842dc9581a
      https://github.com/pytest-dev/pytest/commit/6b5566db66300f9a566efecf1d9389842dc9581a
  Author: Patrick Hayes <pfhayes at gmail.com>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update changelog

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

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Improve pytest_plugins docs

As discussed in #2246

  Commit: 231e2f9a90daeb9e80d35743bafab2342e3990dd
      https://github.com/pytest-dev/pytest/commit/231e2f9a90daeb9e80d35743bafab2342e3990dd
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #2252 from nicoddemus/fixture-visibility-docs

Improve pytest_plugins docs

  Commit: eeb6603d71737385cea62633d4db28f9e0db269b
      https://github.com/pytest-dev/pytest/commit/eeb6603d71737385cea62633d4db28f9e0db269b
  Author: Ville Skyttä <ville.skytta at iki.fi>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
    M _pytest/pytester.py
    M _pytest/tmpdir.py

  Log Message:
  -----------
  Python 3.6 invalid escape sequence deprecation fixes

  Commit: ede4e9171f3411d71ad280280fcaa45b1e5fc371
      https://github.com/pytest-dev/pytest/commit/ede4e9171f3411d71ad280280fcaa45b1e5fc371
  Author: Ville Skyttä <ville.skytta at iki.fi>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/cacheprovider.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/unittest.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_session.py
    M tox.ini

  Log Message:
  -----------
  Spelling fixes

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

  Changed paths:
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Fix typo in docs "textures" -> "fixtures"

  Commit: 0a26132232f882481d18c24ba3dda2d266733257
      https://github.com/pytest-dev/pytest/commit/0a26132232f882481d18c24ba3dda2d266733257
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

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

  Log Message:
  -----------
  Merge pull request #2241 from nicoddemus/override-python-files

--override-ini now correctly overrides some fundamental options like "python_files"

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

  Changed paths:
    M _pytest/pytester.py
    M _pytest/tmpdir.py

  Log Message:
  -----------
  Merge pull request #2254 from scop/py36-escseq

Python 3.6 invalid escape sequence deprecation fixes

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

  Changed paths:
    M CHANGELOG.rst
    M _pytest/cacheprovider.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/unittest.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_session.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2255 from scop/spelling

Spelling fixes

  Commit: 58d7f4e0487bb4049c0472f1019a6117c6f25af4
      https://github.com/pytest-dev/pytest/commit/58d7f4e0487bb4049c0472f1019a6117c6f25af4
  Author: Victor Uriarte <victor.m.uriarte at intel.com>
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
    M _pytest/hookspec.py

  Log Message:
  -----------
  Correct typo

  Commit: a88017cf262b7d1b8d62d756232db1b5aa81542c
      https://github.com/pytest-dev/pytest/commit/a88017cf262b7d1b8d62d756232db1b5aa81542c
  Author: Victor Uriarte <victor.m.uriarte at intel.com>
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
    M _pytest/hookspec.py

  Log Message:
  -----------
  Add note documenting #2257

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

  Changed paths:
    M _pytest/hookspec.py

  Log Message:
  -----------
  Merge pull request #2261 from vmuriart/doc-report_header

Document pytest_report_header and conftest behavior

  Commit: 5fd010c4c3f53d69bcef396989e52a6cbfa59c4e
      https://github.com/pytest-dev/pytest/commit/5fd010c4c3f53d69bcef396989e52a6cbfa59c4e
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2017-02-19 (Sun, 19 Feb 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Simplify travis.yml with tox environment variables

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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge pull request #2264 from asottile/simplify_travis

Simplify travis.yml with tox environment variables

  Commit: d3a6be413014b112227cbdb489c62483ec4d9192
      https://github.com/pytest-dev/pytest/commit/d3a6be413014b112227cbdb489c62483ec4d9192
  Author: Katerina Koukiou <kkoukiou at redhat.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

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

  Log Message:
  -----------
  junitxml: Fix double system-out tags per testcase

In the xml report we now have two occurences for the system-out tag if
the testcase writes to stdout both on call and teardown and fails in
teardown.
This behaviour is against the xsd.
This patch makes sure that the system-out section exists only
once per testcase.

  Commit: 0a89db2739bd785f7ea4168813b5f0084e928290
      https://github.com/pytest-dev/pytest/commit/0a89db2739bd785f7ea4168813b5f0084e928290
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

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

  Log Message:
  -----------
  Merge pull request #2271 from KKoukiou/double-tag

junitxml: Fix double system-out tags per testcase

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

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Improve docs for yield-fixture and with statement a bit

Fix #2262

  Commit: 3e3f20380e71e183f3dce2da352cbb276bcde1f5
      https://github.com/pytest-dev/pytest/commit/3e3f20380e71e183f3dce2da352cbb276bcde1f5
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Merge pull request #2277 from nicoddemus/yield-fixture-docs-2262

Improve docs for yield-fixture and with statement a bit

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

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M _pytest/cacheprovider.py
    M _pytest/config.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M doc/en/fixture.rst
    M doc/en/writing_plugins.rst
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_session.py
    M tox.ini

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

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

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py

  Log Message:
  -----------
  Merge pull request #2249 from pfhayes/anydbmfix

Fix importing anydbm within pytest

  Commit: 6a52fe165070dcbeda9b7c5b622975effcab5f40
      https://github.com/pytest-dev/pytest/commit/6a52fe165070dcbeda9b7c5b622975effcab5f40
  Author: Omer Hadari <hadari.omer at gmail.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M _pytest/_code/code.py
    M testing/test_assertion.py

  Log Message:
  -----------
  fixed internal error on unprintable raised AssertionErrors

  Commit: 6aaf7ae18b2c786bbf7ff07d223860ee3f98c20c
      https://github.com/pytest-dev/pytest/commit/6aaf7ae18b2c786bbf7ff07d223860ee3f98c20c
  Author: Omer Hadari <hadari.omer at gmail.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst

  Log Message:
  -----------
  added to authors and changelog

  Commit: f71467f5b1c84fd662d4f1cca582e2d2d34a08d7
      https://github.com/pytest-dev/pytest/commit/f71467f5b1c84fd662d4f1cca582e2d2d34a08d7
  Author: Omer Hadari <hadari.omer at gmail.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  added link to changelog

  Commit: b61dcded3781bdcd4c76ccb614e1df58a622e982
      https://github.com/pytest-dev/pytest/commit/b61dcded3781bdcd4c76ccb614e1df58a622e982
  Author: Bruno Oliveira <bruno at esss.com.br>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Allow py37-nightly to fail on Travis

Related to #2285

  Commit: 02dc54531150d715725885cb678209a4048142fb
      https://github.com/pytest-dev/pytest/commit/02dc54531150d715725885cb678209a4048142fb
  Author: Omer Hadari <hadari.omer at gmail.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  added in the correct alphabitcal order

  Commit: dd25ae7f3369fdbb4ec9fe3d50f0e4b25c9e6c25
      https://github.com/pytest-dev/pytest/commit/dd25ae7f3369fdbb4ec9fe3d50f0e4b25c9e6c25
  Author: Omer Hadari <hadari.omer at gmail.com>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  added in the correct alphabitcal order

  Commit: 07623e78ce25748b544eaa8a8fe0e6f26b3694f3
      https://github.com/pytest-dev/pytest/commit/07623e78ce25748b544eaa8a8fe0e6f26b3694f3
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge pull request #2286 from pytest-dev/disable-py37-travis

Allow py37-nightly to fail on Travis

  Commit: b28749eb921d093f487c53a26a317ac8b4b552a6
      https://github.com/pytest-dev/pytest/commit/b28749eb921d093f487c53a26a317ac8b4b552a6
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M testing/test_assertion.py

  Log Message:
  -----------
  Merge pull request #2284 from omerhadari/bugfix-unprintable-assertion-errors

Bugfix unprintable assertion errors

  Commit: e05ff0338a0220b63de93461eacf0706d55f8623
      https://github.com/pytest-dev/pytest/commit/e05ff0338a0220b63de93461eacf0706d55f8623
  Author: NODA, Kai <nodakai at gmail.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M doc/en/assert.rst

  Log Message:
  -----------
  assert.rst: typographical correction

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

  Changed paths:
    M doc/en/assert.rst

  Log Message:
  -----------
  Merge pull request #2288 from nodakai/patch-1

assert.rst: typographical correction

  Commit: cee578e32786986cb79495a2ea0e5c5e4eb425ce
      https://github.com/pytest-dev/pytest/commit/cee578e32786986cb79495a2ea0e5c5e4eb425ce
  Author: fbjorn <kopfabschneider at yandex.ru>
  Date:   2017-03-05 (Sun, 05 Mar 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/terminal.py
    M testing/test_config.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Fix trailing whitespace in terminal output

  Commit: 906b40fbb209916ea13199d5391c2e64b3587103
      https://github.com/pytest-dev/pytest/commit/906b40fbb209916ea13199d5391c2e64b3587103
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-03-05 (Sun, 05 Mar 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/terminal.py
    M testing/test_config.py
    M testing/test_terminal.py

  Log Message:
  -----------
  Merge pull request #2289 from fbjorn/fix-trailing-whitespace-in-terminal

Fix trailing whitespace in terminal output

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

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

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

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

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

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

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

Merge master into features

Compare: https://github.com/pytest-dev/pytest/compare/0c94f517a18b...d1ea7c8cc8f3