Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: b48f1d378b4a9f96425aac848eacf3ef1ee1cce5
https://github.com/pytest-dev/pytest/commit/b48f1d378b4a9f96425aac848eacf3ef1ee1cce5
Author: Hugo Martins <[email protected]>
Date: 2018-06-30 (Sat, 30 Jun 2018)
Changed paths:
A changelog/3592.doc.rst
M doc/en/fixture.rst
Log Message:
-----------
Clarify examples in fixtures' documentation
Commit: f7c929c932c4a73934ee1ea3cb3fc2a5e2e3e852
https://github.com/pytest-dev/pytest/commit/f7c929c932c4a73934ee1ea3cb3fc2a5e2e3e852
Author: Hugo Martins <[email protected]>
Date: 2018-06-30 (Sat, 30 Jun 2018)
Changed paths:
M changelog/3592.doc.rst
M doc/en/fixture.rst
Log Message:
-----------
Fix linting errors in docs/fixtures.rst
Commit: f52a5d3be2b9c7f3145ec28f0650df33d1eb11b6
https://github.com/pytest-dev/pytest/commit/f52a5d3be2b9c7f3145ec28f0650df33d1eb11b6
Author: Hugo Martins <[email protected]>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
A changelog/3630.bugfix.rst
A changelog/3631.bugfix.rst
M src/_pytest/logging.py
M src/_pytest/mark/structures.py
M src/_pytest/monkeypatch.py
M testing/logging/test_reporting.py
M testing/test_mark.py
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 8232fd1a2d1534b7a99479f12c37ad23a00e0716
https://github.com/pytest-dev/pytest/commit/8232fd1a2d1534b7a99479f12c37ad23a00e0716
Author: Hugo Martins <[email protected]>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
M doc/en/fixture.rst
Log Message:
-----------
Fix remaining "smtp" references
Commit: 63b25304c3727f37874d0923db4603a08ba7b1b2
https://github.com/pytest-dev/pytest/commit/63b25304c3727f37874d0923db4603a08ba7b1b2
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-03 (Tue, 03 Jul 2018)
Changed paths:
M doc/en/fixture.rst
Log Message:
-----------
Run pre-commit fixers
Commit: 50f030d2330280abc31824075660a9d5d0aaa808
https://github.com/pytest-dev/pytest/commit/50f030d2330280abc31824075660a9d5d0aaa808
Author: Anthony Sottile <[email protected]>
Date: 2018-07-04 (Wed, 04 Jul 2018)
Changed paths:
M .pre-commit-config.yaml
M CHANGELOG.rst
M doc/en/announce/release-2.9.0.rst
M doc/en/example/markers.rst
M doc/en/goodpractices.rst
M doc/en/mark.rst
Log Message:
-----------
Correct code blocks in docs
Commit: 7e8f7bfa1626e9a06b5a9d9ac0580c1f7577a209
https://github.com/pytest-dev/pytest/commit/7e8f7bfa1626e9a06b5a9d9ac0580c1f7577a209
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-05 (Thu, 05 Jul 2018)
Changed paths:
M .pre-commit-config.yaml
M CHANGELOG.rst
M doc/en/announce/release-2.9.0.rst
M doc/en/example/markers.rst
M doc/en/goodpractices.rst
M doc/en/mark.rst
Log Message:
-----------
Merge pull request #3660 from asottile/code_highlight_fix
Correct code blocks in docs
Commit: d7b722e2ae6dbf4b10bbba14c3a2dc5c4f2738b4
https://github.com/pytest-dev/pytest/commit/d7b722e2ae6dbf4b10bbba14c3a2dc5c4f2738b4
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-06 (Fri, 06 Jul 2018)
Changed paths:
M doc/en/reference.rst
Log Message:
-----------
Add reference docs for pytest.mark.usefixtures
Commit: 18b2fc11adf4b79d860ba91b73678a22c0c53083
https://github.com/pytest-dev/pytest/commit/18b2fc11adf4b79d860ba91b73678a22c0c53083
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-06 (Fri, 06 Jul 2018)
Changed paths:
M README.rst
Log Message:
-----------
Dummy change
Commit: f359b50fe5e8c232c34d7400b00d4763ce2f43a4
https://github.com/pytest-dev/pytest/commit/f359b50fe5e8c232c34d7400b00d4763ce2f43a4
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-06 (Fri, 06 Jul 2018)
Changed paths:
M README.rst
Log Message:
-----------
Adjust copyright in README
Commit: d26a596072c4b83340904512d5d34a107daf13eb
https://github.com/pytest-dev/pytest/commit/d26a596072c4b83340904512d5d34a107daf13eb
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-07 (Sat, 07 Jul 2018)
Changed paths:
M doc/en/fixture.rst
M doc/en/reference.rst
Log Message:
-----------
Add a warning about usefixtures mark not working in fixtures
Fix #1014
Commit: 49e82a4be8efe8a38b9208724e3681db413f22be
https://github.com/pytest-dev/pytest/commit/49e82a4be8efe8a38b9208724e3681db413f22be
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-07 (Sat, 07 Jul 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Skip deploy stage entirely unless we have a tag
Borrowed from https://github.com/tox-dev/tox/pull/877
Commit: aa9d1ad2ebeae21fd65f57bead011bbf1df1a333
https://github.com/pytest-dev/pytest/commit/aa9d1ad2ebeae21fd65f57bead011bbf1df1a333
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-07 (Sat, 07 Jul 2018)
Changed paths:
M doc/en/fixture.rst
M doc/en/reference.rst
Log Message:
-----------
Merge pull request #3663 from nicoddemus/usefixtures-reference
Add reference docs for pytest.mark.usefixtures
Commit: 12c5b6104c8b07a914b28d173e18dcef0a5706dc
https://github.com/pytest-dev/pytest/commit/12c5b6104c8b07a914b28d173e18dcef0a5706dc
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-07 (Sat, 07 Jul 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge pull request #3666 from nicoddemus/deploy-on-tags
Skip deploy stage entirely unless we have a tag
Commit: 42bbb4fa8a43b913ce267454f417605f9744a95b
https://github.com/pytest-dev/pytest/commit/42bbb4fa8a43b913ce267454f417605f9744a95b
Author: Anthony Sottile <[email protected]>
Date: 2018-07-07 (Sat, 07 Jul 2018)
Changed paths:
A changelog/742.bugfix.rst
M src/_pytest/pytester.py
M testing/test_pytester.py
Log Message:
-----------
Use -mpytest when invoking pytest in pytester
Commit: d4faa4056b4d59e4e450df425b34c5b167af43eb
https://github.com/pytest-dev/pytest/commit/d4faa4056b4d59e4e450df425b34c5b167af43eb
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-08 (Sun, 08 Jul 2018)
Changed paths:
A changelog/742.bugfix.rst
M src/_pytest/pytester.py
M testing/test_pytester.py
Log Message:
-----------
Merge pull request #3667 from asottile/avoid_sys_path_pollution_742
Use -mpytest when invoking pytest in pytester
Commit: 4ae93a7a078fc92d910b632a46a86cb779b3e2b7
https://github.com/pytest-dev/pytest/commit/4ae93a7a078fc92d910b632a46a86cb779b3e2b7
Author: Anthony Sottile <[email protected]>
Date: 2018-07-08 (Sun, 08 Jul 2018)
Changed paths:
A changelog/2319.trivial.rst
M src/_pytest/_code/source.py
M testing/python/raises.py
M testing/test_assertrewrite.py
M testing/test_capture.py
Log Message:
-----------
Remove obsolete __future__ imports
Commit: 9ef7878cbca555000d88a0ae3abb8cf809e69557
https://github.com/pytest-dev/pytest/commit/9ef7878cbca555000d88a0ae3abb8cf809e69557
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-08 (Sun, 08 Jul 2018)
Changed paths:
A changelog/2319.trivial.rst
M src/_pytest/_code/source.py
M testing/python/raises.py
M testing/test_assertrewrite.py
M testing/test_capture.py
Log Message:
-----------
Merge pull request #3668 from asottile/remove_obsolete_future_imports
Remove obsolete __future__ imports
Commit: af0059079cb35372fe9fceeeb6bb183795ce3b7e
https://github.com/pytest-dev/pytest/commit/af0059079cb35372fe9fceeeb6bb183795ce3b7e
Author: Anthony Sottile <[email protected]>
Date: 2018-07-08 (Sun, 08 Jul 2018)
Changed paths:
M testing/code/test_source.py
R testing/code/test_source_multiline_block.py
M tox.ini
Log Message:
-----------
Remove unused fix-lint tox environment
Commit: 61301d934e5e08620c5f7be82384bc07d3d51ea9
https://github.com/pytest-dev/pytest/commit/61301d934e5e08620c5f7be82384bc07d3d51ea9
Author: Anthony Sottile <[email protected]>
Date: 2018-07-08 (Sun, 08 Jul 2018)
Changed paths:
M src/_pytest/compat.py
M src/_pytest/config/__init__.py
M testing/test_assertrewrite.py
M testing/test_pytester.py
Log Message:
-----------
Remove some extraneous `# noqa` comments
This was partially automated with https://github.com/asottile/yesqa
_with a few caveats_:
- it was run under python2 (chosen arbitrarily, when run under python3 other
things were changed)
- I used `git checkout -p` to revert the removal of `noqa` comments from
`cmp()` lines.
Commit: 898544e147135873ddc7e984eb83defa304dd886
https://github.com/pytest-dev/pytest/commit/898544e147135873ddc7e984eb83defa304dd886
Author: Anthony Sottile <[email protected]>
Date: 2018-07-10 (Tue, 10 Jul 2018)
Changed paths:
M src/_pytest/compat.py
M src/_pytest/config/__init__.py
M testing/test_assertrewrite.py
M testing/test_pytester.py
Log Message:
-----------
Merge pull request #3669 from asottile/yesqa
Remove some extraneous `# noqa` comments
Commit: 593b451373ec74ec34203ad87e432f2b4733a30e
https://github.com/pytest-dev/pytest/commit/593b451373ec74ec34203ad87e432f2b4733a30e
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-10 (Tue, 10 Jul 2018)
Changed paths:
M testing/code/test_source.py
R testing/code/test_source_multiline_block.py
M tox.ini
Log Message:
-----------
Merge pull request #3670 from asottile/remove_unused_fix_lint
Remove unused fix-lint tox environment
Commit: 4dfe2eee945db025aad942fef71b98b4f789c349
https://github.com/pytest-dev/pytest/commit/4dfe2eee945db025aad942fef71b98b4f789c349
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M doc/en/fixture.rst
Log Message:
-----------
Fix finalize call
Commit: 2c4759ce5761b3fbc32f1d98a808b655ae964f2d
https://github.com/pytest-dev/pytest/commit/2c4759ce5761b3fbc32f1d98a808b655ae964f2d
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M doc/en/builtin.rst
M doc/en/example/reportingdemo.rst
M doc/en/example/simple.rst
M doc/en/fixture.rst
Log Message:
-----------
Run regendocs
Commit: 251adbf6444667cda2c5ce24596001ca29a4776e
https://github.com/pytest-dev/pytest/commit/251adbf6444667cda2c5ce24596001ca29a4776e
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M .pre-commit-config.yaml
M .travis.yml
M CHANGELOG.rst
M HOWTORELEASE.rst
M README.rst
A changelog/2319.trivial.rst
R changelog/3061.bugfix.rst
R changelog/3593.bugfix.rst
R changelog/3598.trivial.rst
R changelog/3605.bugfix.rst
R changelog/3609.trivial.rst
R changelog/3611.doc.rst
R changelog/3630.bugfix.rst
R changelog/3631.bugfix.rst
A changelog/742.bugfix.rst
M doc/en/announce/index.rst
M doc/en/announce/release-2.9.0.rst
A doc/en/announce/release-3.6.3.rst
M doc/en/example/markers.rst
M doc/en/example/simple.rst
M doc/en/fixture.rst
M doc/en/goodpractices.rst
M doc/en/mark.rst
M doc/en/reference.rst
M src/_pytest/_code/source.py
M src/_pytest/compat.py
M src/_pytest/config/__init__.py
M src/_pytest/mark/structures.py
M src/_pytest/pytester.py
M testing/code/test_source.py
R testing/code/test_source_multiline_block.py
M testing/python/raises.py
M testing/test_assertrewrite.py
M testing/test_capture.py
M testing/test_pytester.py
M tox.ini
Log Message:
-----------
Merge with upstream/master
Commit: aa47b64e2a337df4520eea5a680b14990b724ee1
https://github.com/pytest-dev/pytest/commit/aa47b64e2a337df4520eea5a680b14990b724ee1
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M changelog/3592.doc.rst
Log Message:
-----------
Improve CHANGELOG entry
Commit: 54fbc6f6e1404dcd133f8e01d0fd09518664c3ad
https://github.com/pytest-dev/pytest/commit/54fbc6f6e1404dcd133f8e01d0fd09518664c3ad
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M src/_pytest/python.py
Log Message:
-----------
Refactor parametrize() code for readability
Extract the parametrize() block of code into methods for better
readability
Commit: 3e599dc1493fdc38819e96f0176ddde5e46b9622
https://github.com/pytest-dev/pytest/commit/3e599dc1493fdc38819e96f0176ddde5e46b9622
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M src/_pytest/mark/structures.py
M src/_pytest/python.py
Log Message:
-----------
Check that param sets match number of args during _for_parametrize
It makes sense to validate them during creation of the parameter set
Commit: 6c3713226c1c619196ddc0fe870ea4fa4f5253c3
https://github.com/pytest-dev/pytest/commit/6c3713226c1c619196ddc0fe870ea4fa4f5253c3
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
A changelog/3592.doc.rst
M doc/en/fixture.rst
Log Message:
-----------
Merge pull request #3642 from caramelomartins/master
Fixes # 3592 - Clarify Fixtures' Documentation
Commit: 0565a7a4e13bb6d2bdded30c09d023322948c45c
https://github.com/pytest-dev/pytest/commit/0565a7a4e13bb6d2bdded30c09d023322948c45c
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-12 (Thu, 12 Jul 2018)
Changed paths:
M src/_pytest/mark/structures.py
M src/_pytest/python.py
Log Message:
-----------
Merge pull request #3679 from nicoddemus/parametrized-internal-refactor
Refactor parametrize() code for readability
Commit: 35ffd2940427f875f03d6325bb0caf3d8c988461
https://github.com/pytest-dev/pytest/commit/35ffd2940427f875f03d6325bb0caf3d8c988461
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-14 (Sat, 14 Jul 2018)
Changed paths:
A .github/labels.toml
M doc/en/development_guide.rst
Log Message:
-----------
Manage GH labels using the new 'labels' tool
Commit: a0b0c37febd8752cdf1cb74fe80cd1e180056ba8
https://github.com/pytest-dev/pytest/commit/a0b0c37febd8752cdf1cb74fe80cd1e180056ba8
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-14 (Sat, 14 Jul 2018)
Changed paths:
M HOWTORELEASE.rst
A scripts/release.minor.rst
A scripts/release.patch.rst
A scripts/release.py
R tasks/__init__.py
R tasks/generate.py
R tasks/release.minor.rst
R tasks/release.patch.rst
R tasks/requirements.txt
M tox.ini
Log Message:
-----------
Revamp the release script: drop invoke and use tox directly
Following the lead from tox, use a simple Python script instead of depending
on ``invoke``.
Other changes:
* Some colors using ``colorama``.
* Run ``pre-commit`` before the final commit to ensure everything is neatly
formatted.
* Drop generating local tag: legacy from the time we used ``devpi`` as staging
area, currently we no longer use it, and we should push a
tag from the last HEAD of the PR always to ensure it is correct.
Commit: a8464a95cef6c8648c3c05e1e18601e3348f21f5
https://github.com/pytest-dev/pytest/commit/a8464a95cef6c8648c3c05e1e18601e3348f21f5
Author: Hugo Martins <[email protected]>
Date: 2018-07-14 (Sat, 14 Jul 2018)
Changed paths:
A CITATION
Log Message:
-----------
Add CITATION
Relates to #3402
Commit: e9fd038aaeb4951460b94aaa96f1ece174875d66
https://github.com/pytest-dev/pytest/commit/e9fd038aaeb4951460b94aaa96f1ece174875d66
Author: Hugo Martins <[email protected]>
Date: 2018-07-14 (Sat, 14 Jul 2018)
Changed paths:
M CITATION
Log Message:
-----------
Fix linting issues
Commit: 5be03bff61f6e84929db10b76271eca1d4278018
https://github.com/pytest-dev/pytest/commit/5be03bff61f6e84929db10b76271eca1d4278018
Author: Hugo Martins <[email protected]>
Date: 2018-07-14 (Sat, 14 Jul 2018)
Changed paths:
A changelog/3402.trivial.rst
Log Message:
-----------
Add changelog information
Commit: 6a4fa4f4859741550ac7469b18f490ab25e30ca3
https://github.com/pytest-dev/pytest/commit/6a4fa4f4859741550ac7469b18f490ab25e30ca3
Author: Hugo Martins <[email protected]>
Date: 2018-07-14 (Sat, 14 Jul 2018)
Changed paths:
M changelog/3402.trivial.rst
Log Message:
-----------
Fix more linting issues
Commit: 58e77f58bd5bfea593daeaacc3f934b3c1dfbeb6
https://github.com/pytest-dev/pytest/commit/58e77f58bd5bfea593daeaacc3f934b3c1dfbeb6
Author: Vlad Shcherbina <[email protected]>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
A changelog/3635.trivial.rst
M src/_pytest/mark/structures.py
Log Message:
-----------
Replace broken type annotations with type comments
Fixes #3635.
Commit: a821af6b1c9d3ecc7389ddab43bee9f1af2b94ef
https://github.com/pytest-dev/pytest/commit/a821af6b1c9d3ecc7389ddab43bee9f1af2b94ef
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
M HOWTORELEASE.rst
A scripts/release.minor.rst
A scripts/release.patch.rst
A scripts/release.py
R tasks/__init__.py
R tasks/generate.py
R tasks/release.minor.rst
R tasks/release.patch.rst
R tasks/requirements.txt
M tox.ini
Log Message:
-----------
Merge pull request #3682 from nicoddemus/tox-release
Revamp the release script: drop invoke and use tox directly
Commit: a1c3df1889d576be2bd5040cc7cbd39e86bf5aa6
https://github.com/pytest-dev/pytest/commit/a1c3df1889d576be2bd5040cc7cbd39e86bf5aa6
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
A CITATION
A changelog/3402.trivial.rst
Log Message:
-----------
Merge pull request #3683 from caramelomartins/master
[#3402] CITATION
Commit: 82a11e62077ae82f1f454e9ef8067fe0f6b0eb6a
https://github.com/pytest-dev/pytest/commit/82a11e62077ae82f1f454e9ef8067fe0f6b0eb6a
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
A .github/labels.toml
M doc/en/development_guide.rst
Log Message:
-----------
Merge pull request #3680 from nicoddemus/labels
Manage GH labels using the new 'labels' tool
Commit: 771d3e8f4fd1e51c7c8829f1530672d931b12455
https://github.com/pytest-dev/pytest/commit/771d3e8f4fd1e51c7c8829f1530672d931b12455
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
A changelog/3635.trivial.rst
M src/_pytest/mark/structures.py
Log Message:
-----------
Merge pull request #3684 from Vlad-Shcherbina/type_comments
Replace broken type annotations with type comments
Commit: ac9ceaacd8949d29b48f5f66319385854f12be8a
https://github.com/pytest-dev/pytest/commit/ac9ceaacd8949d29b48f5f66319385854f12be8a
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
A .github/labels.toml
M .pre-commit-config.yaml
M .travis.yml
M CHANGELOG.rst
A CITATION
M HOWTORELEASE.rst
M README.rst
A changelog/2319.trivial.rst
A changelog/3402.trivial.rst
A changelog/3592.doc.rst
A changelog/3635.trivial.rst
A changelog/742.bugfix.rst
M doc/en/announce/release-2.9.0.rst
M doc/en/development_guide.rst
M doc/en/example/markers.rst
M doc/en/fixture.rst
M doc/en/goodpractices.rst
M doc/en/mark.rst
M doc/en/reference.rst
A scripts/release.minor.rst
A scripts/release.patch.rst
A scripts/release.py
M src/_pytest/_code/source.py
M src/_pytest/compat.py
M src/_pytest/config/__init__.py
M src/_pytest/mark/structures.py
M src/_pytest/pytester.py
M src/_pytest/python.py
R tasks/__init__.py
R tasks/generate.py
R tasks/release.minor.rst
R tasks/release.patch.rst
R tasks/requirements.txt
M testing/code/test_source.py
R testing/code/test_source_multiline_block.py
M testing/python/raises.py
M testing/test_assertrewrite.py
M testing/test_capture.py
M testing/test_pytester.py
M tox.ini
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
Commit: 0bb29d56492258a751a964e4ba729da1f7f52802
https://github.com/pytest-dev/pytest/commit/0bb29d56492258a751a964e4ba729da1f7f52802
Author: Bruno Oliveira <[email protected]>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
A .github/labels.toml
M .pre-commit-config.yaml
M .travis.yml
M CHANGELOG.rst
A CITATION
M HOWTORELEASE.rst
M README.rst
A changelog/2319.trivial.rst
A changelog/3402.trivial.rst
A changelog/3592.doc.rst
A changelog/3635.trivial.rst
A changelog/742.bugfix.rst
M doc/en/announce/release-2.9.0.rst
M doc/en/development_guide.rst
M doc/en/example/markers.rst
M doc/en/fixture.rst
M doc/en/goodpractices.rst
M doc/en/mark.rst
M doc/en/reference.rst
A scripts/release.minor.rst
A scripts/release.patch.rst
A scripts/release.py
M src/_pytest/_code/source.py
M src/_pytest/compat.py
M src/_pytest/config/__init__.py
M src/_pytest/mark/structures.py
M src/_pytest/pytester.py
M src/_pytest/python.py
R tasks/__init__.py
R tasks/generate.py
R tasks/release.minor.rst
R tasks/release.patch.rst
R tasks/requirements.txt
M testing/code/test_source.py
R testing/code/test_source_multiline_block.py
M testing/python/raises.py
M testing/test_assertrewrite.py
M testing/test_capture.py
M testing/test_pytester.py
M tox.ini
Log Message:
-----------
Merge pull request #3685 from nicoddemus/merge-master-into-features
Merge master into features
Compare:
https://github.com/pytest-dev/pytest/compare/db33f03c15ff...0bb29d564922
**NOTE:** This service 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
