Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: dff7b203f7ac83192611c361ebf89e861ba94e70
https://github.com/pytest-dev/pytest/commit/dff7b203f7ac83192611c361ebf89e861ba94e70
Author: Daniel Hahler <[email protected]>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M tox.ini
Log Message:
-----------
tox: clean up docs target
Commit: dcafb8c48ca42afd940db76ee48b72982f646bc0
https://github.com/pytest-dev/pytest/commit/dcafb8c48ca42afd940db76ee48b72982f646bc0
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-03 (Fri, 03 Aug 2018)
Changed paths:
A testing/example_scripts/collect/package_infinite_recursion/conftest.py
A
testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
A
testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
M testing/python/collect.py
Log Message:
-----------
Add example for package recursion bug
Commit: fe0a76e1a61fab631ba21ca29a4cd13c71a3f807
https://github.com/pytest-dev/pytest/commit/fe0a76e1a61fab631ba21ca29a4cd13c71a3f807
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-03 (Fri, 03 Aug 2018)
Changed paths:
A changelog/3771.bugfix.rst
M src/_pytest/python.py
Log Message:
-----------
Fix recursion bug if a pytest_ignore_collect returns False instead of None
Commit: 0a1c2a7ca1d37070b0ca819c7e465bd35b4d79ff
https://github.com/pytest-dev/pytest/commit/0a1c2a7ca1d37070b0ca819c7e465bd35b4d79ff
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-04 (Sat, 04 Aug 2018)
Changed paths:
M CHANGELOG.rst
M doc/en/changelog.rst
Log Message:
-----------
Add a changelog blurb and title, similar to tox
Commit: ef8ec01e3979aff992d63540a0e36a957e133c76
https://github.com/pytest-dev/pytest/commit/ef8ec01e3979aff992d63540a0e36a957e133c76
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-04 (Sat, 04 Aug 2018)
Changed paths:
M src/_pytest/compat.py
M src/_pytest/fixtures.py
M testing/acceptance_test.py
A testing/example_scripts/acceptance/fixture_mock_integration.py
M testing/test_compat.py
Log Message:
-----------
Fix issue where fixtures would lose the decorated functionality
Fix #3774
Commit: 2c0d2eef40bf6393643f045ec1766e1b60ccc999
https://github.com/pytest-dev/pytest/commit/2c0d2eef40bf6393643f045ec1766e1b60ccc999
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-04 (Sat, 04 Aug 2018)
Changed paths:
A changelog/3775.bugfix.rst
M src/_pytest/config/__init__.py
A testing/example_scripts/config/collect_pytest_prefix/conftest.py
A testing/example_scripts/config/collect_pytest_prefix/test_foo.py
M testing/test_config.py
Log Message:
-----------
Only consider actual functions when considering hooks
Fix #3775
Commit: d11781920b60ec2177b91d66d67736d62479d5cf
https://github.com/pytest-dev/pytest/commit/d11781920b60ec2177b91d66d67736d62479d5cf
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-05 (Sun, 05 Aug 2018)
Changed paths:
A changelog/3775.bugfix.rst
M src/_pytest/config/__init__.py
A testing/example_scripts/config/collect_pytest_prefix/conftest.py
A testing/example_scripts/config/collect_pytest_prefix/test_foo.py
M testing/test_config.py
Log Message:
-----------
Merge pull request #3782 from nicoddemus/pytest-non-functions
Only consider actual functions when collecting hooks
Commit: 855fd17014e904124e4cb644d730cbaabfc07e1f
https://github.com/pytest-dev/pytest/commit/855fd17014e904124e4cb644d730cbaabfc07e1f
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-05 (Sun, 05 Aug 2018)
Changed paths:
M CHANGELOG.rst
M doc/en/changelog.rst
Log Message:
-----------
Merge pull request #3779 from nicoddemus/changelog-title
Add a changelog blurb and title, similar to tox
Commit: e7230691652ff31fcc1cd92e4f5bf080f386b681
https://github.com/pytest-dev/pytest/commit/e7230691652ff31fcc1cd92e4f5bf080f386b681
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-06 (Mon, 06 Aug 2018)
Changed paths:
A changelog/3771.bugfix.rst
M src/_pytest/python.py
A testing/example_scripts/collect/package_infinite_recursion/conftest.py
A
testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
A
testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
M testing/python/collect.py
Log Message:
-----------
Merge pull request #3771 from nicoddemus/package-infinite-recursion-bug
Fix infinite recursion collection bug with pytest_ignore_collect hook
Commit: aa358433b0d63655981e2bac112ab5a490927716
https://github.com/pytest-dev/pytest/commit/aa358433b0d63655981e2bac112ab5a490927716
Author: Wes Thomas <[email protected]>
Date: 2018-08-08 (Wed, 08 Aug 2018)
Changed paths:
A changelog/3788.bugfix.rst
M src/_pytest/unittest.py
M testing/test_unittest.py
Log Message:
-----------
Fix AttributeError bug in TestCaseFunction.teardown by creating
TestCaseFunction._testcase as attribute of class with a None default.
Commit: 051db6a33d75e0aff4664be12eb85206ec9d8234
https://github.com/pytest-dev/pytest/commit/051db6a33d75e0aff4664be12eb85206ec9d8234
Author: Wes Thomas <[email protected]>
Date: 2018-08-08 (Wed, 08 Aug 2018)
Changed paths:
M testing/test_unittest.py
Log Message:
-----------
Trimming Trailing Whitespace
Commit: 74d9f56d0f254f63468a3e53f1691e591d2e4c75
https://github.com/pytest-dev/pytest/commit/74d9f56d0f254f63468a3e53f1691e591d2e4c75
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-08 (Wed, 08 Aug 2018)
Changed paths:
M changelog/3788.bugfix.rst
Log Message:
-----------
Improve CHANGELOG a bit
Commit: 5d3c5123f8836c53a7b9b1368e6a1fbab5801035
https://github.com/pytest-dev/pytest/commit/5d3c5123f8836c53a7b9b1368e6a1fbab5801035
Author: Ronny Pfannschmidt <[email protected]>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
A changelog/3788.bugfix.rst
M src/_pytest/unittest.py
M testing/test_unittest.py
Log Message:
-----------
Merge pull request #3792 from decisio/pr-3788-fix-teardown-exception
Pr 3788 fix teardown exception
Commit: 67106f056b0633b35dd4a080ef120fa61b55cf37
https://github.com/pytest-dev/pytest/commit/67106f056b0633b35dd4a080ef120fa61b55cf37
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M src/_pytest/compat.py
M src/_pytest/fixtures.py
M testing/test_compat.py
Log Message:
-----------
Use a custom holder class so we can be sure __pytest_wrapper__ was set by us
Commit: 4d8903fd0b89369e0e44f084e93c43d2ce26d736
https://github.com/pytest-dev/pytest/commit/4d8903fd0b89369e0e44f084e93c43d2ce26d736
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M src/_pytest/compat.py
M src/_pytest/fixtures.py
M testing/acceptance_test.py
A testing/example_scripts/acceptance/fixture_mock_integration.py
M testing/test_compat.py
Log Message:
-----------
Merge pull request #3780 from nicoddemus/mock-integration-fix
Fix issue where fixtures would lose the decorated functionality
Commit: 220288ac773c630bcf768174fd9db142b7249a6b
https://github.com/pytest-dev/pytest/commit/220288ac773c630bcf768174fd9db142b7249a6b
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
A changelog/3774.bugfix.rst
Log Message:
-----------
Add CHANGELOG for issue #3774, missing from PR #3780
Commit: 266f05c4c4ce981bfa7a1d2266380380aaf4bb72
https://github.com/pytest-dev/pytest/commit/266f05c4c4ce981bfa7a1d2266380380aaf4bb72
Author: turturica <Ionut Turturica>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M src/_pytest/main.py
M testing/test_collection.py
Log Message:
-----------
Fix #3751
Commit: be11d3e19526148716b49705369cf0d2eeaf31a8
https://github.com/pytest-dev/pytest/commit/be11d3e19526148716b49705369cf0d2eeaf31a8
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-10 (Fri, 10 Aug 2018)
Changed paths:
M src/_pytest/config/argparsing.py
Log Message:
-----------
Improve warning messages when addoption is called with string as `type`
Encountered the warning myself and to me the message was not clear about
what should be done to fix the warning
Commit: bfd0addaeb29d25e88cbc56fb529b2181d401308
https://github.com/pytest-dev/pytest/commit/bfd0addaeb29d25e88cbc56fb529b2181d401308
Author: turturica <Ionut Turturica>
Date: 2018-08-10 (Fri, 10 Aug 2018)
Changed paths:
M src/_pytest/python.py
Log Message:
-----------
Fix test collection from packages mixed with directories. #3768 and #3789
Commit: 50db718a6a0ea09be107f6bf9e9aa1a7002a91de
https://github.com/pytest-dev/pytest/commit/50db718a6a0ea09be107f6bf9e9aa1a7002a91de
Author: turturica <Ionut Turturica>
Date: 2018-08-10 (Fri, 10 Aug 2018)
Changed paths:
M testing/test_collection.py
Log Message:
-----------
Add a test description.
Commit: 27b5435a40384a7e5b2ba85a9916774d171c4d66
https://github.com/pytest-dev/pytest/commit/27b5435a40384a7e5b2ba85a9916774d171c4d66
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-10 (Fri, 10 Aug 2018)
Changed paths:
M testing/test_collection.py
Log Message:
-----------
Fix docs formatting and improve test a bit
Commit: e92893ed2443840058a1ed3321e471b319534f62
https://github.com/pytest-dev/pytest/commit/e92893ed2443840058a1ed3321e471b319534f62
Author: turturica <Ionut Turturica>
Date: 2018-08-10 (Fri, 10 Aug 2018)
Changed paths:
M testing/python/collect.py
Log Message:
-----------
Add test for packages mixed with modules.
Commit: abae60c8d047aae92f5bb5215f42ab15771673a6
https://github.com/pytest-dev/pytest/commit/abae60c8d047aae92f5bb5215f42ab15771673a6
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-10 (Fri, 10 Aug 2018)
Changed paths:
A changelog/3768.bugfix.rst
A changelog/3789.bugfix.rst
Log Message:
-----------
Add CHANGELOG entries
Commit: abbd7c30a43b56106fb323892311b9d4ba7a3105
https://github.com/pytest-dev/pytest/commit/abbd7c30a43b56106fb323892311b9d4ba7a3105
Author: Josh Holland <[email protected]>
Date: 2018-08-11 (Sat, 11 Aug 2018)
Changed paths:
A changelog/3746.doc.rst
M src/_pytest/python.py
Log Message:
-----------
Unhide documentation for metafunc.config
Fixes #3746.
Commit: 87a99275fb851f5efd4114f654c5b65e99e03cd9
https://github.com/pytest-dev/pytest/commit/87a99275fb851f5efd4114f654c5b65e99e03cd9
Author: Anthony Sottile <[email protected]>
Date: 2018-08-13 (Mon, 13 Aug 2018)
Changed paths:
A changelog/3746.doc.rst
M src/_pytest/python.py
Log Message:
-----------
Merge pull request #3807 from anowlcalledjosh/metafunc-config-doc
Unhide documentation for metafunc.config
Commit: 22ee2093b8d5e1ebfc4f7a0b4d2df9a64a41460b
https://github.com/pytest-dev/pytest/commit/22ee2093b8d5e1ebfc4f7a0b4d2df9a64a41460b
Author: Ronny Pfannschmidt <[email protected]>
Date: 2018-08-14 (Tue, 14 Aug 2018)
Changed paths:
M src/_pytest/config/argparsing.py
Log Message:
-----------
Merge pull request #3801 from nicoddemus/improve-warning-addoption
Improve warning messages when addoption is called with string as `type`
Commit: 68bbd42213c33884ea5df2ac0df21570f057c1f8
https://github.com/pytest-dev/pytest/commit/68bbd42213c33884ea5df2ac0df21570f057c1f8
Author: Ronny Pfannschmidt <[email protected]>
Date: 2018-08-14 (Tue, 14 Aug 2018)
Changed paths:
A changelog/3774.bugfix.rst
Log Message:
-----------
Merge pull request #3795 from nicoddemus/changelog-3774
Add CHANGELOG for issue #3774, missing from PR #3780
Commit: b88e09a6970c7b0211d691e3cbdb56389655d442
https://github.com/pytest-dev/pytest/commit/b88e09a6970c7b0211d691e3cbdb56389655d442
Author: Daniel Hahler <[email protected]>
Date: 2018-08-14 (Tue, 14 Aug 2018)
Changed paths:
M tox.ini
Log Message:
-----------
Merge pull request #3548 from blueyed/fix-docs
tox: clean up docs target
Commit: 6367f0f5f19185ae031e465fca904298b124b880
https://github.com/pytest-dev/pytest/commit/6367f0f5f19185ae031e465fca904298b124b880
Author: Sankt Petersbug <[email protected]>
Date: 2018-08-14 (Tue, 14 Aug 2018)
Changed paths:
M src/_pytest/warnings.py
M testing/test_warnings.py
Log Message:
-----------
fix `filterwarnings` mark not registered
Commit: cb77e65c97896b6fca8ce5f3d33541200a3d8b65
https://github.com/pytest-dev/pytest/commit/cb77e65c97896b6fca8ce5f3d33541200a3d8b65
Author: Sankt Petersbug <[email protected]>
Date: 2018-08-14 (Tue, 14 Aug 2018)
Changed paths:
M AUTHORS
Log Message:
-----------
updated AUTHORS
Commit: e06a077ac25771591ed9cd21f26390e7e0d28e57
https://github.com/pytest-dev/pytest/commit/e06a077ac25771591ed9cd21f26390e7e0d28e57
Author: Sankt Petersbug <[email protected]>
Date: 2018-08-14 (Tue, 14 Aug 2018)
Changed paths:
A changelog/3671.bugfix.rst
Log Message:
-----------
added changelog
Commit: c1c08852f99e647335fb8e5b1040450f7cc09e00
https://github.com/pytest-dev/pytest/commit/c1c08852f99e647335fb8e5b1040450f7cc09e00
Author: Sankt Petersbug <[email protected]>
Date: 2018-08-14 (Tue, 14 Aug 2018)
Changed paths:
M changelog/3671.bugfix.rst
Log Message:
-----------
lint checks
Commit: 212ee450b7836a4f2ab5e8626c521d5febcf94fe
https://github.com/pytest-dev/pytest/commit/212ee450b7836a4f2ab5e8626c521d5febcf94fe
Author: Sankt Petersbug <[email protected]>
Date: 2018-08-14 (Tue, 14 Aug 2018)
Changed paths:
M testing/test_warnings.py
Log Message:
-----------
simplified test function
Commit: 78ef531420f2327a0daaa1c28a19ceefb9ce7b7f
https://github.com/pytest-dev/pytest/commit/78ef531420f2327a0daaa1c28a19ceefb9ce7b7f
Author: Sankt Petersbug <[email protected]>
Date: 2018-08-14 (Tue, 14 Aug 2018)
Changed paths:
M AUTHORS
Log Message:
-----------
corrected the position of myname
Commit: ca1bb9a3a183f666484809b027b30c1d9fab81e8
https://github.com/pytest-dev/pytest/commit/ca1bb9a3a183f666484809b027b30c1d9fab81e8
Author: Anthony Sottile <[email protected]>
Date: 2018-08-15 (Wed, 15 Aug 2018)
Changed paths:
M AUTHORS
A changelog/3671.bugfix.rst
M src/_pytest/warnings.py
M testing/test_warnings.py
Log Message:
-----------
Merge pull request #3815 from sankt-petersbug/fix-3671
Fix #3671 - `filterwarnings` Is an Unregistered Marker
Commit: 64faa41d061a700b380daf12afb5bda385a21c10
https://github.com/pytest-dev/pytest/commit/64faa41d061a700b380daf12afb5bda385a21c10
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-15 (Wed, 15 Aug 2018)
Changed paths:
A changelog/3768.bugfix.rst
A changelog/3789.bugfix.rst
M src/_pytest/python.py
M testing/python/collect.py
Log Message:
-----------
Merge pull request #3802 from jonozzz/fix-3768
Fix test collection from packages mixed with directories. #3768 and #3789
Commit: 17644ff285a30aa43ec4c02c167fbdf4ad47a291
https://github.com/pytest-dev/pytest/commit/17644ff285a30aa43ec4c02c167fbdf4ad47a291
Author: Anthony Sottile <[email protected]>
Date: 2018-08-15 (Wed, 15 Aug 2018)
Changed paths:
A changelog/3804.bugfix.rst
M src/_pytest/_code/code.py
M testing/code/test_excinfo.py
Log Message:
-----------
Fix traceback reporting for exceptions with `__cause__` cycles.
Commit: 939a792c41f87b5920df8af3ced4fecd2095b23a
https://github.com/pytest-dev/pytest/commit/939a792c41f87b5920df8af3ced4fecd2095b23a
Author: Ronny Pfannschmidt <[email protected]>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M src/_pytest/main.py
M testing/test_collection.py
Log Message:
-----------
Merge pull request #3798 from jonozzz/fix-3751
Fix #3751
Commit: 7d4c4c66d4198d1494eeaed59244d73cd2f4c8aa
https://github.com/pytest-dev/pytest/commit/7d4c4c66d4198d1494eeaed59244d73cd2f4c8aa
Author: Ronny Pfannschmidt <[email protected]>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
A changelog/3804.bugfix.rst
M src/_pytest/_code/code.py
M testing/code/test_excinfo.py
Log Message:
-----------
Merge pull request #3805 from asottile/cause_cycles
Fix traceback reporting for exceptions with `__cause__` cycles.
Commit: da9d814da43a32f9eb3924e5b5618a80d7786731
https://github.com/pytest-dev/pytest/commit/da9d814da43a32f9eb3924e5b5618a80d7786731
Author: Victor <[email protected]>
Date: 2018-08-17 (Fri, 17 Aug 2018)
Changed paths:
M testing/test_capture.py
Log Message:
-----------
Added test.
Commit: 2b71cb9c381effaea13fa00c096a8f4c76a663b5
https://github.com/pytest-dev/pytest/commit/2b71cb9c381effaea13fa00c096a8f4c76a663b5
Author: Victor <[email protected]>
Date: 2018-08-17 (Fri, 17 Aug 2018)
Changed paths:
M src/_pytest/capture.py
M src/_pytest/logging.py
Log Message:
-----------
Added activation/deactivation of capture fixture in logging emit.
Commit: e5a3c870b4fa6c3a1abd7f464b419c95190ced4a
https://github.com/pytest-dev/pytest/commit/e5a3c870b4fa6c3a1abd7f464b419c95190ced4a
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M CHANGELOG.rst
R changelog/3671.bugfix.rst
R changelog/3746.doc.rst
R changelog/3768.bugfix.rst
R changelog/3771.bugfix.rst
R changelog/3774.bugfix.rst
R changelog/3775.bugfix.rst
R changelog/3788.bugfix.rst
R changelog/3789.bugfix.rst
R changelog/3804.bugfix.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
Log Message:
-----------
Preparing release version 3.7.2
Commit: e0b088b52ea2c9ad9748acbed62dccfd20eccf42
https://github.com/pytest-dev/pytest/commit/e0b088b52ea2c9ad9748acbed62dccfd20eccf42
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-16 (Thu, 16 Aug 2018)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Changelog tweaks
Commit: f66764e1c00624b91c3ab9554c7872f9611ebc42
https://github.com/pytest-dev/pytest/commit/f66764e1c00624b91c3ab9554c7872f9611ebc42
Author: Victor <[email protected]>
Date: 2018-08-17 (Fri, 17 Aug 2018)
Changed paths:
M AUTHORS
A changelog/3819.bugfix.rst
Log Message:
-----------
Added changelog and updated AUTHORS.
Commit: e391c47ed8e6b4e68ec6e97b2ea3195a198e218f
https://github.com/pytest-dev/pytest/commit/e391c47ed8e6b4e68ec6e97b2ea3195a198e218f
Author: Victor <[email protected]>
Date: 2018-08-17 (Fri, 17 Aug 2018)
Changed paths:
M testing/logging/test_reporting.py
Log Message:
-----------
Update capture suspend test for logging.
Commit: 3059bfb1b3a45ab517da945acf74fe20abcad5a4
https://github.com/pytest-dev/pytest/commit/3059bfb1b3a45ab517da945acf74fe20abcad5a4
Author: Victor <[email protected]>
Date: 2018-08-17 (Fri, 17 Aug 2018)
Changed paths:
M testing/test_capture.py
Log Message:
-----------
Update test with another problem.
Commit: 090f67a980adb7460d8600b6e49f7719c7c6e870
https://github.com/pytest-dev/pytest/commit/090f67a980adb7460d8600b6e49f7719c7c6e870
Author: Victor <[email protected]>
Date: 2018-08-17 (Fri, 17 Aug 2018)
Changed paths:
M src/_pytest/capture.py
M src/_pytest/logging.py
M testing/logging/test_reporting.py
Log Message:
-----------
Refactored implementation and updated tests.
Commit: c3e494f6cf2fe7de97090193d0a96d4f499083c7
https://github.com/pytest-dev/pytest/commit/c3e494f6cf2fe7de97090193d0a96d4f499083c7
Author: Vlad Shcherbina <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
A changelog/3826.trivial.rst
M src/_pytest/fixtures.py
Log Message:
-----------
Replace broken type annotations with type comments
Fixes #3826.
Commit: 14db2f91ba5e94ebf55c55000b0da1e3b755cc26
https://github.com/pytest-dev/pytest/commit/14db2f91ba5e94ebf55c55000b0da1e3b755cc26
Author: victor <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M src/_pytest/capture.py
Log Message:
-----------
Fixed global not called if no capsys fixture. Using now capsys context
manager as well.
Commit: 9fa7745795afd20e116cdd8ae93211a32054697b
https://github.com/pytest-dev/pytest/commit/9fa7745795afd20e116cdd8ae93211a32054697b
Author: victor <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M src/_pytest/capture.py
M src/_pytest/logging.py
Log Message:
-----------
Refactor, tests passing.
Commit: eb2d0745301d597b7ef03450bea29c509237d60a
https://github.com/pytest-dev/pytest/commit/eb2d0745301d597b7ef03450bea29c509237d60a
Author: victor <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M src/_pytest/capture.py
M src/_pytest/logging.py
Log Message:
-----------
Black changes.
Commit: 9f7345d6639f803330835febee2694ceb925e08a
https://github.com/pytest-dev/pytest/commit/9f7345d6639f803330835febee2694ceb925e08a
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M src/_pytest/capture.py
Log Message:
-----------
Avoid leaving a reference to the last item on CaptureManager
Commit: f674217c43c21f17b3693ce8b7b0e5bd06de2197
https://github.com/pytest-dev/pytest/commit/f674217c43c21f17b3693ce8b7b0e5bd06de2197
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M src/_pytest/capture.py
M src/_pytest/compat.py
M src/_pytest/logging.py
Log Message:
-----------
Moved dummy_context_manager to compat module
Commit: 2fe824b8c47dc661eeb984555e54b8ed9ca2b66d
https://github.com/pytest-dev/pytest/commit/2fe824b8c47dc661eeb984555e54b8ed9ca2b66d
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M CHANGELOG.rst
R changelog/3671.bugfix.rst
R changelog/3746.doc.rst
R changelog/3768.bugfix.rst
R changelog/3771.bugfix.rst
R changelog/3774.bugfix.rst
R changelog/3775.bugfix.rst
R changelog/3788.bugfix.rst
R changelog/3789.bugfix.rst
R changelog/3804.bugfix.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
Log Message:
-----------
Merge pull request #3821 from nicoddemus/release-3.7.2
Preparing release version 3.7.2
Commit: 5cf7d1dba21b51d4d20dc61b5a2f50bf5fc4fbf0
https://github.com/pytest-dev/pytest/commit/5cf7d1dba21b51d4d20dc61b5a2f50bf5fc4fbf0
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M src/_pytest/capture.py
M src/_pytest/logging.py
M testing/logging/test_reporting.py
Log Message:
-----------
"suspend" method of capture fixture private
Also change the context-manager to global_and_fixture_disabled to
better convey its meaning
Commit: 29975e5b37c176c93f2312626900c2cab11072f0
https://github.com/pytest-dev/pytest/commit/29975e5b37c176c93f2312626900c2cab11072f0
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
A changelog/3826.trivial.rst
M src/_pytest/fixtures.py
Log Message:
-----------
Merge pull request #3827 from Vlad-Shcherbina/funcfixtureinfo-type-hints
Replace broken type annotations with type comments
Commit: 28aff051ab88ab055b315f10287a6657c437e47d
https://github.com/pytest-dev/pytest/commit/28aff051ab88ab055b315f10287a6657c437e47d
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M AUTHORS
A changelog/3819.bugfix.rst
M src/_pytest/capture.py
M src/_pytest/compat.py
M src/_pytest/logging.py
M testing/logging/test_reporting.py
M testing/test_capture.py
Log Message:
-----------
Merge pull request #3822 from Sup3rGeo/bugfix/capsys-with-cli-logging
Bugfix/capsys with cli logging
Commit: c64a8c9c7f1b0fff2fcd05701d795648787e9c64
https://github.com/pytest-dev/pytest/commit/c64a8c9c7f1b0fff2fcd05701d795648787e9c64
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M AUTHORS
M CHANGELOG.rst
A changelog/3819.bugfix.rst
A changelog/3826.trivial.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.7.2.rst
M doc/en/changelog.rst
M doc/en/example/markers.rst
M doc/en/example/nonpython.rst
M doc/en/example/parametrize.rst
M src/_pytest/_code/code.py
M src/_pytest/capture.py
M src/_pytest/compat.py
M src/_pytest/config/__init__.py
M src/_pytest/config/argparsing.py
M src/_pytest/fixtures.py
M src/_pytest/logging.py
M src/_pytest/main.py
M src/_pytest/python.py
M src/_pytest/unittest.py
M src/_pytest/warnings.py
M testing/acceptance_test.py
M testing/code/test_excinfo.py
A testing/example_scripts/acceptance/fixture_mock_integration.py
A testing/example_scripts/collect/package_infinite_recursion/conftest.py
A
testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
A
testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
A testing/example_scripts/config/collect_pytest_prefix/conftest.py
A testing/example_scripts/config/collect_pytest_prefix/test_foo.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_compat.py
M testing/test_config.py
M testing/test_unittest.py
M testing/test_warnings.py
M tox.ini
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
Commit: a6cdd0d9da824e32343408ef63fdf017a15f0f57
https://github.com/pytest-dev/pytest/commit/a6cdd0d9da824e32343408ef63fdf017a15f0f57
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-18 (Sat, 18 Aug 2018)
Changed paths:
M AUTHORS
M CHANGELOG.rst
A changelog/3819.bugfix.rst
A changelog/3826.trivial.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.7.2.rst
M doc/en/changelog.rst
M doc/en/example/markers.rst
M doc/en/example/nonpython.rst
M doc/en/example/parametrize.rst
M src/_pytest/_code/code.py
M src/_pytest/capture.py
M src/_pytest/compat.py
M src/_pytest/config/__init__.py
M src/_pytest/config/argparsing.py
M src/_pytest/fixtures.py
M src/_pytest/logging.py
M src/_pytest/main.py
M src/_pytest/python.py
M src/_pytest/unittest.py
M src/_pytest/warnings.py
M testing/acceptance_test.py
M testing/code/test_excinfo.py
A testing/example_scripts/acceptance/fixture_mock_integration.py
A testing/example_scripts/collect/package_infinite_recursion/conftest.py
A
testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
A
testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
A testing/example_scripts/config/collect_pytest_prefix/conftest.py
A testing/example_scripts/config/collect_pytest_prefix/test_foo.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_compat.py
M testing/test_config.py
M testing/test_unittest.py
M testing/test_warnings.py
M tox.ini
Log Message:
-----------
Merge pull request #3831 from nicoddemus/merge-master-into-features
Merge master into features
Compare:
https://github.com/pytest-dev/pytest/compare/5f97711377e0...a6cdd0d9da82
**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.
_______________________________________________
pytest-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pytest-commit
