Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: 2a1b1107c5395560e7335ab0ef775343b3f65566
https://github.com/pytest-dev/pytest/commit/2a1b1107c5395560e7335ab0ef775343b3f65566
Author: Brian Maissy <brian.mai...@gmail.com>
Date: 2018-01-25 (Thu, 25 Jan 2018)
Changed paths:
M _pytest/debugging.py
A changelog/1810.bugfix
Log Message:
-----------
If we fail to import doctest.UnexpectedException during postmortem, fail
quietly and continue
Commit: 547070e2d83617988ce07f2de6240f3ba3705d9c
https://github.com/pytest-dev/pytest/commit/547070e2d83617988ce07f2de6240f3ba3705d9c
Author: Alan Velasco <alanvelasc...@gmail.com>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M _pytest/mark.py
M _pytest/python.py
A changelog/3166.trivial
Log Message:
-----------
Switch `for_parameterize` to `for_parametrize`
Commit: e12a588c394d2f96e89b6e348133589d72e2bf2e
https://github.com/pytest-dev/pytest/commit/e12a588c394d2f96e89b6e348133589d72e2bf2e
Author: Alan Velasco <alanvelasc...@gmail.com>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M .gitignore
M AUTHORS
M CHANGELOG.rst
M HOWTORELEASE.rst
M _pytest/_argcomplete.py
M _pytest/assertion/__init__.py
M _pytest/cacheprovider.py
M _pytest/capture.py
M _pytest/config.py
M _pytest/debugging.py
M _pytest/fixtures.py
M _pytest/helpconfig.py
M _pytest/hookspec.py
M _pytest/junitxml.py
M _pytest/logging.py
M _pytest/main.py
M _pytest/mark.py
M _pytest/monkeypatch.py
M _pytest/nodes.py
M _pytest/pytester.py
M _pytest/python.py
M _pytest/runner.py
M _pytest/terminal.py
M _pytest/tmpdir.py
R changelog/2022.bugfix
R changelog/2423.doc
R changelog/2457.doc
R changelog/2698.doc
R changelog/3067.trivial
R changelog/3074.bugfix
R changelog/3076.doc
R changelog/3092.doc
R changelog/3129.trivial
R changelog/3131.doc
R changelog/3143.doc
M doc/en/announce/index.rst
A doc/en/announce/release-3.4.0.rst
M doc/en/builtin.rst
M doc/en/cache.rst
M doc/en/customize.rst
M doc/en/example/assertion/failure_demo.py
M doc/en/example/markers.rst
M doc/en/example/nonpython.rst
M doc/en/example/reportingdemo.rst
M doc/en/example/simple.rst
M doc/en/example/special.rst
M doc/en/fixture.rst
M doc/en/logging.rst
M doc/en/usage.rst
M doc/en/writing_plugins.rst
M pytest.py
M tasks/requirements.txt
M testing/acceptance_test.py
M testing/deprecated_test.py
M testing/logging/test_fixture.py
A testing/logging/test_formatter.py
M testing/logging/test_reporting.py
M testing/python/collect.py
M testing/python/fixture.py
M testing/python/metafunc.py
R testing/test_cache.py
A testing/test_cacheprovider.py
M testing/test_capture.py
M testing/test_config.py
M testing/test_junitxml.py
M testing/test_mark.py
M testing/test_pytester.py
M testing/test_resultlog.py
M testing/test_runner.py
M testing/test_terminal.py
M tox.ini
Log Message:
-----------
Merge branch 'master' into typo_for_parametrize
Commit: 90a8faabbaf22ca376af71cc49d3ab81c510e736
https://github.com/pytest-dev/pytest/commit/90a8faabbaf22ca376af71cc49d3ab81c510e736
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M testing/test_recwarn.py
Log Message:
-----------
Fix test for py37
In previous Python versions, the list of warnigns appears like:
... list of emitted warnings is: [UserWarning('user',)].
In Python 3.7 apparently the string representation has been improved to:
... list of emitted warnings is: [UserWarning('user')].
Fix #3011
Commit: ef7df8f167cdcf774bd3688f4df98ee10b80766d
https://github.com/pytest-dev/pytest/commit/ef7df8f167cdcf774bd3688f4df98ee10b80766d
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M changelog/3166.trivial
Log Message:
-----------
Small update to CHANGELOG
Commit: 89a55d85a9d30ef2a2394b3969fc7067f1c15b59
https://github.com/pytest-dev/pytest/commit/89a55d85a9d30ef2a2394b3969fc7067f1c15b59
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M _pytest/mark.py
M _pytest/python.py
A changelog/3166.trivial
Log Message:
-----------
Merge pull request #3166 from alanbato/typo_for_parametrize
Switch `for_parameterize` to `for_parametrize`
Commit: 653abad27bbef8cdc28dd9e3a9393fbf0e0b2606
https://github.com/pytest-dev/pytest/commit/653abad27bbef8cdc28dd9e3a9393fbf0e0b2606
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M doc/en/writing_plugins.rst
Log Message:
-----------
Mention outcome.force_result() and add link to pluggy's docs
Related to #3169
Commit: 4458e65fe757ee34eddcf79c50e060018d327803
https://github.com/pytest-dev/pytest/commit/4458e65fe757ee34eddcf79c50e060018d327803
Author: Aaron <aa...@insight-engines.com>
Date: 2018-02-01 (Thu, 01 Feb 2018)
Changed paths:
M _pytest/fixtures.py
A changelog/3161.bugfix
M testing/python/fixture.py
Log Message:
-----------
Fix ordering of tests to minimize fixture creating
Commit: 3425edd2a52ac314118a593cbe0bff746f81d9b7
https://github.com/pytest-dev/pytest/commit/3425edd2a52ac314118a593cbe0bff746f81d9b7
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-01 (Thu, 01 Feb 2018)
Changed paths:
M changelog/3161.bugfix
Log Message:
-----------
Reword changelog a bit
Commit: 8c81722a0c82de01dd17c9171e88162a2ad56806
https://github.com/pytest-dev/pytest/commit/8c81722a0c82de01dd17c9171e88162a2ad56806
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-02 (Fri, 02 Feb 2018)
Changed paths:
M testing/test_recwarn.py
Log Message:
-----------
Merge pull request #3167 from nicoddemus/fix-py37
Fix test for py37
Commit: e289c60c3a6c97cc51cce8eced65c86a3d7ae750
https://github.com/pytest-dev/pytest/commit/e289c60c3a6c97cc51cce8eced65c86a3d7ae750
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-02 (Fri, 02 Feb 2018)
Changed paths:
M .travis.yml
M setup.py
Log Message:
-----------
Support py37 officially
Python 3.7.0b1 has been released:
https://www.python.org/downloads/release/python-370b1/
Fix #3168
Commit: 74633815aa55f6e38ca2ac4072cc02fb247b43f5
https://github.com/pytest-dev/pytest/commit/74633815aa55f6e38ca2ac4072cc02fb247b43f5
Author: Brian Maissy <brian.mai...@gmail.com>
Date: 2018-02-03 (Sat, 03 Feb 2018)
Changed paths:
A changelog/985.bugfix
M testing/test_pdb.py
Log Message:
-----------
skip failing pdb/doctest test on mac
Commit: e64feaba7ab05e06b65dc6b9a722a4f39c01cd58
https://github.com/pytest-dev/pytest/commit/e64feaba7ab05e06b65dc6b9a722a4f39c01cd58
Author: Brian Maissy <brian.mai...@gmail.com>
Date: 2018-02-03 (Sat, 03 Feb 2018)
Changed paths:
M testing/test_pdb.py
Log Message:
-----------
xfail is better than skip
Commit: 867344d0d72cfe79bb5ff316b065621f12627f40
https://github.com/pytest-dev/pytest/commit/867344d0d72cfe79bb5ff316b065621f12627f40
Author: Brian Maissy <brian.mai...@gmail.com>
Date: 2018-02-04 (Sun, 04 Feb 2018)
Changed paths:
M _pytest/debugging.py
M changelog/1810.bugfix
Log Message:
-----------
move import to top
Commit: ea8997a108eb78a795f461ff1f41e0771e58c2d7
https://github.com/pytest-dev/pytest/commit/ea8997a108eb78a795f461ff1f41e0771e58c2d7
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-03 (Sat, 03 Feb 2018)
Changed paths:
M changelog/1810.bugfix
Log Message:
-----------
Update wording in CHANGELOG
Commit: 9202ba91cf1fb5fe180166781b35edafb2cb1ce4
https://github.com/pytest-dev/pytest/commit/9202ba91cf1fb5fe180166781b35edafb2cb1ce4
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-03 (Sat, 03 Feb 2018)
Changed paths:
A changelog/985.bugfix
M testing/test_pdb.py
Log Message:
-----------
Merge pull request #3187 from
brianmaissy/bugfix/skip_failing_pdb_doctest_test_on_mac
skip failing pdb/doctest test on mac
Commit: 7c80c81433a379ccba3dcebb00906d68d1aabea3
https://github.com/pytest-dev/pytest/commit/7c80c81433a379ccba3dcebb00906d68d1aabea3
Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M _pytest/debugging.py
A changelog/1810.bugfix
Log Message:
-----------
Merge pull request #3152 from
brianmaissy/silently_fail_to_import_during_postmortem
If we fail to import doctest.UnexpectedException during postmortem, fail quietly
Commit: 570edb466b90795845b71795e87b4b6186cd85c6
https://github.com/pytest-dev/pytest/commit/570edb466b90795845b71795e87b4b6186cd85c6
Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M .travis.yml
M setup.py
Log Message:
-----------
Merge pull request #3185 from nicoddemus/remove-ignore-py37
Support py37 officially
Commit: 0d15a4686352ee2e6b8a2842fe47e1cd6d86e4f7
https://github.com/pytest-dev/pytest/commit/0d15a4686352ee2e6b8a2842fe47e1cd6d86e4f7
Author: Pedro Algarvio <pe...@algarvio.me>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M _pytest/logging.py
A changelog/3184.bugfix
M testing/logging/test_reporting.py
Log Message:
-----------
Don't traceback on unkown sections.
Commit: 42c1f8525738be6f2b26f2f6ceb057f76446e3c1
https://github.com/pytest-dev/pytest/commit/42c1f8525738be6f2b26f2f6ceb057f76446e3c1
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M changelog/3184.bugfix
Log Message:
-----------
Update CHANGELOG
Commit: 71527072801b6d83db168996529be1e76ce96bc4
https://github.com/pytest-dev/pytest/commit/71527072801b6d83db168996529be1e76ce96bc4
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
R changelog/985.bugfix
A changelog/985.trivial
Log Message:
-----------
Update changelog entry to "trivial" as it is a temporary workaround
I think this is a more appropriate category given that the underlying problem
still exists
Commit: 40d0ade2d9d0ab6d8d8b3df759945511042f86b5
https://github.com/pytest-dev/pytest/commit/40d0ade2d9d0ab6d8d8b3df759945511042f86b5
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M .github/PULL_REQUEST_TEMPLATE.md
R changelog/1810.bugfix
A changelog/1810.bugfix.rst
R changelog/3166.trivial
A changelog/3166.trivial.rst
R changelog/985.trivial
A changelog/985.trivial.rst
A changelog/README.rst
Log Message:
-----------
Add changelog/README.rst and streamline our PR template text
This streamlines the PR template text and adds a more in-depth explanation
about how the changelog entries work because this topic is a common source of
confusion:
- How to name the files.
- Which formatting to use (people in general assume it is Markdown).
- Recommend adding `.rst` extension to changelog files to help with the
above (`towncrier` doesn't care).
This was heavily inspired by the excellent python-trio/trio docs.
Commit: f72182977d93b6432019a0112914dcdc9b498678
https://github.com/pytest-dev/pytest/commit/f72182977d93b6432019a0112914dcdc9b498678
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M _pytest/fixtures.py
A changelog/3161.bugfix
M testing/python/fixture.py
Log Message:
-----------
Merge pull request #3183 from cheezman34/master
Fix ordering of tests to minimize fixture creating
Commit: 16c52f05f14db66f710aaceec760e774e8d78652
https://github.com/pytest-dev/pytest/commit/16c52f05f14db66f710aaceec760e774e8d78652
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M doc/en/writing_plugins.rst
Log Message:
-----------
Merge pull request #3177 from nicoddemus/mention-force-result
Mention outcome.force_result() and add link to pluggy's docs
Commit: eea169e5151da473909fa8bcc467ac7d2380accd
https://github.com/pytest-dev/pytest/commit/eea169e5151da473909fa8bcc467ac7d2380accd
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M .github/PULL_REQUEST_TEMPLATE.md
M changelog/README.rst
Log Message:
-----------
Code review suggestions
Commit: 3685c1bc019cb119378ebfb31993a1748548e731
https://github.com/pytest-dev/pytest/commit/3685c1bc019cb119378ebfb31993a1748548e731
Author: Florian Bruhin <m...@the-compiler.org>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M .github/PULL_REQUEST_TEMPLATE.md
R changelog/1810.bugfix
A changelog/1810.bugfix.rst
R changelog/3166.trivial
A changelog/3166.trivial.rst
R changelog/985.trivial
A changelog/985.trivial.rst
A changelog/README.rst
Log Message:
-----------
Merge pull request #3192 from nicoddemus/pr-template
Add changelog/README.rst and streamline our PR template text
Commit: c04e248de54741b39f93d4ad07bd81e6bc6a2b3e
https://github.com/pytest-dev/pytest/commit/c04e248de54741b39f93d4ad07bd81e6bc6a2b3e
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-09 (Fri, 09 Feb 2018)
Changed paths:
R changelog/3161.bugfix
A changelog/3161.bugfix.rst
Log Message:
-----------
Rename 3161.bugfix to 3161.bugfix.rst
Commit: e5b527d0e3d72cf8e2cac4a4f7fb7b9a2d2f6e06
https://github.com/pytest-dev/pytest/commit/e5b527d0e3d72cf8e2cac4a4f7fb7b9a2d2f6e06
Author: Andy Freeland <a...@andyfreeland.net>
Date: 2018-02-09 (Fri, 09 Feb 2018)
Changed paths:
M _pytest/python_api.py
A changelog/3202.trivial.rst
Log Message:
-----------
Add Sphinx parameter docs for `match` and `message` args to `pytest.raises()`
Commit: ffee213c85a39a7aa60ae84cb6badfb583fecba1
https://github.com/pytest-dev/pytest/commit/ffee213c85a39a7aa60ae84cb6badfb583fecba1
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-09 (Fri, 09 Feb 2018)
Changed paths:
A changelog/3202.doc.rst
R changelog/3202.trivial.rst
Log Message:
-----------
Update and rename 3202.trivial.rst to 3202.doc.rst
Commit: e7bcc854d975e981c090e37e747d91fc7999500e
https://github.com/pytest-dev/pytest/commit/e7bcc854d975e981c090e37e747d91fc7999500e
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-10 (Sat, 10 Feb 2018)
Changed paths:
M _pytest/python_api.py
A changelog/3202.doc.rst
Log Message:
-----------
Merge pull request #3202 from rouge8/pytest-raises-sphinx-parameters
Add Sphinx parameter docs for `match` and `message` args to `pytest.raises()`
Commit: b6166dccb4d2b48173aa7e7739be52db9d2d56a0
https://github.com/pytest-dev/pytest/commit/b6166dccb4d2b48173aa7e7739be52db9d2d56a0
Author: Marcin Bachry <hegel...@gmail.com>
Date: 2018-02-12 (Mon, 12 Feb 2018)
Changed paths:
M _pytest/compat.py
A changelog/3206.bugfix.rst
M testing/python/integration.py
Log Message:
-----------
Fix mock patchings detection when both mock and unittest.mock are present
Commit: 7656fc8320b5920d860e9028f322475a021e7666
https://github.com/pytest-dev/pytest/commit/7656fc8320b5920d860e9028f322475a021e7666
Author: Brian Maissy <brian.mai...@gmail.com>
Date: 2018-02-12 (Mon, 12 Feb 2018)
Changed paths:
M AUTHORS
M _pytest/debugging.py
A changelog/3052.bugfix
M testing/test_pdb.py
Log Message:
-----------
Added printing of captured stdout and stderr before entering pdb
Commit: 371eb8c6af8d3ae4260865b86d2914c206b9e571
https://github.com/pytest-dev/pytest/commit/371eb8c6af8d3ae4260865b86d2914c206b9e571
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-15 (Thu, 15 Feb 2018)
Changed paths:
M _pytest/compat.py
A changelog/3206.bugfix.rst
M testing/python/integration.py
Log Message:
-----------
Merge pull request #3206 from mbachry/fix-unittest-mock
Fix mock patchings detection when both mock and unittest.mock are present
Commit: 6bc45d158d1bd27db618a2bb18e9f9a99aeb8044
https://github.com/pytest-dev/pytest/commit/6bc45d158d1bd27db618a2bb18e9f9a99aeb8044
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-15 (Thu, 15 Feb 2018)
Changed paths:
M AUTHORS
M _pytest/debugging.py
A changelog/3052.bugfix
M testing/test_pdb.py
Log Message:
-----------
Merge pull request #3186 from
brianmaissy/bugfix/print_captured_stdout_before_entering_pdb
Added printing of captured stdout before entering pdb
Commit: 00d3001138b324293a394f2fd678f6193ae41935
https://github.com/pytest-dev/pytest/commit/00d3001138b324293a394f2fd678f6193ae41935
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-17 (Sat, 17 Feb 2018)
Changed paths:
M _pytest/logging.py
A changelog/3184.bugfix
M testing/logging/test_reporting.py
Log Message:
-----------
Merge pull request #3188 from s0undt3ch/issues/3184
Don't traceback on unkown sections.
Commit: dfbaa20240bd1178496db117450aaaba7c0a913a
https://github.com/pytest-dev/pytest/commit/dfbaa20240bd1178496db117450aaaba7c0a913a
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-17 (Sat, 17 Feb 2018)
Changed paths:
M testing/logging/test_reporting.py
Log Message:
-----------
Bring test_live_logs_unknown_sections directly due to merge conflicts
Commit: 69d608aec39c45de898f434b03d49bc112f0499f
https://github.com/pytest-dev/pytest/commit/69d608aec39c45de898f434b03d49bc112f0499f
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-17 (Sat, 17 Feb 2018)
Changed paths:
M .github/PULL_REQUEST_TEMPLATE.md
M .travis.yml
M AUTHORS
M _pytest/compat.py
M _pytest/debugging.py
M _pytest/fixtures.py
M _pytest/logging.py
M _pytest/mark.py
M _pytest/python.py
M _pytest/python_api.py
A changelog/1810.bugfix.rst
A changelog/3052.bugfix
A changelog/3161.bugfix.rst
A changelog/3166.trivial.rst
A changelog/3184.bugfix
A changelog/3202.doc.rst
A changelog/3206.bugfix.rst
A changelog/985.trivial.rst
A changelog/README.rst
M doc/en/writing_plugins.rst
M setup.py
M testing/python/fixture.py
M testing/python/integration.py
M testing/test_pdb.py
M testing/test_recwarn.py
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into merge-upstream
Commit: f263932883904345299d8ec25a908ff320ff9b5b
https://github.com/pytest-dev/pytest/commit/f263932883904345299d8ec25a908ff320ff9b5b
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-02-17 (Sat, 17 Feb 2018)
Changed paths:
M .github/PULL_REQUEST_TEMPLATE.md
M .travis.yml
M AUTHORS
M _pytest/compat.py
M _pytest/debugging.py
M _pytest/fixtures.py
M _pytest/logging.py
M _pytest/mark.py
M _pytest/python.py
M _pytest/python_api.py
A changelog/1810.bugfix.rst
A changelog/3052.bugfix
A changelog/3161.bugfix.rst
A changelog/3166.trivial.rst
A changelog/3184.bugfix
A changelog/3202.doc.rst
A changelog/3206.bugfix.rst
A changelog/985.trivial.rst
A changelog/README.rst
M doc/en/writing_plugins.rst
M setup.py
M testing/logging/test_reporting.py
M testing/python/fixture.py
M testing/python/integration.py
M testing/test_pdb.py
M testing/test_recwarn.py
Log Message:
-----------
Merge pull request #3232 from nicoddemus/merge-upstream
Merge master into features
Compare:
https://github.com/pytest-dev/pytest/compare/fa8354e87207...f26393288390_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
