[Pytest-commit] [pytest-dev/pytest] d0bd01: Collect any tests from a package's __init__.py
Bruno Oliveira
nicoddemus at gmail.com
Sun Aug 26 18:41:32 EDT 2018
Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: d0bd01beca0308cfb263ec7f44c9acf0933a1fc0
https://github.com/pytest-dev/pytest/commit/d0bd01beca0308cfb263ec7f44c9acf0933a1fc0
Author: turturica <Ionut Turturica>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M src/_pytest/python.py
Log Message:
-----------
Collect any tests from a package's __init__.py
Commit: 273670b2a204f950df93d87baff26b04a47c0400
https://github.com/pytest-dev/pytest/commit/273670b2a204f950df93d87baff26b04a47c0400
Author: Tyler Richard <trichard at blueorigin.com>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M src/_pytest/capture.py
Log Message:
-----------
Fixes capfd so data is available after teardown.
Commit: c24c7e75e26516e032c750d49cec2b840fb128cf
https://github.com/pytest-dev/pytest/commit/c24c7e75e26516e032c750d49cec2b840fb128cf
Author: Tyler Richard <trichard at blueorigin.com>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M testing/test_capture.py
Log Message:
-----------
Added regression test for capfd in a fixture
Commit: f4c5994d27287e1ac2440a4ae17032f272208cb3
https://github.com/pytest-dev/pytest/commit/f4c5994d27287e1ac2440a4ae17032f272208cb3
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
A changelog/3033.bugfix.rst
M src/_pytest/capture.py
M testing/test_capture.py
Log Message:
-----------
Fixtures during teardown can use capsys and capfd to get output from tests
Fix #3033
Commit: 7d9b198f734f7d1968c88476545da29fb90c1040
https://github.com/pytest-dev/pytest/commit/7d9b198f734f7d1968c88476545da29fb90c1040
Author: victor <victor.maryama at typhoon-hil.com>
Date: 2018-08-19 (Sun, 19 Aug 2018)
Changed paths:
M src/_pytest/capture.py
Log Message:
-----------
Refactoring: Separated suspend from snapping (stopped always snapping when suspending - solves bug but still missing tests), reorganized functions and context managers.
Commit: 2255892d65810cc4db2b82e2621ed313a0c47f7f
https://github.com/pytest-dev/pytest/commit/2255892d65810cc4db2b82e2621ed313a0c47f7f
Author: victor <victor.maryama at typhoon-hil.com>
Date: 2018-08-19 (Sun, 19 Aug 2018)
Changed paths:
M testing/test_capture.py
Log Message:
-----------
Improved test to cover more cases.
Commit: 9e382e8d29f0563925eedb3dc5139aaee72a1e1c
https://github.com/pytest-dev/pytest/commit/9e382e8d29f0563925eedb3dc5139aaee72a1e1c
Author: victor <victor.maryama at typhoon-hil.com>
Date: 2018-08-19 (Sun, 19 Aug 2018)
Changed paths:
M testing/test_capture.py
Log Message:
-----------
Fixed test.
Commit: 8b2c91836b507727141b12b1f47c8d29ef744d1e
https://github.com/pytest-dev/pytest/commit/8b2c91836b507727141b12b1f47c8d29ef744d1e
Author: victor <victor.maryama at typhoon-hil.com>
Date: 2018-08-19 (Sun, 19 Aug 2018)
Changed paths:
M src/_pytest/capture.py
Log Message:
-----------
Fixed activation and used just runtest_protocol hook
Commit: 0564b52c0e1ecdce87b98f902091f3e06a01cc13
https://github.com/pytest-dev/pytest/commit/0564b52c0e1ecdce87b98f902091f3e06a01cc13
Author: victor <victor.maryama at typhoon-hil.com>
Date: 2018-08-19 (Sun, 19 Aug 2018)
Changed paths:
M src/_pytest/debugging.py
M src/_pytest/setuponly.py
M testing/logging/test_reporting.py
M testing/test_capture.py
Log Message:
-----------
Fixed integration with other modules/tests
Commit: 7ea4992f169edf84eec10735be688523759d4543
https://github.com/pytest-dev/pytest/commit/7ea4992f169edf84eec10735be688523759d4543
Author: victor <victor.maryama at typhoon-hil.com>
Date: 2018-08-19 (Sun, 19 Aug 2018)
Changed paths:
M src/_pytest/capture.py
M testing/logging/test_reporting.py
M testing/test_capture.py
Log Message:
-----------
Fixed linting.
Commit: e620798d33346187005b44ab0ff96decd5b5e95a
https://github.com/pytest-dev/pytest/commit/e620798d33346187005b44ab0ff96decd5b5e95a
Author: wim glenn <hey at wimglenn.com>
Date: 2018-08-19 (Sun, 19 Aug 2018)
Changed paths:
A changelog/3833.doc.rst
M doc/en/reference.rst
M src/_pytest/pytester.py
Log Message:
-----------
more autodocs for pytester
Commit: e4bea9068bf800f1610b228457232cbdfd949343
https://github.com/pytest-dev/pytest/commit/e4bea9068bf800f1610b228457232cbdfd949343
Author: wim glenn <hey at wimglenn.com>
Date: 2018-08-19 (Sun, 19 Aug 2018)
Changed paths:
M changelog/3833.doc.rst
Log Message:
-----------
end of line for this file, perhaps?
Commit: 308d789d9246a9beb97e935c4ce3efc615a66f71
https://github.com/pytest-dev/pytest/commit/308d789d9246a9beb97e935c4ce3efc615a66f71
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-20 (Mon, 20 Aug 2018)
Changed paths:
A changelog/3833.doc.rst
M doc/en/reference.rst
M src/_pytest/pytester.py
Log Message:
-----------
Merge pull request #3835 from wimglenn/issue3833
more autodocs for pytester
Commit: d611b035891f481570721d105d392db642412368
https://github.com/pytest-dev/pytest/commit/d611b035891f481570721d105d392db642412368
Author: Victor <victor.maryama at typhoon-hil.com>
Date: 2018-08-20 (Mon, 20 Aug 2018)
Changed paths:
M testing/test_capture.py
Log Message:
-----------
Parametrized tests for capfd as well. Separated global capture test.
Commit: 4de247cfa0e5067d7270ae2de6fe1f2dac9bd592
https://github.com/pytest-dev/pytest/commit/4de247cfa0e5067d7270ae2de6fe1f2dac9bd592
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-20 (Mon, 20 Aug 2018)
Changed paths:
M .pre-commit-config.yaml
Log Message:
-----------
Use more flexible `language_version: python3`
Commit: d3bdfc704bc53b3323da2b4e4d76aac1984c8725
https://github.com/pytest-dev/pytest/commit/d3bdfc704bc53b3323da2b4e4d76aac1984c8725
Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
Date: 2018-08-20 (Mon, 20 Aug 2018)
Changed paths:
M .pre-commit-config.yaml
Log Message:
-----------
Merge pull request #3839 from asottile/more_flexible
Use more flexible `language_version: python3`
Commit: 70ebab3537f52163989df6ca6832d6dbb77f41bf
https://github.com/pytest-dev/pytest/commit/70ebab3537f52163989df6ca6832d6dbb77f41bf
Author: Victor <victor.maryama at typhoon-hil.com>
Date: 2018-08-20 (Mon, 20 Aug 2018)
Changed paths:
M src/_pytest/capture.py
M src/_pytest/debugging.py
M src/_pytest/setuponly.py
M testing/test_capture.py
Log Message:
-----------
Renamed snap_global_capture to read_global_capture.
Commit: 43657f252f1e4101fad3061c1dfea88c6ad5e055
https://github.com/pytest-dev/pytest/commit/43657f252f1e4101fad3061c1dfea88c6ad5e055
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-20 (Mon, 20 Aug 2018)
Changed paths:
A changelog/3033.bugfix.rst
M src/_pytest/capture.py
M testing/test_capture.py
Log Message:
-----------
Merge pull request #3830 from nicoddemus/capfd-fixture-capture
Fixtures during teardown can use capsys and capfd to get output from tests
Commit: 223eef6261ef31393452694fcec257f8a389fd94
https://github.com/pytest-dev/pytest/commit/223eef6261ef31393452694fcec257f8a389fd94
Author: Sankt Petersbug <sankt.petersbug at gmail.com>
Date: 2018-08-20 (Mon, 20 Aug 2018)
Changed paths:
A changelog/3816.bugfix.rst
M src/_pytest/terminal.py
M testing/test_terminal.py
Log Message:
-----------
Fix '--show-capture=no' capture teardown logs
Add a check before printing teardown logs.
'print_teardown_sections' method does not check '--show-capture' option
value, and teardown logs are always printed.
Resolves: #3816
Commit: f1079a82222e06406c60db17492fb275b8fac6c1
https://github.com/pytest-dev/pytest/commit/f1079a82222e06406c60db17492fb275b8fac6c1
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-21 (Tue, 21 Aug 2018)
Changed paths:
M src/_pytest/capture.py
M src/_pytest/debugging.py
M src/_pytest/setuponly.py
M testing/logging/test_reporting.py
M testing/test_capture.py
Log Message:
-----------
Merge pull request #3832 from Sup3rGeo/bugfix/capsys-with-cli-logging
Bugfix/capsys with cli logging (again)
Commit: 672f4bb5aa9fdb7303a9144507b2aea19c99b534
https://github.com/pytest-dev/pytest/commit/672f4bb5aa9fdb7303a9144507b2aea19c99b534
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-21 (Tue, 21 Aug 2018)
Changed paths:
M changelog/3816.bugfix.rst
Log Message:
-----------
Improve CHANGELOG
Commit: 717775a1c69e21fff65c73d2a33e4bdc6a15c50e
https://github.com/pytest-dev/pytest/commit/717775a1c69e21fff65c73d2a33e4bdc6a15c50e
Author: Natan Lao <natanlao at users.noreply.github.com>
Date: 2018-08-21 (Tue, 21 Aug 2018)
Changed paths:
M doc/en/skipping.rst
Log Message:
-----------
Remove warning about #568 from documentation
The documentation (https://docs.pytest.org/en/latest/skipping.html) references
issue #568, which has since been fixed.
Commit: 07a560ff246a28e4ab8567404d7f55afb40a3c36
https://github.com/pytest-dev/pytest/commit/07a560ff246a28e4ab8567404d7f55afb40a3c36
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-21 (Tue, 21 Aug 2018)
Changed paths:
A changelog/3843.bugfix.rst
M src/_pytest/main.py
M testing/acceptance_test.py
Log Message:
-----------
Fix collection error when tests is specified with --doctest-modules
The problem was that _matchnodes would receive two items: [DoctestModule, Module]. It would then collect the first one, *cache it*, and fail to match against the name in the command line. Next, it would reuse the cached item (DoctestModule) instead of collecting the Module which would eventually find the "test" name on it.
Added the type of the node to the cache key to avoid this problem, although I'm not a big fan of caches that have different key types.
Fix #3843
Commit: 80bea79512b28d266dc8b9b9be919426990fc7a3
https://github.com/pytest-dev/pytest/commit/80bea79512b28d266dc8b9b9be919426990fc7a3
Author: Natan Lao <natanlao at users.noreply.github.com>
Date: 2018-08-21 (Tue, 21 Aug 2018)
Changed paths:
A changelog/3845.trivial.rst
Log Message:
-----------
Add changelog entry
Commit: eb8d14519527dc3469c1663ecc1c5bbd9d73d454
https://github.com/pytest-dev/pytest/commit/eb8d14519527dc3469c1663ecc1c5bbd9d73d454
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-21 (Tue, 21 Aug 2018)
Changed paths:
M changelog/3845.trivial.rst
Log Message:
-----------
Add link to issue in the CHANGELOG entry
Commit: 5b2c8fa007624e8b1cbc15e7a67913f00abc8c19
https://github.com/pytest-dev/pytest/commit/5b2c8fa007624e8b1cbc15e7a67913f00abc8c19
Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
A changelog/3845.trivial.rst
M doc/en/skipping.rst
Log Message:
-----------
Merge pull request #3845 from natanlao/patch-1
Remove warning about #568 from documentation
Commit: 3b521bedf8a5cbc8e777e383b902c816fd8e9b27
https://github.com/pytest-dev/pytest/commit/3b521bedf8a5cbc8e777e383b902c816fd8e9b27
Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
A changelog/3816.bugfix.rst
M src/_pytest/terminal.py
M testing/test_terminal.py
Log Message:
-----------
Merge pull request #3841 from sankt-petersbug/fix-3816
Fix '--show-capture=no' capture teardown logs
Commit: 89446af51ec723cb628f6d2cf16f10ae2628e25d
https://github.com/pytest-dev/pytest/commit/89446af51ec723cb628f6d2cf16f10ae2628e25d
Author: wim glenn <hey at wimglenn.com>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
A changelog/3848.bugfix.rst
M src/_pytest/pytester.py
Log Message:
-----------
fixed a bunch of unicode bugs in pytester.py
Commit: 2137e2b15b3261d2ee1af7d7ed2a5b0ae4dbfa4c
https://github.com/pytest-dev/pytest/commit/2137e2b15b3261d2ee1af7d7ed2a5b0ae4dbfa4c
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
A changelog/3843.bugfix.rst
M src/_pytest/main.py
M testing/acceptance_test.py
Log Message:
-----------
Merge pull request #3846 from nicoddemus/issue-3843
Fix collection error when tests is specified with --doctest-modules
Commit: a12eadd9ef32a8312d49669d98aa533247db2fec
https://github.com/pytest-dev/pytest/commit/a12eadd9ef32a8312d49669d98aa533247db2fec
Author: Jennifer Rinker <rink at win.dtu.dk>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M AUTHORS
A changelog/3824.doc.rst
M doc/en/example/pythoncollection.rst
M doc/en/reference.rst
Log Message:
-----------
resolving Issue #3824 - expanding docs
Commit: 5a7aa123ea29987287a4e01b8e61aacce282cd40
https://github.com/pytest-dev/pytest/commit/5a7aa123ea29987287a4e01b8e61aacce282cd40
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M doc/en/example/pythoncollection.rst
M doc/en/reference.rst
Log Message:
-----------
Improve docs formatting
Commit: 8e2c7b4979e12429641e91acd46b3357ceecddf2
https://github.com/pytest-dev/pytest/commit/8e2c7b4979e12429641e91acd46b3357ceecddf2
Author: wim glenn <wim.glenn at gmail.com>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M testing/test_pytester.py
Log Message:
-----------
Add a failing testcase for PR #3848
Commit: b08e156b7943db70a94f96943312b912730504aa
https://github.com/pytest-dev/pytest/commit/b08e156b7943db70a94f96943312b912730504aa
Author: wim glenn <wim.glenn at gmail.com>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M testing/test_pytester.py
Log Message:
-----------
strip trailing whitespace
Commit: 917b99e4382626505296e94201dd7f6b253cdd78
https://github.com/pytest-dev/pytest/commit/917b99e4382626505296e94201dd7f6b253cdd78
Author: wim glenn <wim.glenn at gmail.com>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M src/_pytest/config/argparsing.py
Log Message:
-----------
More unicode whack-a-mole
It seems pytest's very comprehensive CI sniffed out a few other places with similar bugs. Ideally we should find all the places where args are not stringy and solve it at the source, but who knows how many people are relying on the implicit string conversion. See [here](https://github.com/pytest-dev/pytest/blob/master/src/_pytest/config/__init__.py#L160-L166) for one such problem area (args with a single py.path.local instance is converted here, but a list or tuple containing some are not).
Commit: cd07c4d4ffad1c9a6fa1c1d8857e7aee1290ccf8
https://github.com/pytest-dev/pytest/commit/cd07c4d4ffad1c9a6fa1c1d8857e7aee1290ccf8
Author: Ondřej Súkup <mimi.vx at gmail.com>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M testing/example_scripts/acceptance/fixture_mock_integration.py
Log Message:
-----------
Use unittest.mock if is only aviable
from Python 3.3 is mock part of python standard library in unittest namespace
Commit: 17eec5b97e7efe256e76b733c26048fb2d29c599
https://github.com/pytest-dev/pytest/commit/17eec5b97e7efe256e76b733c26048fb2d29c599
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M AUTHORS
A changelog/3824.doc.rst
M doc/en/example/pythoncollection.rst
M doc/en/reference.rst
Log Message:
-----------
Merge pull request #3856 from jennirinker/master
Resolving Issue #3824
Commit: 8804c7333a9bc26956950443b3d75c657762ba28
https://github.com/pytest-dev/pytest/commit/8804c7333a9bc26956950443b3d75c657762ba28
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M changelog/3848.bugfix.rst
Log Message:
-----------
Fix CHANGELOG formatting
Commit: 8bb8b913570f215a9bff505799418ef9034609ec
https://github.com/pytest-dev/pytest/commit/8bb8b913570f215a9bff505799418ef9034609ec
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M doc/en/example/assertion/global_testmodule_config/conftest.py
M doc/en/example/multipython.py
M testing/acceptance_test.py
M testing/code/test_excinfo.py
M testing/test_argcomplete.py
M testing/test_assertrewrite.py
M testing/test_helpconfig.py
M testing/test_parseopt.py
M testing/test_pdb.py
M testing/test_terminal.py
Log Message:
-----------
pyupgrade 1.4: tests
Commit: 0d65783dce057dbfb276d1d7867037a8467dd20f
https://github.com/pytest-dev/pytest/commit/0d65783dce057dbfb276d1d7867037a8467dd20f
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M src/_pytest/_code/_py2traceback.py
Log Message:
-----------
Fix unicode errors when changing to .format(...)
Commit: e4f76f63505aaa3574e4e71b57fe9b173ed85225
https://github.com/pytest-dev/pytest/commit/e4f76f63505aaa3574e4e71b57fe9b173ed85225
Author: turturica <Ionut Turturica>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M .pre-commit-config.yaml
M AUTHORS
M CHANGELOG.rst
A changelog/3033.bugfix.rst
R changelog/3771.bugfix.rst
R changelog/3775.bugfix.rst
R changelog/3788.bugfix.rst
A changelog/3816.bugfix.rst
A changelog/3819.bugfix.rst
A changelog/3824.doc.rst
A changelog/3826.trivial.rst
A changelog/3833.doc.rst
A changelog/3843.bugfix.rst
A changelog/3845.trivial.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.7.2.rst
M doc/en/example/markers.rst
M doc/en/example/nonpython.rst
M doc/en/example/parametrize.rst
M doc/en/example/pythoncollection.rst
M doc/en/reference.rst
M doc/en/skipping.rst
M src/_pytest/_code/code.py
M src/_pytest/capture.py
M src/_pytest/compat.py
M src/_pytest/config/argparsing.py
M src/_pytest/debugging.py
M src/_pytest/fixtures.py
M src/_pytest/logging.py
M src/_pytest/main.py
M src/_pytest/pytester.py
M src/_pytest/python.py
M src/_pytest/setuponly.py
M src/_pytest/terminal.py
M src/_pytest/warnings.py
M testing/acceptance_test.py
M testing/code/test_excinfo.py
M testing/logging/test_reporting.py
M testing/python/collect.py
M testing/test_capture.py
M testing/test_collection.py
M testing/test_terminal.py
M testing/test_warnings.py
M tox.ini
Log Message:
-----------
Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854
Commit: 4d3c1ab4f09ad352b9b0a274f0d802826771e4ed
https://github.com/pytest-dev/pytest/commit/4d3c1ab4f09ad352b9b0a274f0d802826771e4ed
Author: turturica <Ionut Turturica>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M src/_pytest/python.py
M testing/python/collect.py
Log Message:
-----------
Fixes #3854
Commit: 0fc4a806e517ed64717df107a9dca3995326a06f
https://github.com/pytest-dev/pytest/commit/0fc4a806e517ed64717df107a9dca3995326a06f
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M src/_pytest/outcomes.py
M src/_pytest/python.py
M testing/code/test_code.py
M testing/code/test_excinfo.py
M testing/python/metafunc.py
M testing/test_assertion.py
M testing/test_assertrewrite.py
M testing/test_capture.py
M testing/test_junitxml.py
Log Message:
-----------
py.builtins._totext -> string literals or six.text_type
Commit: c2cd3378864ba5e3756413e41042b30742030f04
https://github.com/pytest-dev/pytest/commit/c2cd3378864ba5e3756413e41042b30742030f04
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M bench/empty.py
M doc/en/example/assertion/failure_demo.py
M src/_pytest/_code/code.py
M src/_pytest/assertion/rewrite.py
M src/_pytest/python_api.py
M src/_pytest/recwarn.py
M testing/code/test_source.py
M testing/test_assertrewrite.py
Log Message:
-----------
py.builtin.exec_ => six.exec_
Commit: dccac69d82b5677bcd8ec7775a12b0d13f6e69ac
https://github.com/pytest-dev/pytest/commit/dccac69d82b5677bcd8ec7775a12b0d13f6e69ac
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M testing/test_assertion.py
Log Message:
-----------
py.builtin.text -> six.text_type
Commit: 7099ea9bb0a4fa2b03d3793729bf7cf3254aa04f
https://github.com/pytest-dev/pytest/commit/7099ea9bb0a4fa2b03d3793729bf7cf3254aa04f
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M src/_pytest/fixtures.py
M src/_pytest/runner.py
M testing/code/test_excinfo.py
Log Message:
-----------
py.builtin._reraise -> six.reraise
Commit: 6f7365509dbf3f734c160e9fe94dfc99f6b0f6fd
https://github.com/pytest-dev/pytest/commit/6f7365509dbf3f734c160e9fe94dfc99f6b0f6fd
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M bench/empty.py
M doc/en/example/assertion/failure_demo.py
M src/_pytest/_code/code.py
M src/_pytest/assertion/rewrite.py
M src/_pytest/fixtures.py
M src/_pytest/outcomes.py
M src/_pytest/python.py
M src/_pytest/python_api.py
M src/_pytest/recwarn.py
M src/_pytest/runner.py
M testing/code/test_code.py
M testing/code/test_excinfo.py
M testing/code/test_source.py
M testing/python/metafunc.py
M testing/test_assertion.py
M testing/test_assertrewrite.py
M testing/test_capture.py
M testing/test_junitxml.py
Log Message:
-----------
Merge pull request #3860 from asottile/purge_more_py
Purge more usage of `py` module
Commit: 85482d575e6a868c829fe6f9b9d9fe3a6cab4a53
https://github.com/pytest-dev/pytest/commit/85482d575e6a868c829fe6f9b9d9fe3a6cab4a53
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M testing/acceptance_test.py
M testing/code/test_code.py
M testing/code/test_excinfo.py
M testing/python/collect.py
M testing/python/fixture.py
M testing/python/metafunc.py
M testing/test_assertrewrite.py
M testing/test_cacheprovider.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_terminal.py
Log Message:
-----------
Replace Source with dedent where possible
Commit: 3f336869e2e632c6f66432065073a45046f39ccc
https://github.com/pytest-dev/pytest/commit/3f336869e2e632c6f66432065073a45046f39ccc
Author: Gandalf Saxe <gandalfsaxe at gmail.com>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M doc/en/goodpractices.rst
Log Message:
-----------
Move information on `pip install -e` to the top
Should fix complaints in #2421.
Commit: 52fa8c98bbb518d036eb1fc00dd77af6138b0bb8
https://github.com/pytest-dev/pytest/commit/52fa8c98bbb518d036eb1fc00dd77af6138b0bb8
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M testing/acceptance_test.py
M testing/code/test_code.py
M testing/code/test_excinfo.py
M testing/python/collect.py
M testing/python/fixture.py
M testing/python/metafunc.py
M testing/test_assertrewrite.py
M testing/test_cacheprovider.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_terminal.py
Log Message:
-----------
Merge pull request #3864 from asottile/source_to_dedent
Replace Source with dedent where possible
Commit: d54aa8ce13c7644dc0605f310cd4c0ae5be8d930
https://github.com/pytest-dev/pytest/commit/d54aa8ce13c7644dc0605f310cd4c0ae5be8d930
Author: wim glenn <wim.glenn at gmail.com>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
A changelog/3848.bugfix.rst
M src/_pytest/config/argparsing.py
M src/_pytest/pytester.py
M testing/test_pytester.py
Log Message:
-----------
Merge pull request #3848 from wimglenn/pytester_unicode_bugfixes
fixed a bunch of unicode bugs in pytester.py
Commit: d10d59c013d9575940750cd6c7eed44603bf7597
https://github.com/pytest-dev/pytest/commit/d10d59c013d9575940750cd6c7eed44603bf7597
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M testing/example_scripts/acceptance/fixture_mock_integration.py
Log Message:
-----------
Merge pull request #3858 from mimi1vx/test_mock
Use unittest.mock if is only aviable
Commit: 40b4fe64af7446f56b612d0ea26bb2e0a5b4705a
https://github.com/pytest-dev/pytest/commit/40b4fe64af7446f56b612d0ea26bb2e0a5b4705a
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M doc/en/goodpractices.rst
Log Message:
-----------
Fix linting
Commit: f2e35c8c4ff832ee107d851f2c6193fd614b763b
https://github.com/pytest-dev/pytest/commit/f2e35c8c4ff832ee107d851f2c6193fd614b763b
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M doc/en/example/assertion/global_testmodule_config/conftest.py
M doc/en/example/multipython.py
M src/_pytest/_code/_py2traceback.py
M testing/acceptance_test.py
M testing/code/test_excinfo.py
M testing/test_argcomplete.py
M testing/test_assertrewrite.py
M testing/test_helpconfig.py
M testing/test_parseopt.py
M testing/test_pdb.py
M testing/test_terminal.py
Log Message:
-----------
Merge pull request #3859 from asottile/pyupgrade_1_4
Some pyupgrade 1.4.x changes
Commit: 99e31f6fb17177b60046dd2fc44c0a313cf4b8aa
https://github.com/pytest-dev/pytest/commit/99e31f6fb17177b60046dd2fc44c0a313cf4b8aa
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M src/_pytest/assertion/rewrite.py
M src/_pytest/assertion/util.py
M testing/test_capture.py
Log Message:
-----------
Use `bytes` directly instead of `binary_type`
`bytes` is an alias for `str` in python2.6+
Commit: 5f8b50c0946b17d5ee5054066cd2ee6dd75e187b
https://github.com/pytest-dev/pytest/commit/5f8b50c0946b17d5ee5054066cd2ee6dd75e187b
Author: turturica <Ionut Turturica>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M src/_pytest/python.py
M testing/python/fixture.py
Log Message:
-----------
Address #3796 and add a test for it.
Commit: 72e6482994974741ddc2058807cf4d3f7b771ced
https://github.com/pytest-dev/pytest/commit/72e6482994974741ddc2058807cf4d3f7b771ced
Author: turturica <Ionut Turturica>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M src/_pytest/python.py
Log Message:
-----------
Make linting happy.
Commit: 4c147407987c19c011f58c4f24999433f9231204
https://github.com/pytest-dev/pytest/commit/4c147407987c19c011f58c4f24999433f9231204
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M src/_pytest/assertion/rewrite.py
M src/_pytest/assertion/util.py
M testing/test_capture.py
Log Message:
-----------
Merge pull request #3868 from asottile/bytes_py26_plus
Use `bytes` directly instead of `binary_type`
Commit: c82906105c7f6f233ab7d08cdb9bf6b64c0f81e3
https://github.com/pytest-dev/pytest/commit/c82906105c7f6f233ab7d08cdb9bf6b64c0f81e3
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M doc/en/goodpractices.rst
Log Message:
-----------
Merge pull request #3865 from GandalfSaxe/patch-1
Move information on `pip install -e` to the top
Commit: 3396225f74561f741dcc576e63c6f169bc08eda5
https://github.com/pytest-dev/pytest/commit/3396225f74561f741dcc576e63c6f169bc08eda5
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M bench/empty.py
A changelog/3848.bugfix.rst
M doc/en/example/assertion/failure_demo.py
M doc/en/example/assertion/global_testmodule_config/conftest.py
M doc/en/example/multipython.py
M doc/en/goodpractices.rst
M src/_pytest/_code/_py2traceback.py
M src/_pytest/_code/code.py
M src/_pytest/assertion/rewrite.py
M src/_pytest/assertion/util.py
M src/_pytest/config/argparsing.py
M src/_pytest/fixtures.py
M src/_pytest/outcomes.py
M src/_pytest/pytester.py
M src/_pytest/python.py
M src/_pytest/python_api.py
M src/_pytest/recwarn.py
M src/_pytest/runner.py
M testing/acceptance_test.py
M testing/code/test_code.py
M testing/code/test_excinfo.py
M testing/code/test_source.py
M testing/example_scripts/acceptance/fixture_mock_integration.py
M testing/python/collect.py
M testing/python/fixture.py
M testing/python/metafunc.py
M testing/test_argcomplete.py
M testing/test_assertion.py
M testing/test_assertrewrite.py
M testing/test_cacheprovider.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_parseopt.py
M testing/test_pdb.py
M testing/test_pytester.py
M testing/test_terminal.py
Log Message:
-----------
Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854
Commit: 459b040d2179ba6af0a8c51c1134a9979331959c
https://github.com/pytest-dev/pytest/commit/459b040d2179ba6af0a8c51c1134a9979331959c
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M testing/python/fixture.py
Log Message:
-----------
Fix dedent after merge.
Commit: 14ffadf004f8111338d201dcd7883b714df09a4d
https://github.com/pytest-dev/pytest/commit/14ffadf004f8111338d201dcd7883b714df09a4d
Author: Andrew Champion <awchampion at gmail.com>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M doc/en/goodpractices.rst
Log Message:
-----------
correct cmdclass
Commit: e3df1031ca2662763a5d9ad7d9282e62accb8821
https://github.com/pytest-dev/pytest/commit/e3df1031ca2662763a5d9ad7d9282e62accb8821
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M testing/python/fixture.py
Log Message:
-----------
Add encoding: utf8 for python 2.7
Commit: f6948597e41e4e8029345d42bffe67f36d797e3a
https://github.com/pytest-dev/pytest/commit/f6948597e41e4e8029345d42bffe67f36d797e3a
Author: Andrew Champion <awchampion at gmail.com>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
A changelog/3870.doc.rst
Log Message:
-----------
add to changelog
Commit: dce8df45d5b86c7b20802ee790a8c6da2ecd55cb
https://github.com/pytest-dev/pytest/commit/dce8df45d5b86c7b20802ee790a8c6da2ecd55cb
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
A changelog/3796.bugfix.rst
A changelog/3854.bugfix.rst
M testing/python/fixture.py
Log Message:
-----------
Added changelog items.
Commit: f0226e9329d364084be6bc22f0c11a8053ae9d9c
https://github.com/pytest-dev/pytest/commit/f0226e9329d364084be6bc22f0c11a8053ae9d9c
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M testing/python/collect.py
Log Message:
-----------
Fix test_package_ordering on Windows
Commit: 8cf0e46bbf51bcf1d95019ce7c4d501e8cc4b7d7
https://github.com/pytest-dev/pytest/commit/8cf0e46bbf51bcf1d95019ce7c4d501e8cc4b7d7
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M changelog/3796.bugfix.rst
M changelog/3854.bugfix.rst
M testing/python/collect.py
Log Message:
-----------
test_package_ordering: Collect *.py, but keep a mix of case for filenames. The test doesn't make sense for Windows, because of its case-insensitivity.
Commit: 1e4ecda8845dcf32bdfd395063b797a91d54e80d
https://github.com/pytest-dev/pytest/commit/1e4ecda8845dcf32bdfd395063b797a91d54e80d
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M src/_pytest/fixtures.py
Log Message:
-----------
Fix the package fixture ordering in Windows.
Commit: c336449729659ede3f3f2535172f911a8c268b86
https://github.com/pytest-dev/pytest/commit/c336449729659ede3f3f2535172f911a8c268b86
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M src/_pytest/fixtures.py
Log Message:
-----------
Make linting happy. Argh.
Commit: 72a58bbafef9e09b1a527ae7c2e1b2a5b17abd0a
https://github.com/pytest-dev/pytest/commit/72a58bbafef9e09b1a527ae7c2e1b2a5b17abd0a
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
A changelog/3870.doc.rst
M doc/en/goodpractices.rst
Log Message:
-----------
Merge pull request #3871 from schmamps/cmdclass
Correct cmdclass for doc: Good Integration Practices
Commit: be4b359c7430eef2b18041e0dab2fa5e4ee7ec22
https://github.com/pytest-dev/pytest/commit/be4b359c7430eef2b18041e0dab2fa5e4ee7ec22
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-25 (Sat, 25 Aug 2018)
Changed paths:
A changelog/3796.bugfix.rst
A changelog/3854.bugfix.rst
M src/_pytest/fixtures.py
M src/_pytest/python.py
M testing/python/collect.py
M testing/python/fixture.py
Log Message:
-----------
Merge pull request #3861 from jonozzz/fix-3854
Fix #3854
Commit: de6f2c0336a03e34ed5b060f13c3932e9710db14
https://github.com/pytest-dev/pytest/commit/de6f2c0336a03e34ed5b060f13c3932e9710db14
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-25 (Sat, 25 Aug 2018)
Changed paths:
A changelog/3773.bugfix.rst
M src/_pytest/pytester.py
M src/_pytest/python.py
A testing/example_scripts/collect/collect_init_tests/pytest.ini
A testing/example_scripts/collect/collect_init_tests/tests/__init__.py
A testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
M testing/test_collection.py
Log Message:
-----------
Collect tests from __init__.py files if they match 'python_files'
Fix #3773
Commit: f872fcb5d0ba99bce5b1017c067d3b18ecccf15c
https://github.com/pytest-dev/pytest/commit/f872fcb5d0ba99bce5b1017c067d3b18ecccf15c
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-25 (Sat, 25 Aug 2018)
Changed paths:
M testing/test_pluginmanager.py
Log Message:
-----------
Remove dangerous sys.path manipulations in test_pluginmanager
Noticed these while working in something else
Commit: 415fcb912bb7c877a31150c53e42275644e70f46
https://github.com/pytest-dev/pytest/commit/415fcb912bb7c877a31150c53e42275644e70f46
Author: Daniel Hahler <git at thequod.de>
Date: 2018-08-25 (Sat, 25 Aug 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Travis: use TOXENV=linting for linting stage
This will run it with `--show-diff-on-failure` then, and helps to keep
it in line / in a central place.
Commit: b0541e9d317f40390c9bbc69af2e8a8a426502df
https://github.com/pytest-dev/pytest/commit/b0541e9d317f40390c9bbc69af2e8a8a426502df
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-25 (Sat, 25 Aug 2018)
Changed paths:
M testing/test_monkeypatch.py
M testing/test_pytester.py
Log Message:
-----------
Correctly restore sys.path in test and remove dead code in test_pytester
The code in test_pytester has been refactored into a class right
above the dead code, and the code has been left there by mistake
apparently.
Commit: 71b4995775e49bb4e7ddd024a486a96f762b7a91
https://github.com/pytest-dev/pytest/commit/71b4995775e49bb4e7ddd024a486a96f762b7a91
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-25 (Sat, 25 Aug 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge pull request #3874 from blueyed/improve-pre-commit
Travis: use TOXENV=linting for linting stage
Commit: 3da88d794f8b50b15f2bfc7012fd2ee9d262fd6f
https://github.com/pytest-dev/pytest/commit/3da88d794f8b50b15f2bfc7012fd2ee9d262fd6f
Author: Anthony Sottile <asottile at umich.edu>
Date: 2018-08-25 (Sat, 25 Aug 2018)
Changed paths:
M tox.ini
Log Message:
-----------
Use skip_install for testing tox env
Commit: d3f5324386cf64bb1be2c64b9f885cfaa39a3604
https://github.com/pytest-dev/pytest/commit/d3f5324386cf64bb1be2c64b9f885cfaa39a3604
Author: Daniel Hahler <git at thequod.de>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M tox.ini
Log Message:
-----------
tox: coveralls: also report to codecov
This is meant to get base coverage on master for codecov.
Commit: 508774742e3f55caa3d1b2942738ed778a4cb0cb
https://github.com/pytest-dev/pytest/commit/508774742e3f55caa3d1b2942738ed778a4cb0cb
Author: Gandalf Saxe <gandalfsaxe at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M doc/en/goodpractices.rst
Log Message:
-----------
Code block: :: missing and 4 spaces instead of 5
I just noticed the newly committed code block doesn't format as a code block without `::` in the paragraph before. Perhaps doesn't make a difference, but also corrected 5 spaces to 4 which seems standard.
Commit: dd5f5ca4cb1713bdddc2c9cba73dcd7b5251b332
https://github.com/pytest-dev/pytest/commit/dd5f5ca4cb1713bdddc2c9cba73dcd7b5251b332
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
A changelog/3773.bugfix.rst
M src/_pytest/pytester.py
M src/_pytest/python.py
A testing/example_scripts/collect/collect_init_tests/pytest.ini
A testing/example_scripts/collect/collect_init_tests/tests/__init__.py
A testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
M testing/test_collection.py
Log Message:
-----------
Merge pull request #3872 from nicoddemus/tests-in-init-files
Collect tests from __init__.py files if they match 'python_files'
Commit: 2577a6ce8abef54fca9c09308fe4e44ebec93762
https://github.com/pytest-dev/pytest/commit/2577a6ce8abef54fca9c09308fe4e44ebec93762
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M testing/test_monkeypatch.py
M testing/test_pluginmanager.py
M testing/test_pytester.py
Log Message:
-----------
Merge pull request #3873 from nicoddemus/sys-path-fix
Remove dangerous sys.path manipulations in test_pluginmanager
Commit: c15b537e3d06bc1df864e6dd4f7f7cbe0b1052c4
https://github.com/pytest-dev/pytest/commit/c15b537e3d06bc1df864e6dd4f7f7cbe0b1052c4
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M tox.ini
Log Message:
-----------
Merge pull request #3878 from asottile/skip_install_linting
Use skip_install for testing tox env
Commit: 4d19b9434793a5a688f2b13d507618650f891ed9
https://github.com/pytest-dev/pytest/commit/4d19b9434793a5a688f2b13d507618650f891ed9
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M tox.ini
Log Message:
-----------
Merge pull request #3877 from blueyed/codecov-master
tox: coveralls: also report to codecov
Commit: 7ae23901d3198294cb8073c0b6daa768d3985fee
https://github.com/pytest-dev/pytest/commit/7ae23901d3198294cb8073c0b6daa768d3985fee
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M doc/en/goodpractices.rst
Log Message:
-----------
Merge pull request #3881 from GandalfSaxe/patch-2
Code block: :: missing and 4 spaces instead of 5
Commit: c31018d9bcf0d206bcb134a376ea0f8e880510f1
https://github.com/pytest-dev/pytest/commit/c31018d9bcf0d206bcb134a376ea0f8e880510f1
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M CHANGELOG.rst
R changelog/3033.bugfix.rst
R changelog/3773.bugfix.rst
R changelog/3796.bugfix.rst
R changelog/3816.bugfix.rst
R changelog/3819.bugfix.rst
R changelog/3824.doc.rst
R changelog/3826.trivial.rst
R changelog/3833.doc.rst
R changelog/3843.bugfix.rst
R changelog/3845.trivial.rst
R changelog/3848.bugfix.rst
R changelog/3854.bugfix.rst
R changelog/3870.doc.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.7.3.rst
M doc/en/example/parametrize.rst
M doc/en/example/pythoncollection.rst
M doc/en/example/reportingdemo.rst
Log Message:
-----------
Preparing release version 3.7.3
Commit: b69f853acbc3ff705751b69f8955a0e25a2bf92c
https://github.com/pytest-dev/pytest/commit/b69f853acbc3ff705751b69f8955a0e25a2bf92c
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Tweak CHANGELOG for 3.7.3
Commit: 70bdacf01aa0917d4499c1aff4f9f2061968a655
https://github.com/pytest-dev/pytest/commit/70bdacf01aa0917d4499c1aff4f9f2061968a655
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M doc/en/example/pythoncollection.rst
Log Message:
-----------
Fix collection example docs
Commit: e74ad4ff9b89936c2ef9c4e34054ae9d3ba1e31f
https://github.com/pytest-dev/pytest/commit/e74ad4ff9b89936c2ef9c4e34054ae9d3ba1e31f
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Fix typo in CHANGELOG
Commit: a31967431f3d112da547ddbd05c4efdb90cb8ad6
https://github.com/pytest-dev/pytest/commit/a31967431f3d112da547ddbd05c4efdb90cb8ad6
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M CHANGELOG.rst
R changelog/3033.bugfix.rst
R changelog/3773.bugfix.rst
R changelog/3796.bugfix.rst
R changelog/3816.bugfix.rst
R changelog/3819.bugfix.rst
R changelog/3824.doc.rst
R changelog/3826.trivial.rst
R changelog/3833.doc.rst
R changelog/3843.bugfix.rst
R changelog/3845.trivial.rst
R changelog/3848.bugfix.rst
R changelog/3854.bugfix.rst
R changelog/3870.doc.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.7.3.rst
M doc/en/example/parametrize.rst
M doc/en/example/pythoncollection.rst
M doc/en/example/reportingdemo.rst
Log Message:
-----------
Merge pull request #3882 from nicoddemus/release-3.7.3
Release 3.7.3
Commit: 2f2d5861bb14c9b61d4bea846b6d8043b9f6081d
https://github.com/pytest-dev/pytest/commit/2f2d5861bb14c9b61d4bea846b6d8043b9f6081d
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M .pre-commit-config.yaml
M .travis.yml
M AUTHORS
M CHANGELOG.rst
M bench/empty.py
R changelog/3819.bugfix.rst
R changelog/3826.trivial.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.7.3.rst
M doc/en/example/assertion/failure_demo.py
M doc/en/example/assertion/global_testmodule_config/conftest.py
M doc/en/example/multipython.py
M doc/en/example/parametrize.rst
M doc/en/example/pythoncollection.rst
M doc/en/example/reportingdemo.rst
M doc/en/goodpractices.rst
M doc/en/reference.rst
M doc/en/skipping.rst
M src/_pytest/_code/_py2traceback.py
M src/_pytest/_code/code.py
M src/_pytest/assertion/rewrite.py
M src/_pytest/assertion/util.py
M src/_pytest/capture.py
M src/_pytest/config/argparsing.py
M src/_pytest/debugging.py
M src/_pytest/fixtures.py
M src/_pytest/main.py
M src/_pytest/outcomes.py
M src/_pytest/pytester.py
M src/_pytest/python.py
M src/_pytest/python_api.py
M src/_pytest/recwarn.py
M src/_pytest/runner.py
M src/_pytest/setuponly.py
M src/_pytest/terminal.py
M testing/acceptance_test.py
M testing/code/test_code.py
M testing/code/test_excinfo.py
M testing/code/test_source.py
M testing/example_scripts/acceptance/fixture_mock_integration.py
A testing/example_scripts/collect/collect_init_tests/pytest.ini
A testing/example_scripts/collect/collect_init_tests/tests/__init__.py
A testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
M testing/logging/test_reporting.py
M testing/python/collect.py
M testing/python/fixture.py
M testing/python/metafunc.py
M testing/test_argcomplete.py
M testing/test_assertion.py
M testing/test_assertrewrite.py
M testing/test_cacheprovider.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_monkeypatch.py
M testing/test_parseopt.py
M testing/test_pdb.py
M testing/test_pluginmanager.py
M testing/test_pytester.py
M testing/test_terminal.py
M tox.ini
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
Commit: 80eef29681c9a5412f73022552bf24a98c80ac9a
https://github.com/pytest-dev/pytest/commit/80eef29681c9a5412f73022552bf24a98c80ac9a
Author: Bruno Oliveira <nicoddemus at gmail.com>
Date: 2018-08-26 (Sun, 26 Aug 2018)
Changed paths:
M .pre-commit-config.yaml
M .travis.yml
M AUTHORS
M CHANGELOG.rst
M bench/empty.py
R changelog/3819.bugfix.rst
R changelog/3826.trivial.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.7.3.rst
M doc/en/example/assertion/failure_demo.py
M doc/en/example/assertion/global_testmodule_config/conftest.py
M doc/en/example/multipython.py
M doc/en/example/parametrize.rst
M doc/en/example/pythoncollection.rst
M doc/en/example/reportingdemo.rst
M doc/en/goodpractices.rst
M doc/en/reference.rst
M doc/en/skipping.rst
M src/_pytest/_code/_py2traceback.py
M src/_pytest/_code/code.py
M src/_pytest/assertion/rewrite.py
M src/_pytest/assertion/util.py
M src/_pytest/capture.py
M src/_pytest/config/argparsing.py
M src/_pytest/debugging.py
M src/_pytest/fixtures.py
M src/_pytest/main.py
M src/_pytest/outcomes.py
M src/_pytest/pytester.py
M src/_pytest/python.py
M src/_pytest/python_api.py
M src/_pytest/recwarn.py
M src/_pytest/runner.py
M src/_pytest/setuponly.py
M src/_pytest/terminal.py
M testing/acceptance_test.py
M testing/code/test_code.py
M testing/code/test_excinfo.py
M testing/code/test_source.py
M testing/example_scripts/acceptance/fixture_mock_integration.py
A testing/example_scripts/collect/collect_init_tests/pytest.ini
A testing/example_scripts/collect/collect_init_tests/tests/__init__.py
A testing/example_scripts/collect/collect_init_tests/tests/test_foo.py
M testing/logging/test_reporting.py
M testing/python/collect.py
M testing/python/fixture.py
M testing/python/metafunc.py
M testing/test_argcomplete.py
M testing/test_assertion.py
M testing/test_assertrewrite.py
M testing/test_cacheprovider.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_monkeypatch.py
M testing/test_parseopt.py
M testing/test_pdb.py
M testing/test_pluginmanager.py
M testing/test_pytester.py
M testing/test_terminal.py
M tox.ini
Log Message:
-----------
Merge pull request #3884 from nicoddemus/merge-master-into-features
Merge master into features
Compare: https://github.com/pytest-dev/pytest/compare/044d2b8e6e47...80eef29681c9
**NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
More information about the pytest-commit
mailing list