Branch: refs/tags/3.3.0
Home: https://github.com/pytest-dev/pytest
Commit: f50ace7c0ae9f7156a25b6a93017257b35715398
https://github.com/pytest-dev/pytest/commit/f50ace7c0ae9f7156a25b6a93017257b35715398
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-23 (Thu, 23 Nov 2017)
Changed paths:
M CHANGELOG.rst
M _pytest/assertion/rewrite.py
M _pytest/mark.py
R changelog/2836.bug
A changelog/2939.bugfix
A changelog/2942.bugfix
M doc/en/announce/index.rst
A doc/en/announce/release-3.2.5.rst
M doc/en/backwards-compatibility.rst
M testing/test_assertion.py
M testing/test_mark.py
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into release-3.3.0
Commit: e97c774f8edd6f92deafaf65571a9149ecebce94
https://github.com/pytest-dev/pytest/commit/e97c774f8edd6f92deafaf65571a9149ecebce94
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-23 (Thu, 23 Nov 2017)
Changed paths:
M tasks/__init__.py
Log Message:
-----------
Remove vendoring import from tasks/__init__
Commit: aa9a02ec4452f87b40c10a2c9235e4b552b68564
https://github.com/pytest-dev/pytest/commit/aa9a02ec4452f87b40c10a2c9235e4b552b68564
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-23 (Thu, 23 Nov 2017)
Changed paths:
M CHANGELOG.rst
R changelog/1993.bugfix
R changelog/2124.bugfix
R changelog/2124.feature
R changelog/2236.removal
R changelog/2267.feature
R changelog/2491.bugfix
R changelog/2549.feature
R changelog/2641.trivial
R changelog/2642.trivial
R changelog/2657.feature
R changelog/2672.removal
R changelog/2675.removal
R changelog/2708.feature
R changelog/2709.bugfix
R changelog/2719.trivial
R changelog/2734.trivial
R changelog/2738.bugfix
R changelog/2751.bugfix
R changelog/2767.removal
R changelog/2767.trivial
R changelog/2794.feature
R changelog/2803.removal
R changelog/2808.feature
R changelog/2809.bugfix
R changelog/2812.removal
R changelog/2824.feature
R changelog/2845.bugfix
R changelog/2876.trivial
R changelog/2877.trivial
R changelog/2879.feature
R changelog/2910.trivial
R changelog/2922.trivial
R changelog/2923.feature
R changelog/2934.feature
R changelog/2939.bugfix
R changelog/2942.bugfix
R changelog/502.feature
M doc/en/announce/index.rst
A doc/en/announce/release-3.3.0.rst
M doc/en/example/parametrize.rst
Log Message:
-----------
Preparing release version 3.3.0
Commit: 0ddd3e2839ec32690e379b9e2ee6962b027ab52c
https://github.com/pytest-dev/pytest/commit/0ddd3e2839ec32690e379b9e2ee6962b027ab52c
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-23 (Thu, 23 Nov 2017)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Fix linting in CHANGELOG
Commit: 05cfdcc8cba7232724bc70d30337e87092de2818
https://github.com/pytest-dev/pytest/commit/05cfdcc8cba7232724bc70d30337e87092de2818
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-23 (Thu, 23 Nov 2017)
Changed paths:
M CHANGELOG.rst
M _pytest/config.py
M _pytest/debugging.py
M _pytest/helpconfig.py
M _pytest/pastebin.py
M _pytest/skipping.py
M _pytest/terminal.py
M testing/test_mark.py
M testing/test_terminal.py
Log Message:
-----------
Revert making TerminalWriter public in TerminalReporter plugin
We eventually want to replace py.io.TerminalWriter (exposed as
"_tw" in TerminalReporter) by something else, so deprecating access
to "_tw" and making it public as "writer" is contrary to that.
Commit: 95de11a44e9dc1c59263455120814f25072cea2e
https://github.com/pytest-dev/pytest/commit/95de11a44e9dc1c59263455120814f25072cea2e
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-23 (Thu, 23 Nov 2017)
Changed paths:
M _pytest/config.py
M testing/deprecated_test.py
Log Message:
-----------
Block pytest-catchlog and issue a warning
Trying to install pytest-3.3 and pytest-catchlog will result in an
option conflicts because both declare the same options.
Commit: 0de1a65644ba5c4d3a1ac7d522bc0ae5666f0a49
https://github.com/pytest-dev/pytest/commit/0de1a65644ba5c4d3a1ac7d522bc0ae5666f0a49
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-24 (Fri, 24 Nov 2017)
Changed paths:
M setup.py
Log Message:
-----------
Update pluggy pin to pluggy>=0.5,<0.7 after pluggy-0.6 release
Commit: 6eeacaba3e77c69efde876939376f4d47c8f7514
https://github.com/pytest-dev/pytest/commit/6eeacaba3e77c69efde876939376f4d47c8f7514
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-26 (Sun, 26 Nov 2017)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Fix typos in CHANGELOG
Commit: 6cdd85122705393cfcfe08570bae581bf9f2d157
https://github.com/pytest-dev/pytest/commit/6cdd85122705393cfcfe08570bae581bf9f2d157
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M CHANGELOG.rst
M doc/en/backwards-compatibility.rst
Log Message:
-----------
CHANGELOG and docs changes requested during review
Compare:
https://github.com/pytest-dev/pytest/compare/f50ace7c0ae9^...6cdd85122705_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
