From nicoddemus at gmail.com Thu Jan 4 17:42:33 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Thu, 04 Jan 2018 14:42:33 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] bd2d0d: Preparing release version 3.3.2 Message-ID: <5a4eadd91ab79_4b762ab518689c083303f@hookshot-fe-6e9b612.cp1-iad.github.net.mail> Branch: refs/tags/3.3.2 Home: https://github.com/pytest-dev/pytest Commit: bd2d0d2c3c9bf92711e5a858e93e46d390dd4229 https://github.com/pytest-dev/pytest/commit/bd2d0d2c3c9bf92711e5a858e93e46d390dd4229 Author: Bruno Oliveira Date: 2017-12-25 (Mon, 25 Dec 2017) Changed paths: M CHANGELOG.rst R changelog/2784.bugfix R changelog/2981.bugfix R changelog/2985.bugfix R changelog/2995.bugfix R changelog/3001.doc R changelog/3015.trivial R changelog/3018.trivial R changelog/3021.trivial M doc/en/announce/index.rst A doc/en/announce/release-3.3.2.rst M doc/en/example/simple.rst Log Message: ----------- Preparing release version 3.3.2 From nicoddemus at gmail.com Thu Jan 4 17:42:53 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Thu, 04 Jan 2018 14:42:53 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] bd2d0d: Preparing release version 3.3.2 Message-ID: <5a4eaded8c95_3dfd2b17f7bebc04633f6@hookshot-fe-b0febf1.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: bd2d0d2c3c9bf92711e5a858e93e46d390dd4229 https://github.com/pytest-dev/pytest/commit/bd2d0d2c3c9bf92711e5a858e93e46d390dd4229 Author: Bruno Oliveira Date: 2017-12-25 (Mon, 25 Dec 2017) Changed paths: M CHANGELOG.rst R changelog/2784.bugfix R changelog/2981.bugfix R changelog/2985.bugfix R changelog/2995.bugfix R changelog/3001.doc R changelog/3015.trivial R changelog/3018.trivial R changelog/3021.trivial M doc/en/announce/index.rst A doc/en/announce/release-3.3.2.rst M doc/en/example/simple.rst Log Message: ----------- Preparing release version 3.3.2 Commit: e8c0ca4f08bd365babf528fe2d404eadf2374c1e https://github.com/pytest-dev/pytest/commit/e8c0ca4f08bd365babf528fe2d404eadf2374c1e Author: Bruno Oliveira Date: 2018-01-04 (Thu, 04 Jan 2018) Changed paths: M CHANGELOG.rst R changelog/2784.bugfix R changelog/2981.bugfix R changelog/2985.bugfix R changelog/2995.bugfix R changelog/3001.doc R changelog/3015.trivial R changelog/3018.trivial R changelog/3021.trivial M doc/en/announce/index.rst A doc/en/announce/release-3.3.2.rst M doc/en/example/simple.rst Log Message: ----------- Merge pull request #3064 from nicoddemus/release-3.3.2 Preparing release version 3.3.2 Compare: https://github.com/pytest-dev/pytest/compare/08997279f40f...e8c0ca4f08bd From nicoddemus at gmail.com Fri Jan 5 06:49:57 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Fri, 05 Jan 2018 03:49:57 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 554cb8: Reword strange sentence on doctest flags Message-ID: <5a4f666543610_770a2ae0aada9c142585c@hookshot-fe-d252ca1.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 554cb8d09c4bef44b90215ebd6b5ba223200f373 https://github.com/pytest-dev/pytest/commit/554cb8d09c4bef44b90215ebd6b5ba223200f373 Author: Pierre-Alexandre Fonta Date: 2018-01-04 (Thu, 04 Jan 2018) Changed paths: M doc/en/doctest.rst Log Message: ----------- Reword strange sentence on doctest flags Commit: ac6f257efc022f95cbb02e2a9bc667b29410e529 https://github.com/pytest-dev/pytest/commit/ac6f257efc022f95cbb02e2a9bc667b29410e529 Author: Pierre-Alexandre Fonta Date: 2018-01-04 (Thu, 04 Jan 2018) Changed paths: A changelog/3076.doc Log Message: ----------- Create news fragment for the pull request Commit: fac07c1b3fad6f27fc1ff04a72f2fa9f2e488924 https://github.com/pytest-dev/pytest/commit/fac07c1b3fad6f27fc1ff04a72f2fa9f2e488924 Author: Bruno Oliveira Date: 2018-01-05 (Fri, 05 Jan 2018) Changed paths: A changelog/3076.doc M doc/en/doctest.rst Log Message: ----------- Merge pull request #3076 from pafonta/patch-1 [doc] Reword strange sentence on doctest flags Compare: https://github.com/pytest-dev/pytest/compare/e8c0ca4f08bd...fac07c1b3fad From nicoddemus at gmail.com Fri Jan 5 17:35:53 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Fri, 05 Jan 2018 14:35:53 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 52a7cc: Add pytest_runtestloop to the docs Message-ID: <5a4ffdc9b8858_5d0c2b15ce24fc0c10972d@hookshot-fe-88eb02d.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 52a7ccef57c480ce7c1219a714ffa0a08fb9c5b3 https://github.com/pytest-dev/pytest/commit/52a7ccef57c480ce7c1219a714ffa0a08fb9c5b3 Author: Bruno Oliveira Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: M doc/en/writing_plugins.rst Log Message: ----------- Add pytest_runtestloop to the docs Commit: 06a182386ba1fc9bf6ea2f4829c85e6dc882c606 https://github.com/pytest-dev/pytest/commit/06a182386ba1fc9bf6ea2f4829c85e6dc882c606 Author: Bruno Oliveira Date: 2018-01-05 (Fri, 05 Jan 2018) Changed paths: M doc/en/writing_plugins.rst Log Message: ----------- Merge pull request #3073 from nicoddemus/pytest_runtestloop-docs Add pytest_runtestloop to the docs Compare: https://github.com/pytest-dev/pytest/compare/fac07c1b3fad...06a182386ba1 From nicoddemus at gmail.com Sat Jan 6 10:56:08 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Sat, 06 Jan 2018 07:56:08 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] f24c47: Assume not skipped by mark if attribute missing Message-ID: <5a50f198ddee9_ef52ab2fbb4fc0c924bc@hookshot-fe-7191cb1.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: f24c470403aa0e34371850cb51a516a55dca7599 https://github.com/pytest-dev/pytest/commit/f24c470403aa0e34371850cb51a516a55dca7599 Author: Ian Lesperance Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: M _pytest/skipping.py Log Message: ----------- Assume not skipped by mark if attribute missing Fixes #3074. Commit: 0a6e086f9def9830e66413fe65bf93de37af7b13 https://github.com/pytest-dev/pytest/commit/0a6e086f9def9830e66413fe65bf93de37af7b13 Author: Ian Lesperance Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: A changelog/3074.bugfix Log Message: ----------- Add changelog entry Commit: 25b504b4f02c75a96acfcccddde458ed78aac22d https://github.com/pytest-dev/pytest/commit/25b504b4f02c75a96acfcccddde458ed78aac22d Author: Ian Lesperance Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: M AUTHORS Log Message: ----------- Add self to authors list Commit: bc66f7e43f11632a746618124e5d7688404ab6c5 https://github.com/pytest-dev/pytest/commit/bc66f7e43f11632a746618124e5d7688404ab6c5 Author: Bruno Oliveira Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M AUTHORS M _pytest/skipping.py A changelog/3074.bugfix Log Message: ----------- Merge pull request #3075 from elliterate/bugs/fix-skipping-plugin-reporting Assume not skipped by mark if attribute missing Compare: https://github.com/pytest-dev/pytest/compare/06a182386ba1...bc66f7e43f11 From nicoddemus at gmail.com Sat Jan 6 12:53:11 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Sat, 06 Jan 2018 09:53:11 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] b93aa5: Prefer https://*.readthedocs.io over http://*.rtfd... Message-ID: <5a510d07846e1_2f442aeb74c9fc0458155@hookshot-fe-6b2eebc.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: b93aa5e35f8ea95d6ab74c1953dead2ea3a14688 https://github.com/pytest-dev/pytest/commit/b93aa5e35f8ea95d6ab74c1953dead2ea3a14688 Author: Jon Dufresne Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: A changelog/3092.doc M doc/en/projects.rst M doc/en/tmpdir.rst Log Message: ----------- Prefer https://*.readthedocs.io over http://*.rtfd.org - Requests URL using https instead of http - Avoids unnecessary redirect of *.rtfd.org -> *.readthedocs.io *.rtfd.org exists as a means for pasting short URLs, which doesn't much apply for links in documentation. Commit: f3c666db3c6ff5d16544ded10496513c1153e8e4 https://github.com/pytest-dev/pytest/commit/f3c666db3c6ff5d16544ded10496513c1153e8e4 Author: Bruno Oliveira Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M changelog/3092.doc Log Message: ----------- Small formatting update in CHANGELOG Commit: 29ff9301d841b6cfecb976225dffc6ddc77d199b https://github.com/pytest-dev/pytest/commit/29ff9301d841b6cfecb976225dffc6ddc77d199b Author: Bruno Oliveira Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: A changelog/3092.doc M doc/en/projects.rst M doc/en/tmpdir.rst Log Message: ----------- Merge pull request #3092 from jdufresne/readthedocs Prefer https://*.readthedocs.io over http://*.rtfd.org Compare: https://github.com/pytest-dev/pytest/compare/bc66f7e43f11...29ff9301d841 From nicoddemus at gmail.com Sat Jan 6 22:18:19 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Sat, 06 Jan 2018 19:18:19 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] d7e1f0: Fix issue 2985 blurb in changelog Message-ID: <5a51917be3639_4ff52ae4f399bc102679@hookshot-fe-d2afb11.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: d7e1f037d971c5eab735268a7e86d3aaa7250de6 https://github.com/pytest-dev/pytest/commit/d7e1f037d971c5eab735268a7e86d3aaa7250de6 Author: Henk-Jaap Wagenaar Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M CHANGELOG.rst Log Message: ----------- Fix issue 2985 blurb in changelog Commit: 794fb193ba9b4c6d4576bcdf4bdfdc21fc22feaf https://github.com/pytest-dev/pytest/commit/794fb193ba9b4c6d4576bcdf4bdfdc21fc22feaf Author: Bruno Oliveira Date: 2018-01-07 (Sun, 07 Jan 2018) Changed paths: M CHANGELOG.rst Log Message: ----------- Merge pull request #3093 from cryvate/fix-issue-2985-blurb Fix issue 2985 blurb in changelog Compare: https://github.com/pytest-dev/pytest/compare/29ff9301d841...794fb193ba9b From nicoddemus at gmail.com Tue Jan 9 15:40:34 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 09 Jan 2018 12:40:34 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 3dd24f: Ignore ImportWarnings regarding package resolution Message-ID: <5a5528c265da8_669c2aeb538a5c001008d3@hookshot-fe-2cc8887.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 3dd24f8d218408f421aa9c88b7343bbb54e423f8 https://github.com/pytest-dev/pytest/commit/3dd24f8d218408f421aa9c88b7343bbb54e423f8 Author: Bruno Oliveira Date: 2018-01-08 (Mon, 08 Jan 2018) Changed paths: M tox.ini Log Message: ----------- Ignore ImportWarnings regarding package resolution The problem is described/discussed in #3061 Ideally this should be a temporary solution until we find a proper one which gets rid of the warning Commit: b6b36bc167b1d05b9b8353e38e2cedd124d1f4e1 https://github.com/pytest-dev/pytest/commit/b6b36bc167b1d05b9b8353e38e2cedd124d1f4e1 Author: Bruno Oliveira Date: 2018-01-08 (Mon, 08 Jan 2018) Changed paths: M _pytest/python.py Log Message: ----------- Handle pluggy package or module for traceback filtering Since 0.6.1 pluggy has been turned into a package Commit: 962aede2904592b206ae8e4e3fe0c749fd178a45 https://github.com/pytest-dev/pytest/commit/962aede2904592b206ae8e4e3fe0c749fd178a45 Author: Bruno Oliveira Date: 2018-01-09 (Tue, 09 Jan 2018) Changed paths: M _pytest/python.py M tox.ini Log Message: ----------- Merge pull request #3096 from nicoddemus/import-warnings Ignore ImportWarnings regarding package resolution Compare: https://github.com/pytest-dev/pytest/compare/a8d3d329ec4e...962aede29045 From nicoddemus at gmail.com Tue Jan 9 16:36:11 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 09 Jan 2018 13:36:11 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 4c62cd: Add section about how you become a committer Message-ID: <5a5535cba9732_52e72ac033dd5c0c8558b@hookshot-fe-cace476.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: 4c62cd451a44959f3f2ce3b55f94e4dff9ab0f94 https://github.com/pytest-dev/pytest/commit/4c62cd451a44959f3f2ce3b55f94e4dff9ab0f94 Author: Floris Bruynooghe Date: 2016-11-17 (Thu, 17 Nov 2016) Changed paths: M CONTRIBUTING.rst Log Message: ----------- Add section about how you become a committer Commit: 1f0d06641a3f0dbea673f1b2468c6a40da5861e1 https://github.com/pytest-dev/pytest/commit/1f0d06641a3f0dbea673f1b2468c6a40da5861e1 Author: Floris Bruynooghe Date: 2017-02-19 (Sun, 19 Feb 2017) Changed paths: M CONTRIBUTING.rst Log Message: ----------- Update text to only give access when wanted Also clarify merging perms given the PR approval now available. Commit: 586ecea6f219d70d4075434b84a3784ec7cc948d https://github.com/pytest-dev/pytest/commit/586ecea6f219d70d4075434b84a3784ec7cc948d Author: Bruno Oliveira Date: 2017-12-14 (Thu, 14 Dec 2017) Changed paths: M testing/acceptance_test.py Log Message: ----------- Check if symlink does not privileges on Windows for test_cmdline_python_package_symlink os.symlink might fail on Windows because users require a special policy to create symlinks (argh). This is not a problem on AppVeyor because it is logged in as an admin, but would be surprising for Windows users running pytest's test suite on their computer. Commit: c90e76c371c20ef27655334274add16fe3d34baf https://github.com/pytest-dev/pytest/commit/c90e76c371c20ef27655334274add16fe3d34baf Author: Austin Date: 2017-12-16 (Sat, 16 Dec 2017) Changed paths: M doc/en/parametrize.rst Log Message: ----------- Clarifiyng documentation for parameterize - Added snippet dealing with parameterize run order of tests Commit: 924b5e2e3dc681515de2fbbd50c68cec6ccfd538 https://github.com/pytest-dev/pytest/commit/924b5e2e3dc681515de2fbbd50c68cec6ccfd538 Author: Bruno Oliveira Date: 2017-12-16 (Sat, 16 Dec 2017) Changed paths: M testing/acceptance_test.py Log Message: ----------- Merge pull request #3031 from nicoddemus/symlink-privileges Check if symlink does have privileges on Windows for test_cmdline_python_package_symlink Commit: d7a76a4d07c9dc778c3d1ab6bbb783f8b95da719 https://github.com/pytest-dev/pytest/commit/d7a76a4d07c9dc778c3d1ab6bbb783f8b95da719 Author: Austin Date: 2017-12-16 (Sat, 16 Dec 2017) Changed paths: M doc/en/parametrize.rst Log Message: ----------- Updated for more clarity - Changed original wording for parameterize. Should help be a little more clear Commit: 73eccb4c3676ca70bff9e69394dfd425d286ff65 https://github.com/pytest-dev/pytest/commit/73eccb4c3676ca70bff9e69394dfd425d286ff65 Author: Austin Date: 2017-12-16 (Sat, 16 Dec 2017) Changed paths: A changelog/3001.doc Log Message: ----------- Adding news fragment Commit: 70461d1eada70c24a4a511bf09ae670d22e899c8 https://github.com/pytest-dev/pytest/commit/70461d1eada70c24a4a511bf09ae670d22e899c8 Author: Austin Date: 2017-12-16 (Sat, 16 Dec 2017) Changed paths: M doc/en/parametrize.rst Log Message: ----------- Update parametrize.rst Commit: 28a93b9eebf49b42c68d067106408766d54624cf https://github.com/pytest-dev/pytest/commit/28a93b9eebf49b42c68d067106408766d54624cf Author: Thomas Hisch Date: 2017-12-17 (Sun, 17 Dec 2017) Changed paths: M _pytest/logging.py Log Message: ----------- WIP #3013 Commit: d6f75d28364b4434217b45b261573f07569f5cd8 https://github.com/pytest-dev/pytest/commit/d6f75d28364b4434217b45b261573f07569f5cd8 Author: Thomas Hisch Date: 2017-12-17 (Sun, 17 Dec 2017) Changed paths: M _pytest/logging.py Log Message: ----------- WIP Commit: 76489d30f7452bd9e6053eff624920cd2826e607 https://github.com/pytest-dev/pytest/commit/76489d30f7452bd9e6053eff624920cd2826e607 Author: Thomas Hisch Date: 2017-12-17 (Sun, 17 Dec 2017) Changed paths: M _pytest/logging.py Log Message: ----------- Revert "WIP" This reverts commit d6f75d28364b4434217b45b261573f07569f5cd8. Commit: dfc5399cd7cae90fd355011fbd025fd200e6337d https://github.com/pytest-dev/pytest/commit/dfc5399cd7cae90fd355011fbd025fd200e6337d Author: Thomas Hisch Date: 2017-12-17 (Sun, 17 Dec 2017) Changed paths: M _pytest/logging.py Log Message: ----------- Revert "WIP #3013" This reverts commit 28a93b9eebf49b42c68d067106408766d54624cf. Commit: 30729b7c3c4c00e80e9dd3837d17258517567da9 https://github.com/pytest-dev/pytest/commit/30729b7c3c4c00e80e9dd3837d17258517567da9 Author: Florian Bruhin Date: 2017-12-17 (Sun, 17 Dec 2017) Changed paths: M _pytest/logging.py Log Message: ----------- Merge pull request #3045 from thisch/revert_accidental_push Revert accidental push Commit: 2f8427bb4eb2ac4d4e4dfe0df2b9fc7aee1b68d7 https://github.com/pytest-dev/pytest/commit/2f8427bb4eb2ac4d4e4dfe0df2b9fc7aee1b68d7 Author: Ronny Pfannschmidt Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: A changelog/3001.doc M doc/en/parametrize.rst Log Message: ----------- Merge pull request #3043 from awbdallas/parameterize_documentation_fix Parameterize documentation fix Commit: ed293ec3e9a83f443f70e1e6788b4b341e301cb7 https://github.com/pytest-dev/pytest/commit/ed293ec3e9a83f443f70e1e6788b4b341e301cb7 Author: Ronny Pfannschmidt Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M _pytest/pytester.py A changelog/2784.bugfix Log Message: ----------- pytester: no ignore files used to obtain current user metadata in the fd leak detector Commit: d370e7788d646c93f30605e36dad02a402aae410 https://github.com/pytest-dev/pytest/commit/d370e7788d646c93f30605e36dad02a402aae410 Author: Ronny Pfannschmidt Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M CONTRIBUTING.rst Log Message: ----------- Merge pull request #2068 from flub/commitaccess [proposal] Add section about how you become a committer Commit: 672c901c704384b28e0079209684ba71e8867bf3 https://github.com/pytest-dev/pytest/commit/672c901c704384b28e0079209684ba71e8867bf3 Author: Ronny Pfannschmidt Date: 2017-12-19 (Tue, 19 Dec 2017) Changed paths: M _pytest/pytester.py A changelog/2784.bugfix Log Message: ----------- Merge pull request #2784 from RonnyPfannschmidt/fix-fdleaks pytester: ignore files used to obtain current user metadata Commit: 205e29d843427e0ad211d48e56ac357aaaf1cdd5 https://github.com/pytest-dev/pytest/commit/205e29d843427e0ad211d48e56ac357aaaf1cdd5 Author: Anthony Sottile Date: 2017-12-22 (Fri, 22 Dec 2017) Changed paths: M testing/code/test_excinfo.py M testing/test_runner.py M testing/test_skipping.py Log Message: ----------- Remove unnecessary `# noqa` comments. Commit automated with https://github.com/asottile/yesqa Commit: 08997279f40f9c972c116195cc4d83f33ef17b0e https://github.com/pytest-dev/pytest/commit/08997279f40f9c972c116195cc4d83f33ef17b0e Author: Bruno Oliveira Date: 2017-12-22 (Fri, 22 Dec 2017) Changed paths: M testing/code/test_excinfo.py M testing/test_runner.py M testing/test_skipping.py Log Message: ----------- Merge pull request #3059 from asottile/yesqa Remove unnecessary `# noqa` comments. Commit: bd2d0d2c3c9bf92711e5a858e93e46d390dd4229 https://github.com/pytest-dev/pytest/commit/bd2d0d2c3c9bf92711e5a858e93e46d390dd4229 Author: Bruno Oliveira Date: 2017-12-25 (Mon, 25 Dec 2017) Changed paths: M CHANGELOG.rst R changelog/2784.bugfix R changelog/2981.bugfix R changelog/2985.bugfix R changelog/2995.bugfix R changelog/3001.doc R changelog/3015.trivial R changelog/3018.trivial R changelog/3021.trivial M doc/en/announce/index.rst A doc/en/announce/release-3.3.2.rst M doc/en/example/simple.rst Log Message: ----------- Preparing release version 3.3.2 Commit: 52a7ccef57c480ce7c1219a714ffa0a08fb9c5b3 https://github.com/pytest-dev/pytest/commit/52a7ccef57c480ce7c1219a714ffa0a08fb9c5b3 Author: Bruno Oliveira Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: M doc/en/writing_plugins.rst Log Message: ----------- Add pytest_runtestloop to the docs Commit: f24c470403aa0e34371850cb51a516a55dca7599 https://github.com/pytest-dev/pytest/commit/f24c470403aa0e34371850cb51a516a55dca7599 Author: Ian Lesperance Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: M _pytest/skipping.py Log Message: ----------- Assume not skipped by mark if attribute missing Fixes #3074. Commit: 0a6e086f9def9830e66413fe65bf93de37af7b13 https://github.com/pytest-dev/pytest/commit/0a6e086f9def9830e66413fe65bf93de37af7b13 Author: Ian Lesperance Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: A changelog/3074.bugfix Log Message: ----------- Add changelog entry Commit: 25b504b4f02c75a96acfcccddde458ed78aac22d https://github.com/pytest-dev/pytest/commit/25b504b4f02c75a96acfcccddde458ed78aac22d Author: Ian Lesperance Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: M AUTHORS Log Message: ----------- Add self to authors list Commit: 554cb8d09c4bef44b90215ebd6b5ba223200f373 https://github.com/pytest-dev/pytest/commit/554cb8d09c4bef44b90215ebd6b5ba223200f373 Author: Pierre-Alexandre Fonta Date: 2018-01-04 (Thu, 04 Jan 2018) Changed paths: M doc/en/doctest.rst Log Message: ----------- Reword strange sentence on doctest flags Commit: ac6f257efc022f95cbb02e2a9bc667b29410e529 https://github.com/pytest-dev/pytest/commit/ac6f257efc022f95cbb02e2a9bc667b29410e529 Author: Pierre-Alexandre Fonta Date: 2018-01-04 (Thu, 04 Jan 2018) Changed paths: A changelog/3076.doc Log Message: ----------- Create news fragment for the pull request Commit: e8c0ca4f08bd365babf528fe2d404eadf2374c1e https://github.com/pytest-dev/pytest/commit/e8c0ca4f08bd365babf528fe2d404eadf2374c1e Author: Bruno Oliveira Date: 2018-01-04 (Thu, 04 Jan 2018) Changed paths: M CHANGELOG.rst R changelog/2784.bugfix R changelog/2981.bugfix R changelog/2985.bugfix R changelog/2995.bugfix R changelog/3001.doc R changelog/3015.trivial R changelog/3018.trivial R changelog/3021.trivial M doc/en/announce/index.rst A doc/en/announce/release-3.3.2.rst M doc/en/example/simple.rst Log Message: ----------- Merge pull request #3064 from nicoddemus/release-3.3.2 Preparing release version 3.3.2 Commit: fac07c1b3fad6f27fc1ff04a72f2fa9f2e488924 https://github.com/pytest-dev/pytest/commit/fac07c1b3fad6f27fc1ff04a72f2fa9f2e488924 Author: Bruno Oliveira Date: 2018-01-05 (Fri, 05 Jan 2018) Changed paths: A changelog/3076.doc M doc/en/doctest.rst Log Message: ----------- Merge pull request #3076 from pafonta/patch-1 [doc] Reword strange sentence on doctest flags Commit: 06a182386ba1fc9bf6ea2f4829c85e6dc882c606 https://github.com/pytest-dev/pytest/commit/06a182386ba1fc9bf6ea2f4829c85e6dc882c606 Author: Bruno Oliveira Date: 2018-01-05 (Fri, 05 Jan 2018) Changed paths: M doc/en/writing_plugins.rst Log Message: ----------- Merge pull request #3073 from nicoddemus/pytest_runtestloop-docs Add pytest_runtestloop to the docs Commit: bc66f7e43f11632a746618124e5d7688404ab6c5 https://github.com/pytest-dev/pytest/commit/bc66f7e43f11632a746618124e5d7688404ab6c5 Author: Bruno Oliveira Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M AUTHORS M _pytest/skipping.py A changelog/3074.bugfix Log Message: ----------- Merge pull request #3075 from elliterate/bugs/fix-skipping-plugin-reporting Assume not skipped by mark if attribute missing Commit: b93aa5e35f8ea95d6ab74c1953dead2ea3a14688 https://github.com/pytest-dev/pytest/commit/b93aa5e35f8ea95d6ab74c1953dead2ea3a14688 Author: Jon Dufresne Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: A changelog/3092.doc M doc/en/projects.rst M doc/en/tmpdir.rst Log Message: ----------- Prefer https://*.readthedocs.io over http://*.rtfd.org - Requests URL using https instead of http - Avoids unnecessary redirect of *.rtfd.org -> *.readthedocs.io *.rtfd.org exists as a means for pasting short URLs, which doesn't much apply for links in documentation. Commit: f3c666db3c6ff5d16544ded10496513c1153e8e4 https://github.com/pytest-dev/pytest/commit/f3c666db3c6ff5d16544ded10496513c1153e8e4 Author: Bruno Oliveira Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M changelog/3092.doc Log Message: ----------- Small formatting update in CHANGELOG Commit: 29ff9301d841b6cfecb976225dffc6ddc77d199b https://github.com/pytest-dev/pytest/commit/29ff9301d841b6cfecb976225dffc6ddc77d199b Author: Bruno Oliveira Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: A changelog/3092.doc M doc/en/projects.rst M doc/en/tmpdir.rst Log Message: ----------- Merge pull request #3092 from jdufresne/readthedocs Prefer https://*.readthedocs.io over http://*.rtfd.org Commit: d7e1f037d971c5eab735268a7e86d3aaa7250de6 https://github.com/pytest-dev/pytest/commit/d7e1f037d971c5eab735268a7e86d3aaa7250de6 Author: Henk-Jaap Wagenaar Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M CHANGELOG.rst Log Message: ----------- Fix issue 2985 blurb in changelog Commit: 794fb193ba9b4c6d4576bcdf4bdfdc21fc22feaf https://github.com/pytest-dev/pytest/commit/794fb193ba9b4c6d4576bcdf4bdfdc21fc22feaf Author: Bruno Oliveira Date: 2018-01-07 (Sun, 07 Jan 2018) Changed paths: M CHANGELOG.rst Log Message: ----------- Merge pull request #3093 from cryvate/fix-issue-2985-blurb Fix issue 2985 blurb in changelog Commit: 3dd24f8d218408f421aa9c88b7343bbb54e423f8 https://github.com/pytest-dev/pytest/commit/3dd24f8d218408f421aa9c88b7343bbb54e423f8 Author: Bruno Oliveira Date: 2018-01-08 (Mon, 08 Jan 2018) Changed paths: M tox.ini Log Message: ----------- Ignore ImportWarnings regarding package resolution The problem is described/discussed in #3061 Ideally this should be a temporary solution until we find a proper one which gets rid of the warning Commit: b6b36bc167b1d05b9b8353e38e2cedd124d1f4e1 https://github.com/pytest-dev/pytest/commit/b6b36bc167b1d05b9b8353e38e2cedd124d1f4e1 Author: Bruno Oliveira Date: 2018-01-08 (Mon, 08 Jan 2018) Changed paths: M _pytest/python.py Log Message: ----------- Handle pluggy package or module for traceback filtering Since 0.6.1 pluggy has been turned into a package Commit: b256cd2a6a81e72cb0b7e61a842465a45c1640c9 https://github.com/pytest-dev/pytest/commit/b256cd2a6a81e72cb0b7e61a842465a45c1640c9 Author: Tzu-ping Chung Date: 2018-01-09 (Tue, 09 Jan 2018) Changed paths: M AUTHORS M setup.py Log Message: ----------- Add support for new environment marker usages Commit: a8d3d329ec4e754f7b26c23234b0ecb0148c22a7 https://github.com/pytest-dev/pytest/commit/a8d3d329ec4e754f7b26c23234b0ecb0148c22a7 Author: Ronny Pfannschmidt Date: 2018-01-09 (Tue, 09 Jan 2018) Changed paths: M AUTHORS M setup.py Log Message: ----------- Merge pull request #3098 from uranusjr/pep426-setuptools-36.2.1 Add support for new environment marker usages Commit: 962aede2904592b206ae8e4e3fe0c749fd178a45 https://github.com/pytest-dev/pytest/commit/962aede2904592b206ae8e4e3fe0c749fd178a45 Author: Bruno Oliveira Date: 2018-01-09 (Tue, 09 Jan 2018) Changed paths: M _pytest/python.py M tox.ini Log Message: ----------- Merge pull request #3096 from nicoddemus/import-warnings Ignore ImportWarnings regarding package resolution Commit: 93306f6a5ec92d1feef6c3286688ce444a39115a https://github.com/pytest-dev/pytest/commit/93306f6a5ec92d1feef6c3286688ce444a39115a Author: Bruno Oliveira Date: 2018-01-09 (Tue, 09 Jan 2018) Changed paths: M AUTHORS M CHANGELOG.rst M CONTRIBUTING.rst M _pytest/pytester.py M _pytest/python.py M _pytest/skipping.py R changelog/2981.bugfix R changelog/2985.bugfix R changelog/2995.bugfix R changelog/3015.trivial R changelog/3018.trivial R changelog/3021.trivial A changelog/3074.bugfix A changelog/3076.doc A changelog/3092.doc M doc/en/announce/index.rst A doc/en/announce/release-3.3.2.rst M doc/en/doctest.rst M doc/en/example/simple.rst M doc/en/parametrize.rst M doc/en/projects.rst M doc/en/tmpdir.rst M doc/en/writing_plugins.rst M setup.py M testing/acceptance_test.py M testing/code/test_excinfo.py M testing/test_runner.py M testing/test_skipping.py M tox.ini Log Message: ----------- Merge remote-tracking branch 'upstream/master' into features Compare: https://github.com/pytest-dev/pytest/compare/c70efaa0fb95...93306f6a5ec9 From nicoddemus at gmail.com Wed Jan 10 11:19:27 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Wed, 10 Jan 2018 08:19:27 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 820ea6: Update Freezing pytest description in simple.rst Message-ID: <5a563d0f59fed_71722ae8d7e05c1411124d@hookshot-fe-b0febf1.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 820ea6d68f96ed320af5df14ecedbf20a86ed5b2 https://github.com/pytest-dev/pytest/commit/820ea6d68f96ed320af5df14ecedbf20a86ed5b2 Author: Per A. Brodtkorb Date: 2018-01-10 (Wed, 10 Jan 2018) Changed paths: M doc/en/example/simple.rst Log Message: ----------- Update Freezing pytest description in simple.rst I have trouble using third party plugins in my frozen program and discovered that other people have experienced it as well: https://mail.python.org/pipermail//pytest-dev/2015-June/003015.html The problem is that the mechanism for plugin discovery used by pytest (setupttools entry points) doesn't work with frozen executables so pytest can't find any plugins. The solution seems to be to import the third party plugins explicitly as shown here: https://mail.python.org/pipermail//pytest-dev/2015-June/003018.html This is not mentioned anywhere in the documentaion. Commit: 6fb46a0e79f71d6413ed820bfa1e77fa145aaf89 https://github.com/pytest-dev/pytest/commit/6fb46a0e79f71d6413ed820bfa1e77fa145aaf89 Author: Bruno Oliveira Date: 2018-01-10 (Wed, 10 Jan 2018) Changed paths: M doc/en/example/simple.rst Log Message: ----------- Merge pull request #3104 from pbrod/patch-1 Update Freezing pytest description in simple.rst Compare: https://github.com/pytest-dev/pytest/compare/cf9b31bd5adf...6fb46a0e79f7 From nicoddemus at gmail.com Thu Jan 11 08:14:23 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Thu, 11 Jan 2018 05:14:23 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] afb8a4: Document bootstrap and initialization hooks Message-ID: <5a57632f5dd90_78512b264fb41c0c99477@hookshot-fe-d2afb11.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: afb8a4e35d0bf3393668a90bb4a30e55091543a2 https://github.com/pytest-dev/pytest/commit/afb8a4e35d0bf3393668a90bb4a30e55091543a2 Author: Bruno Oliveira Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M _pytest/hookspec.py M doc/en/writing_plugins.rst Log Message: ----------- Document bootstrap and initialization hooks Fix #2616 Commit: 2674f352e8aae54d4c7d7a8c94acb464e03ab040 https://github.com/pytest-dev/pytest/commit/2674f352e8aae54d4c7d7a8c94acb464e03ab040 Author: Bruno Oliveira Date: 2018-01-11 (Thu, 11 Jan 2018) Changed paths: M _pytest/hookspec.py M doc/en/writing_plugins.rst Log Message: ----------- Merge pull request #3091 from nicoddemus/conftest-hooks Document bootstrap and initialization hooks Compare: https://github.com/pytest-dev/pytest/compare/6fb46a0e79f7...2674f352e8aa From nicoddemus at gmail.com Thu Jan 11 08:14:48 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Thu, 11 Jan 2018 05:14:48 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] cb6b85: Update deprecation/removal docs to point to labels... Message-ID: <5a576348add6c_7bf62b0a4a161c08523cd@hookshot-fe-5a11256.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: cb6b851780ac010990c1404776c44841d01a8b84 https://github.com/pytest-dev/pytest/commit/cb6b851780ac010990c1404776c44841d01a8b84 Author: Bruno Oliveira Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M doc/en/backwards-compatibility.rst Log Message: ----------- Update deprecation/removal docs to point to labels/milestones instead Using milestones and proper issues are a much saner way to handle these topics than keeping them in sync in a separate document Commit: 3181718fe0a1761b7aebf48610945231fa4485ea https://github.com/pytest-dev/pytest/commit/3181718fe0a1761b7aebf48610945231fa4485ea Author: Bruno Oliveira Date: 2018-01-11 (Thu, 11 Jan 2018) Changed paths: M doc/en/backwards-compatibility.rst Log Message: ----------- Merge pull request #3087 from nicoddemus/deprecation-roadmap Update deprecation/removal docs to point to labels/milestones instead Compare: https://github.com/pytest-dev/pytest/compare/2674f352e8aa...3181718fe0a1 From nicoddemus at gmail.com Tue Jan 16 05:33:51 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 16 Jan 2018 02:33:51 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] d8c23f: Fix wrong formatting Message-ID: <5a5dd50f404c2_3dc22af3c66abc0811063b@hookshot-fe-b0febf1.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: d8c23fd39bbe3e6d3f44ef44ffe58bee81fccaee https://github.com/pytest-dev/pytest/commit/d8c23fd39bbe3e6d3f44ef44ffe58bee81fccaee Author: Kate Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: M doc/en/parametrize.rst Log Message: ----------- Fix wrong formatting Commit: 150537d5e0a1f6d835732f335c6e2db8394602db https://github.com/pytest-dev/pytest/commit/150537d5e0a1f6d835732f335c6e2db8394602db Author: Bruno Oliveira Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: M doc/en/parametrize.rst Log Message: ----------- Merge pull request #3119 from PoppyBagel/fix-formatting [doc] Fix wrong formatting in parametrize.rst Compare: https://github.com/pytest-dev/pytest/compare/3181718fe0a1...150537d5e0a1 From nicoddemus at gmail.com Thu Jan 18 13:40:10 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Thu, 18 Jan 2018 10:40:10 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] e0b63e: fixed typo in logging doc and added fix to changel... Message-ID: <5a60ea0ac42d7_21fe2ac798479c14413cf@hookshot-fe-88eb02d.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: e0b63e34fa2ad6c5cb6d607b3f276d3724c7986f https://github.com/pytest-dev/pytest/commit/e0b63e34fa2ad6c5cb6d607b3f276d3724c7986f Author: Kimberly Date: 2018-01-18 (Thu, 18 Jan 2018) Changed paths: A changelog/3129.trivial M doc/en/logging.rst Log Message: ----------- fixed typo in logging doc and added fix to changelog Commit: 8be1136d039465d8e69ebc4ede35956f40aa6ea3 https://github.com/pytest-dev/pytest/commit/8be1136d039465d8e69ebc4ede35956f40aa6ea3 Author: Bruno Oliveira Date: 2018-01-18 (Thu, 18 Jan 2018) Changed paths: M changelog/3129.trivial Log Message: ----------- Small changelog formatting Commit: 621374679b0cc9be4bbb76589fd94f20ecb9e0ec https://github.com/pytest-dev/pytest/commit/621374679b0cc9be4bbb76589fd94f20ecb9e0ec Author: Bruno Oliveira Date: 2018-01-18 (Thu, 18 Jan 2018) Changed paths: A changelog/3129.trivial M doc/en/logging.rst Log Message: ----------- Merge pull request #3129 from kimberlythegeek/typo_in_logging_doc Typo in logging doc Compare: https://github.com/pytest-dev/pytest/compare/150537d5e0a1...621374679b0c From nicoddemus at gmail.com Sat Jan 20 08:21:18 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Sat, 20 Jan 2018 05:21:18 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 7ea5a2: Access captures logs in teardown Message-ID: <5a63424eaf681_587b2ae2aff3dc04115038@hookshot-fe-cace476.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: 7ea5a22657027d87e7b35f456e9b044a097c910e https://github.com/pytest-dev/pytest/commit/7ea5a22657027d87e7b35f456e9b044a097c910e Author: Anders Hovm?ller Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: M AUTHORS M _pytest/logging.py A changelog/3117.feature M doc/en/logging.rst M testing/logging/test_fixture.py Log Message: ----------- Access captures logs in teardown Commit: c4c968fe6979cc2ca7c321b8a2966b7ee52f0430 https://github.com/pytest-dev/pytest/commit/c4c968fe6979cc2ca7c321b8a2966b7ee52f0430 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M changelog/3117.feature Log Message: ----------- Reword CHANGELOG after introduction of caplog.get_handler() Commit: 3b3d237f07cfbf3663e43e8709b50e406e9a0ce3 https://github.com/pytest-dev/pytest/commit/3b3d237f07cfbf3663e43e8709b50e406e9a0ce3 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M AUTHORS M _pytest/logging.py A changelog/3117.feature M doc/en/logging.rst M testing/logging/test_fixture.py Log Message: ----------- Merge pull request #3117 from boxed/access_logs_in_teardown Access captures logs in teardown Compare: https://github.com/pytest-dev/pytest/compare/1fd67c90009b...3b3d237f07cf From nicoddemus at gmail.com Mon Jan 22 14:45:39 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Mon, 22 Jan 2018 11:45:39 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 5c0b34: Clarify that warning capturing doesn't change the ... Message-ID: <5a663f63cd4b_71702b264fa61c10143596@hookshot-fe-6e9b612.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 5c0b340a4b76e4fa5063dfec25508c31fef2c613 https://github.com/pytest-dev/pytest/commit/5c0b340a4b76e4fa5063dfec25508c31fef2c613 Author: Brian Maissy Date: 2018-01-21 (Sun, 21 Jan 2018) Changed paths: A changelog/2457.doc M doc/en/warnings.rst Log Message: ----------- Clarify that warning capturing doesn't change the warning filter by default Commit: e5739a3115152c6c65069ec625ab2f18f80743f6 https://github.com/pytest-dev/pytest/commit/e5739a3115152c6c65069ec625ab2f18f80743f6 Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: A changelog/2457.doc M doc/en/warnings.rst Log Message: ----------- Merge pull request #3136 from brianmaissy/doc/document_warning_filtering_behavior Clarify that warning capturing doesn't change the warning filter by d? Compare: https://github.com/pytest-dev/pytest/compare/621374679b0c...e5739a311515 From nicoddemus at gmail.com Mon Jan 22 15:00:36 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Mon, 22 Jan 2018 12:00:36 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 899460: Document hooks (defined with historic=True) which ... Message-ID: <5a6642e498faa_3c352ad09421dc048212a@hookshot-fe-265448d.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 8994603d46d32abc50f50a8967ed042c764b2172 https://github.com/pytest-dev/pytest/commit/8994603d46d32abc50f50a8967ed042c764b2172 Author: Brian Maissy Date: 2018-01-21 (Sun, 21 Jan 2018) Changed paths: M _pytest/hookspec.py A changelog/2423.doc Log Message: ----------- Document hooks (defined with historic=True) which cannot be used with hookwrapper=True Commit: 8a8797df8034fb37ced96406429fe6f1b28bbf1b https://github.com/pytest-dev/pytest/commit/8a8797df8034fb37ced96406429fe6f1b28bbf1b Author: Bruno Oliveira Date: 2018-01-21 (Sun, 21 Jan 2018) Changed paths: M changelog/2423.doc Log Message: ----------- Small changelog formatting Commit: 060f68bd901904489b5dcf10367370224831f83b https://github.com/pytest-dev/pytest/commit/060f68bd901904489b5dcf10367370224831f83b Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M _pytest/hookspec.py A changelog/2423.doc Log Message: ----------- Merge pull request #3137 from brianmaissy/doc/note_that_certain_hooks_cant_be_used_with_hookwrapper Document hooks (defined with historic=True) which cannot be used with hookwrapper=True Compare: https://github.com/pytest-dev/pytest/compare/e5739a311515...060f68bd9019 From nicoddemus at gmail.com Mon Jan 22 15:02:35 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Mon, 22 Jan 2018 12:02:35 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 196dcc: Clarify a possible confusion when using pytest_fix... Message-ID: <5a66435b22d3f_1f5cd2ae0b5e3dc10123677@hookshot-fe-dfcc362.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 196dcc37a81aa5a0155f10a36a3131338108fa48 https://github.com/pytest-dev/pytest/commit/196dcc37a81aa5a0155f10a36a3131338108fa48 Author: Brian Maissy Date: 2018-01-21 (Sun, 21 Jan 2018) Changed paths: M _pytest/hookspec.py A changelog/2698.doc Log Message: ----------- Clarify a possible confusion when using pytest_fixture_setup with fixture functions that return None Commit: 0d96a5bf9059e51324ac24ec24d68af1c35db6d8 https://github.com/pytest-dev/pytest/commit/0d96a5bf9059e51324ac24ec24d68af1c35db6d8 Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M _pytest/hookspec.py A changelog/2698.doc Log Message: ----------- Merge pull request #3135 from brianmaissy/doc/clarify_pytest_fixture_setup_with_fixture_that_returns_None Clarify a possible confusion when using pytest_fixture_setup with fixture functions that return None Compare: https://github.com/pytest-dev/pytest/compare/060f68bd9019...0d96a5bf9059 From nicoddemus at gmail.com Tue Jan 23 14:48:13 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 23 Jan 2018 11:48:13 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 1f4831: Update getting-started.rst Message-ID: <5a67917d2bb99_64402b226b969c1473099@hookshot-fe-d252ca1.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 1f4831a23fdfab060006f65bb4fa891167374f2f https://github.com/pytest-dev/pytest/commit/1f4831a23fdfab060006f65bb4fa891167374f2f Author: Cyrus Maden Date: 2018-01-15 (Mon, 15 Jan 2018) Changed paths: M doc/en/getting-started.rst Log Message: ----------- Update getting-started.rst Commit: f555a3a76cc205b0f0d2b253d0146290e7ca34cf https://github.com/pytest-dev/pytest/commit/f555a3a76cc205b0f0d2b253d0146290e7ca34cf Author: Cyrus Maden Date: 2018-01-15 (Mon, 15 Jan 2018) Changed paths: A .DS_Store A doc/.DS_Store A doc/en/.DS_Store M doc/en/getting-started.rst Log Message: ----------- Update getting started guide Proofread; added intro paragraph under first header to orient new users; fixed grammar errors (switched to active voice, actionable directions, etc) to improve readability Commit: b7485763581ba0f8936fdc451d1c9fa5b08007c0 https://github.com/pytest-dev/pytest/commit/b7485763581ba0f8936fdc451d1c9fa5b08007c0 Author: Cyrus Maden Date: 2018-01-15 (Mon, 15 Jan 2018) Changed paths: M AUTHORS Log Message: ----------- Add name Commit: 931e8830ba62a54c0158fd9a60af6b5f28fa1f11 https://github.com/pytest-dev/pytest/commit/931e8830ba62a54c0158fd9a60af6b5f28fa1f11 Author: Cyrus Maden Date: 2018-01-18 (Thu, 18 Jan 2018) Changed paths: A changelog/pr.doc Log Message: ----------- Update changelog Not issue ID. Will update with pr ID after submitting pr Commit: cd76366d87eaaec6d04234c3d625c4506c058eaf https://github.com/pytest-dev/pytest/commit/cd76366d87eaaec6d04234c3d625c4506c058eaf Author: Cyrus Maden Date: 2018-01-18 (Thu, 18 Jan 2018) Changed paths: A changelog/3131.doc R changelog/pr.doc Log Message: ----------- Rename pr.doc to 3131.doc Commit: ebb4c4715560bbf86b7cd328bef90b0c981bedc7 https://github.com/pytest-dev/pytest/commit/ebb4c4715560bbf86b7cd328bef90b0c981bedc7 Author: Cyrus Maden Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: R doc/.DS_Store Log Message: ----------- Delete .DS_Store Commit: c3d420bf759dd306119d96c63d6ac98dab32023f https://github.com/pytest-dev/pytest/commit/c3d420bf759dd306119d96c63d6ac98dab32023f Author: Cyrus Maden Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: R doc/en/.DS_Store Log Message: ----------- Delete .DS_Store Commit: 0b6df94b12a841a3de2fbced9e6d75c65f29761d https://github.com/pytest-dev/pytest/commit/0b6df94b12a841a3de2fbced9e6d75c65f29761d Author: Cyrus Maden Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: R .DS_Store Log Message: ----------- Delete .DS_Store Commit: 0ab57c413957693aea3a05f959f42d1dac3bd560 https://github.com/pytest-dev/pytest/commit/0ab57c413957693aea3a05f959f42d1dac3bd560 Author: Cyrus Maden Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M doc/en/getting-started.rst Log Message: ----------- Typo fix: "handeling" --> "handling" Commit: baa189f5a351d41aee291fb46f564dc33b58abbf https://github.com/pytest-dev/pytest/commit/baa189f5a351d41aee291fb46f564dc33b58abbf Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M AUTHORS A changelog/3131.doc M doc/en/getting-started.rst Log Message: ----------- Merge pull request #3131 from soyrice/master Improve readability of Getting Started guide Compare: https://github.com/pytest-dev/pytest/compare/0d96a5bf9059...baa189f5a351 From nicoddemus at gmail.com Tue Jan 23 16:32:20 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 23 Jan 2018 13:32:20 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 4a3863: use flush in order to avoid hanging on mac Message-ID: <5a67a9e4c12a4_79692aaec30a3c0480167@hookshot-fe-2cc8887.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 4a3863c2e28df69b59315a14b3a2ae4767d07ef9 https://github.com/pytest-dev/pytest/commit/4a3863c2e28df69b59315a14b3a2ae4767d07ef9 Author: Brian Maissy Date: 2018-01-14 (Sun, 14 Jan 2018) Changed paths: M testing/test_pdb.py Log Message: ----------- use flush in order to avoid hanging on mac Commit: 0a0d97aeb5eac43101b6f3f8a4b7d93f27464568 https://github.com/pytest-dev/pytest/commit/0a0d97aeb5eac43101b6f3f8a4b7d93f27464568 Author: Brian Maissy Date: 2018-01-14 (Sun, 14 Jan 2018) Changed paths: A changelog/2022.bugfix Log Message: ----------- added changelog news fragment Commit: ff90c9e23765159469a0d21fee6e5fedc13f06d6 https://github.com/pytest-dev/pytest/commit/ff90c9e23765159469a0d21fee6e5fedc13f06d6 Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: A changelog/2022.bugfix M testing/test_pdb.py Log Message: ----------- Merge pull request #3116 from brianmaissy/pexpect_test_hangs_on_mac use flush in order to avoid hanging on mac Compare: https://github.com/pytest-dev/pytest/compare/baa189f5a351...ff90c9e23765 From nicoddemus at gmail.com Thu Jan 25 07:41:21 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Thu, 25 Jan 2018 04:41:21 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 2c7f94: Added basic fix and test Message-ID: <5a69d07111aad_40802aef286d9c186003c@hookshot-fe-6e9b612.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: 2c7f94fdb94d166593384ec3455a52654a735e8b https://github.com/pytest-dev/pytest/commit/2c7f94fdb94d166593384ec3455a52654a735e8b Author: Andrew Toolan Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M _pytest/config.py M testing/test_config.py Log Message: ----------- Added basic fix and test Commit: 203508d9f3ea4478317375c1bdf09a8db02c8826 https://github.com/pytest-dev/pytest/commit/203508d9f3ea4478317375c1bdf09a8db02c8826 Author: Aron Coyle Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M testing/test_config.py Log Message: ----------- cleanup test cases Commit: 46d87deb5d38d6138947d981158ca2839c3ad8d7 https://github.com/pytest-dev/pytest/commit/46d87deb5d38d6138947d981158ca2839c3ad8d7 Author: Aron Coyle Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M AUTHORS A changelog/3103.bugfix Log Message: ----------- Add changelog update authors Commit: 30ca9f9d3890c7d83e34014a8ff096744db7e690 https://github.com/pytest-dev/pytest/commit/30ca9f9d3890c7d83e34014a8ff096744db7e690 Author: Aron Coyle Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M changelog/3103.bugfix Log Message: ----------- Add endline Commit: 8426c57a9e8631186a6cadcedd14756246218efb https://github.com/pytest-dev/pytest/commit/8426c57a9e8631186a6cadcedd14756246218efb Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M testing/test_config.py Log Message: ----------- Ensure changes in the message in the future do not make the test pass by accident Commit: 443275f0258715a8975ecf2f003f2919cc00d94e https://github.com/pytest-dev/pytest/commit/443275f0258715a8975ecf2f003f2919cc00d94e Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M changelog/3103.bugfix Log Message: ----------- Reword changelog a bit Commit: 3f5e9ea71e997746f89c71507888414f9477e2b9 https://github.com/pytest-dev/pytest/commit/3f5e9ea71e997746f89c71507888414f9477e2b9 Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M _pytest/config.py M _pytest/helpconfig.py M changelog/3103.bugfix M doc/en/customize.rst M testing/test_config.py Log Message: ----------- Fix -o behavior to no longer swallow all remaining options The current behavior was too error-prone because a "-o" option would swallow all the following non-option parameters: pytest -o foo=bar path/to/test.py path/to/test.py would be captured by the -o option, and would fail because "path/to/test.py" is not in the format "key=value". Commit: 2aad8c0fcebe6bc7e9e6ca567dac2e3f3c141bb2 https://github.com/pytest-dev/pytest/commit/2aad8c0fcebe6bc7e9e6ca567dac2e3f3c141bb2 Author: Bruno Oliveira Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M AUTHORS M _pytest/config.py M _pytest/helpconfig.py A changelog/3103.bugfix M doc/en/customize.rst M testing/test_config.py Log Message: ----------- Merge pull request #3147 from nicoddemus/issue-3103 '-o' option no longer swallows all other non-options after it Compare: https://github.com/pytest-dev/pytest/compare/3b3d237f07cf...2aad8c0fcebe From nicoddemus at gmail.com Thu Jan 25 07:41:29 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Thu, 25 Jan 2018 04:41:29 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] af3777: All classes now subclass object for better py3 com... Message-ID: <5a69d079a87b2_27fb2acb0ede9c0812392f@hookshot-fe-7191cb1.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: af37778b0d8d88b72b485ae53a5dde0478cc1b07 https://github.com/pytest-dev/pytest/commit/af37778b0d8d88b72b485ae53a5dde0478cc1b07 Author: Bruno Oliveira Date: 2018-01-24 (Wed, 24 Jan 2018) Changed paths: 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/main.py M _pytest/mark.py M _pytest/monkeypatch.py M _pytest/pytester.py M _pytest/runner.py M _pytest/terminal.py M _pytest/tmpdir.py A changelog/2147.removal M testing/acceptance_test.py M testing/python/collect.py M testing/python/fixture.py M testing/python/metafunc.py M testing/test_capture.py M testing/test_pytester.py M testing/test_terminal.py Log Message: ----------- All classes now subclass object for better py3 compatibility Fix #2147 Commit: b8be339632035817ccc65c1d51d0bff7eed68fd5 https://github.com/pytest-dev/pytest/commit/b8be339632035817ccc65c1d51d0bff7eed68fd5 Author: Bruno Oliveira Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: 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/main.py M _pytest/mark.py M _pytest/monkeypatch.py M _pytest/pytester.py M _pytest/runner.py M _pytest/terminal.py M _pytest/tmpdir.py A changelog/2147.removal M testing/acceptance_test.py M testing/python/collect.py M testing/python/fixture.py M testing/python/metafunc.py M testing/test_capture.py M testing/test_pytester.py M testing/test_terminal.py Log Message: ----------- Merge pull request #3148 from nicoddemus/deprecate-old-style-classes-2147 All classes now subclass object for better py3 compatibility Compare: https://github.com/pytest-dev/pytest/compare/2aad8c0fcebe...b8be33963203 From nicoddemus at gmail.com Fri Jan 26 05:52:45 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Fri, 26 Jan 2018 02:52:45 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 5ad131: log_cli must now be enabled explicitly Message-ID: <5a6b087d711f9_2bba2ac7bfb3bbfc136665@hookshot-fe-d2afb11.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: 5ad1313b8a18fa3862623d2360cbeb39c202b838 https://github.com/pytest-dev/pytest/commit/5ad1313b8a18fa3862623d2360cbeb39c202b838 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- log_cli must now be enabled explicitly Ref: #3013 Commit: 8dcd2718aa90620d9fdc872f49ba8ccbe9c9dd13 https://github.com/pytest-dev/pytest/commit/8dcd2718aa90620d9fdc872f49ba8ccbe9c9dd13 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- No longer change the level of any logger unless requested explicitly Ref: #3013 Commit: aca1b06747a432e4a7bc3b8b3f98a2a59192c785 https://github.com/pytest-dev/pytest/commit/aca1b06747a432e4a7bc3b8b3f98a2a59192c785 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_fixture.py Log Message: ----------- Undo log level set by caplog.set_level at the end of the test Otherwise this leaks the log level information to other tests Ref: #3013 Commit: 8d735f3e1d3ff24ea15759c4a8abb0bc5776b811 https://github.com/pytest-dev/pytest/commit/8d735f3e1d3ff24ea15759c4a8abb0bc5776b811 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Live log option now writes to the terminal reporter Ref: #3013 Commit: 6bb739516fe86fb3d66d04f6ad354ab37e781b66 https://github.com/pytest-dev/pytest/commit/6bb739516fe86fb3d66d04f6ad354ab37e781b66 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M doc/en/logging.rst Log Message: ----------- Update logging docs with the new changes in 3.4 Ref: #3013 Commit: c53b72fd7b05793b091eb334de1224f15278993b https://github.com/pytest-dev/pytest/commit/c53b72fd7b05793b091eb334de1224f15278993b Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: A changelog/3013.feature Log Message: ----------- Add CHANGELOG for 3013 Commit: 5d89a939779a0aafdf99dd9f5e60ec306a53cddd https://github.com/pytest-dev/pytest/commit/5d89a939779a0aafdf99dd9f5e60ec306a53cddd Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Small improvements to tests suggested during review Commit: 8f6a5928f76f37323ea9cabf1c58472c3f1ac400 https://github.com/pytest-dev/pytest/commit/8f6a5928f76f37323ea9cabf1c58472c3f1ac400 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M doc/en/logging.rst M testing/logging/test_reporting.py Log Message: ----------- Add newline before log messages and enable -v output when log_cli is enabled Commit: 97a4967b036fdbf71ad30cf6505cf459b40d8a78 https://github.com/pytest-dev/pytest/commit/97a4967b036fdbf71ad30cf6505cf459b40d8a78 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py Log Message: ----------- Improve code formatting Commit: 4a436572a85c9f13fba9f242f87b456f54349a32 https://github.com/pytest-dev/pytest/commit/4a436572a85c9f13fba9f242f87b456f54349a32 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M testing/logging/test_reporting.py Log Message: ----------- Simplify test assertions a bit Commit: 9dbcac9af39a032e9ea224d6979a859568b277fd https://github.com/pytest-dev/pytest/commit/9dbcac9af39a032e9ea224d6979a859568b277fd Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Suspend stdout/stderr capturing when emitting live logging messages Commit: 18e053546c6798dc801956433087cafde9986121 https://github.com/pytest-dev/pytest/commit/18e053546c6798dc801956433087cafde9986121 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M testing/logging/test_reporting.py Log Message: ----------- Use six.StringIO and __name__ in test_live_logging_suspends_capture Commit: 2e40a8b3ca520fbb53cdb0a6239a0d03c8fd27bc https://github.com/pytest-dev/pytest/commit/2e40a8b3ca520fbb53cdb0a6239a0d03c8fd27bc Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M testing/logging/test_fixture.py Log Message: ----------- Fix test_caplog_captures_for_all_stages by setting log level Commit: 27ae270159dc027ba6622ca43be3681204e84e2b https://github.com/pytest-dev/pytest/commit/27ae270159dc027ba6622ca43be3681204e84e2b Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M doc/en/logging.rst Log Message: ----------- Mention in docs that log messages of level WARNING or above are captured Commit: 29a7b5e064d57f510dba92861e7977eb4a7cbb22 https://github.com/pytest-dev/pytest/commit/29a7b5e064d57f510dba92861e7977eb4a7cbb22 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py Log Message: ----------- Initialize log_cli_handler to None during LoggingPlugin init Some of testdir's functionality bypasses pytest_runtestloop so this attribute needs to be set early Commit: 0df42b44265b7b03dd897f1f3ddc33018acf0957 https://github.com/pytest-dev/pytest/commit/0df42b44265b7b03dd897f1f3ddc33018acf0957 Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Show a header for each testing phase during live logging As suggested during review Commit: 3a9d0b26d5700be58bde067e6d8d4ca2e80406de https://github.com/pytest-dev/pytest/commit/3a9d0b26d5700be58bde067e6d8d4ca2e80406de Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Use pytest_runtest_logstart to signal the start of a new test This also simplifies the code a bit because we don't need to keep a set of ids anymore Commit: 9f4688e549cb2688f667ff951f9f28a869f6bf07 https://github.com/pytest-dev/pytest/commit/9f4688e549cb2688f667ff951f9f28a869f6bf07 Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M testing/logging/test_reporting.py Log Message: ----------- Remove unnecessary -s from test_log_cli_enabled_disabled Commit: 113bfb6be88523df3983c358fbed5bb75f234b0c https://github.com/pytest-dev/pytest/commit/113bfb6be88523df3983c358fbed5bb75f234b0c Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Report 'call' phase as 'live log call' As commented in review, this makes it consistent with the headers shown by stdout/stderr capturing ("Captured log call") Commit: b4e8861aa583e9fc365e5bb4769e3a6e5c94f78a https://github.com/pytest-dev/pytest/commit/b4e8861aa583e9fc365e5bb4769e3a6e5c94f78a Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M _pytest/logging.py M doc/en/logging.rst Log Message: ----------- Fix typos Commit: 2f955e0c99d10fc90f103c14aff70b1382295f5f https://github.com/pytest-dev/pytest/commit/2f955e0c99d10fc90f103c14aff70b1382295f5f Author: Bruno Oliveira Date: 2018-01-24 (Wed, 24 Jan 2018) Changed paths: M doc/en/logging.rst Log Message: ----------- Update documentation: rewording and move things for better reading flow Commit: 15cbd6115987ced2e9ae9cd598cc80f0bf07b71c https://github.com/pytest-dev/pytest/commit/15cbd6115987ced2e9ae9cd598cc80f0bf07b71c Author: Bruno Oliveira Date: 2018-01-24 (Wed, 24 Jan 2018) Changed paths: M _pytest/logging.py M changelog/3117.feature M doc/en/logging.rst M testing/logging/test_fixture.py Log Message: ----------- Change caplog.get_handler(when) to caplog.get_records(when) While updating the docs I noticed that caplog.get_handler() exposes the underlying Handler object, which I think it is a bit too much detail at this stage. Update to return the records directly instead. Commit: a58099022a293f1c73fe116f72a0bdcc080f64d9 https://github.com/pytest-dev/pytest/commit/a58099022a293f1c73fe116f72a0bdcc080f64d9 Author: Bruno Oliveira Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/logging.py A changelog/3013.feature M changelog/3117.feature M doc/en/logging.rst M testing/logging/test_fixture.py M testing/logging/test_reporting.py Log Message: ----------- Merge pull request #3124 from nicoddemus/logging-3013 Changes in the logging plugin for 3.4 Compare: https://github.com/pytest-dev/pytest/compare/b8be33963203...a58099022a29 From nicoddemus at gmail.com Sat Jan 27 07:08:57 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Sat, 27 Jan 2018 04:08:57 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] a24ca9: Change cache directory name to include `pytest` Message-ID: <5a6c6bd9de65d_74222b01e5f77bfc1468ae@hookshot-fe-da92815.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: a24ca9872fce47cb897ed0d28f5901c6f4639b16 https://github.com/pytest-dev/pytest/commit/a24ca9872fce47cb897ed0d28f5901c6f4639b16 Author: Alan Velasco Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M AUTHORS M _pytest/cacheprovider.py A changelog/3150.feature M testing/test_cache.py Log Message: ----------- Change cache directory name to include `pytest` Commit: cbbd606b6cac1027c35812f38456fd1dff956840 https://github.com/pytest-dev/pytest/commit/cbbd606b6cac1027c35812f38456fd1dff956840 Author: Bruno Oliveira Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: A changelog/3138.feature R changelog/3150.feature Log Message: ----------- Reword changelog Commit: cd0b2ace6744f1eee8689ca92b5a8453113bf2c5 https://github.com/pytest-dev/pytest/commit/cd0b2ace6744f1eee8689ca92b5a8453113bf2c5 Author: Bruno Oliveira Date: 2018-01-27 (Sat, 27 Jan 2018) Changed paths: M AUTHORS M _pytest/cacheprovider.py A changelog/3138.feature M testing/test_cache.py Log Message: ----------- Merge pull request #3150 from alanbato/pytest_cache Change cache directory structure to include `pytest` Compare: https://github.com/pytest-dev/pytest/compare/a58099022a29...cd0b2ace6744 From nicoddemus at gmail.com Sat Jan 27 09:23:50 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Sat, 27 Jan 2018 06:23:50 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] bf2c10: parameterset: refactor marking empty parametersets Message-ID: <5a6c8b76e592a_66c02af6e0317c14927cf@hookshot-fe-d252ca1.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: bf2c10c8105d770354d0abc451de4ffd9b986562 https://github.com/pytest-dev/pytest/commit/bf2c10c8105d770354d0abc451de4ffd9b986562 Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/mark.py M _pytest/python.py Log Message: ----------- parameterset: refactor marking empty parametersets Commit: 37b41de779957b0e0e826016b7dee9ee2f4aec89 https://github.com/pytest-dev/pytest/commit/37b41de779957b0e0e826016b7dee9ee2f4aec89 Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/mark.py A changelog/2527.feature M testing/test_mark.py Log Message: ----------- fix #2527 - introduce a option to pic the empty parameterset action Commit: 7f83605c81205398976b658b868137b41156578a https://github.com/pytest-dev/pytest/commit/7f83605c81205398976b658b868137b41156578a Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M testing/python/metafunc.py Log Message: ----------- fix empty parameterset tests by mocking a config object Commit: d4c11e58aa58fbb6d2e560bc62111a7efb955ca3 https://github.com/pytest-dev/pytest/commit/d4c11e58aa58fbb6d2e560bc62111a7efb955ca3 Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M testing/test_mark.py Log Message: ----------- exted empty parameterset check with reason test Commit: 8979b2a9d78161739fe870ef71be800067cff33a https://github.com/pytest-dev/pytest/commit/8979b2a9d78161739fe870ef71be800067cff33a Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M doc/en/customize.rst Log Message: ----------- document empty_parameterset in customize.rst Commit: d550c33cd02512fd78a9a6b0e205dbbaf4f5e9d1 https://github.com/pytest-dev/pytest/commit/d550c33cd02512fd78a9a6b0e205dbbaf4f5e9d1 Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/mark.py M doc/en/customize.rst Log Message: ----------- s/empty_parameterset/empty_parameter_set_mark Commit: 77de45cce3bac71119c99581b848b5e20660276d https://github.com/pytest-dev/pytest/commit/77de45cce3bac71119c99581b848b5e20660276d Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M changelog/2527.feature M doc/en/customize.rst Log Message: ----------- enhance docs for empty_parameter_set_mark according to review comments Commit: a54cd4c2fdf63634560920ec7c4a582b8ca32e0e https://github.com/pytest-dev/pytest/commit/a54cd4c2fdf63634560920ec7c4a582b8ca32e0e Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/mark.py M testing/test_mark.py Log Message: ----------- correct testing and usage of the empty_parameter_set_mark config option Commit: 17a1ed5edf73e12d14665a2e6ed2399ae6415579 https://github.com/pytest-dev/pytest/commit/17a1ed5edf73e12d14665a2e6ed2399ae6415579 Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/mark.py M testing/test_mark.py Log Message: ----------- use a constant to sort out repeated use of the EMPTY_PARAMETERSET_OPTION Commit: 169635e8899e60de8155ad151ff99f10c3652fa0 https://github.com/pytest-dev/pytest/commit/169635e8899e60de8155ad151ff99f10c3652fa0 Author: Bruno Oliveira Date: 2018-01-27 (Sat, 27 Jan 2018) Changed paths: M doc/en/customize.rst Log Message: ----------- Move example of empty_parameter_set_mark closer to the options Commit: b3247c1d03f039b80f69465adada20ddbdeedcdb https://github.com/pytest-dev/pytest/commit/b3247c1d03f039b80f69465adada20ddbdeedcdb Author: Bruno Oliveira Date: 2018-01-27 (Sat, 27 Jan 2018) Changed paths: M _pytest/mark.py M _pytest/python.py A changelog/2527.feature M doc/en/customize.rst M testing/python/metafunc.py M testing/test_mark.py Log Message: ----------- Merge pull request #3044 from RonnyPfannschmidt/parameterset-empty-enable-xfail empty parameterset - enable opt to xfail Compare: https://github.com/pytest-dev/pytest/compare/cd0b2ace6744...b3247c1d03f0 From nicoddemus at gmail.com Sat Jan 27 10:00:34 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Sat, 27 Jan 2018 07:00:34 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] afb8a4: Document bootstrap and initialization hooks Message-ID: <5a6c94125663a_2f3f2af254c73c1c98121@hookshot-fe-6b2eebc.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: afb8a4e35d0bf3393668a90bb4a30e55091543a2 https://github.com/pytest-dev/pytest/commit/afb8a4e35d0bf3393668a90bb4a30e55091543a2 Author: Bruno Oliveira Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M _pytest/hookspec.py M doc/en/writing_plugins.rst Log Message: ----------- Document bootstrap and initialization hooks Fix #2616 Commit: cb6b851780ac010990c1404776c44841d01a8b84 https://github.com/pytest-dev/pytest/commit/cb6b851780ac010990c1404776c44841d01a8b84 Author: Bruno Oliveira Date: 2018-01-06 (Sat, 06 Jan 2018) Changed paths: M doc/en/backwards-compatibility.rst Log Message: ----------- Update deprecation/removal docs to point to labels/milestones instead Using milestones and proper issues are a much saner way to handle these topics than keeping them in sync in a separate document Commit: bd1d17e8de30f6d52f9c4b61df4c6403f8f4f61c https://github.com/pytest-dev/pytest/commit/bd1d17e8de30f6d52f9c4b61df4c6403f8f4f61c Author: Anthony Sottile Date: 2018-01-09 (Tue, 09 Jan 2018) Changed paths: M _pytest/_code/code.py M _pytest/_code/source.py A changelog/3067.trivial M doc/en/example/assertion/failure_demo.py M doc/en/example/reportingdemo.rst M extra/get_issues.py M testing/acceptance_test.py M testing/code/test_excinfo.py M testing/code/test_source.py M testing/python/collect.py M testing/python/metafunc.py M testing/test_argcomplete.py M testing/test_assertrewrite.py M testing/test_cache.py M testing/test_collection.py M testing/test_config.py M testing/test_conftest.py M testing/test_parseopt.py M testing/test_pluginmanager.py M testing/test_recwarn.py M testing/test_runner.py M testing/test_terminal.py Log Message: ----------- Replace py.std with stdlib imports Commit: cf9b31bd5adf1eb947af4f863ce3bca4d4cf5bec https://github.com/pytest-dev/pytest/commit/cf9b31bd5adf1eb947af4f863ce3bca4d4cf5bec Author: Ronny Pfannschmidt Date: 2018-01-10 (Wed, 10 Jan 2018) Changed paths: M _pytest/_code/code.py M _pytest/_code/source.py A changelog/3067.trivial M doc/en/example/assertion/failure_demo.py M doc/en/example/reportingdemo.rst M extra/get_issues.py M testing/acceptance_test.py M testing/code/test_excinfo.py M testing/code/test_source.py M testing/python/collect.py M testing/python/metafunc.py M testing/test_argcomplete.py M testing/test_assertrewrite.py M testing/test_cache.py M testing/test_collection.py M testing/test_config.py M testing/test_conftest.py M testing/test_parseopt.py M testing/test_pluginmanager.py M testing/test_recwarn.py M testing/test_runner.py M testing/test_terminal.py Log Message: ----------- Merge pull request #3068 from asottile/pystd Replace py.std with stdlib imports Commit: 820ea6d68f96ed320af5df14ecedbf20a86ed5b2 https://github.com/pytest-dev/pytest/commit/820ea6d68f96ed320af5df14ecedbf20a86ed5b2 Author: Per A. Brodtkorb Date: 2018-01-10 (Wed, 10 Jan 2018) Changed paths: M doc/en/example/simple.rst Log Message: ----------- Update Freezing pytest description in simple.rst I have trouble using third party plugins in my frozen program and discovered that other people have experienced it as well: https://mail.python.org/pipermail//pytest-dev/2015-June/003015.html The problem is that the mechanism for plugin discovery used by pytest (setupttools entry points) doesn't work with frozen executables so pytest can't find any plugins. The solution seems to be to import the third party plugins explicitly as shown here: https://mail.python.org/pipermail//pytest-dev/2015-June/003018.html This is not mentioned anywhere in the documentaion. Commit: 6fb46a0e79f71d6413ed820bfa1e77fa145aaf89 https://github.com/pytest-dev/pytest/commit/6fb46a0e79f71d6413ed820bfa1e77fa145aaf89 Author: Bruno Oliveira Date: 2018-01-10 (Wed, 10 Jan 2018) Changed paths: M doc/en/example/simple.rst Log Message: ----------- Merge pull request #3104 from pbrod/patch-1 Update Freezing pytest description in simple.rst Commit: 2674f352e8aae54d4c7d7a8c94acb464e03ab040 https://github.com/pytest-dev/pytest/commit/2674f352e8aae54d4c7d7a8c94acb464e03ab040 Author: Bruno Oliveira Date: 2018-01-11 (Thu, 11 Jan 2018) Changed paths: M _pytest/hookspec.py M doc/en/writing_plugins.rst Log Message: ----------- Merge pull request #3091 from nicoddemus/conftest-hooks Document bootstrap and initialization hooks Commit: 3181718fe0a1761b7aebf48610945231fa4485ea https://github.com/pytest-dev/pytest/commit/3181718fe0a1761b7aebf48610945231fa4485ea Author: Bruno Oliveira Date: 2018-01-11 (Thu, 11 Jan 2018) Changed paths: M doc/en/backwards-compatibility.rst Log Message: ----------- Merge pull request #3087 from nicoddemus/deprecation-roadmap Update deprecation/removal docs to point to labels/milestones instead Commit: 4a3863c2e28df69b59315a14b3a2ae4767d07ef9 https://github.com/pytest-dev/pytest/commit/4a3863c2e28df69b59315a14b3a2ae4767d07ef9 Author: Brian Maissy Date: 2018-01-14 (Sun, 14 Jan 2018) Changed paths: M testing/test_pdb.py Log Message: ----------- use flush in order to avoid hanging on mac Commit: 0a0d97aeb5eac43101b6f3f8a4b7d93f27464568 https://github.com/pytest-dev/pytest/commit/0a0d97aeb5eac43101b6f3f8a4b7d93f27464568 Author: Brian Maissy Date: 2018-01-14 (Sun, 14 Jan 2018) Changed paths: A changelog/2022.bugfix Log Message: ----------- added changelog news fragment Commit: 1f4831a23fdfab060006f65bb4fa891167374f2f https://github.com/pytest-dev/pytest/commit/1f4831a23fdfab060006f65bb4fa891167374f2f Author: Cyrus Maden Date: 2018-01-15 (Mon, 15 Jan 2018) Changed paths: M doc/en/getting-started.rst Log Message: ----------- Update getting-started.rst Commit: f555a3a76cc205b0f0d2b253d0146290e7ca34cf https://github.com/pytest-dev/pytest/commit/f555a3a76cc205b0f0d2b253d0146290e7ca34cf Author: Cyrus Maden Date: 2018-01-15 (Mon, 15 Jan 2018) Changed paths: A .DS_Store A doc/.DS_Store A doc/en/.DS_Store M doc/en/getting-started.rst Log Message: ----------- Update getting started guide Proofread; added intro paragraph under first header to orient new users; fixed grammar errors (switched to active voice, actionable directions, etc) to improve readability Commit: b7485763581ba0f8936fdc451d1c9fa5b08007c0 https://github.com/pytest-dev/pytest/commit/b7485763581ba0f8936fdc451d1c9fa5b08007c0 Author: Cyrus Maden Date: 2018-01-15 (Mon, 15 Jan 2018) Changed paths: M AUTHORS Log Message: ----------- Add name Commit: d8c23fd39bbe3e6d3f44ef44ffe58bee81fccaee https://github.com/pytest-dev/pytest/commit/d8c23fd39bbe3e6d3f44ef44ffe58bee81fccaee Author: Kate Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: M doc/en/parametrize.rst Log Message: ----------- Fix wrong formatting Commit: 150537d5e0a1f6d835732f335c6e2db8394602db https://github.com/pytest-dev/pytest/commit/150537d5e0a1f6d835732f335c6e2db8394602db Author: Bruno Oliveira Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: M doc/en/parametrize.rst Log Message: ----------- Merge pull request #3119 from PoppyBagel/fix-formatting [doc] Fix wrong formatting in parametrize.rst Commit: e0b63e34fa2ad6c5cb6d607b3f276d3724c7986f https://github.com/pytest-dev/pytest/commit/e0b63e34fa2ad6c5cb6d607b3f276d3724c7986f Author: Kimberly Date: 2018-01-18 (Thu, 18 Jan 2018) Changed paths: A changelog/3129.trivial M doc/en/logging.rst Log Message: ----------- fixed typo in logging doc and added fix to changelog Commit: 8be1136d039465d8e69ebc4ede35956f40aa6ea3 https://github.com/pytest-dev/pytest/commit/8be1136d039465d8e69ebc4ede35956f40aa6ea3 Author: Bruno Oliveira Date: 2018-01-18 (Thu, 18 Jan 2018) Changed paths: M changelog/3129.trivial Log Message: ----------- Small changelog formatting Commit: 621374679b0cc9be4bbb76589fd94f20ecb9e0ec https://github.com/pytest-dev/pytest/commit/621374679b0cc9be4bbb76589fd94f20ecb9e0ec Author: Bruno Oliveira Date: 2018-01-18 (Thu, 18 Jan 2018) Changed paths: A changelog/3129.trivial M doc/en/logging.rst Log Message: ----------- Merge pull request #3129 from kimberlythegeek/typo_in_logging_doc Typo in logging doc Commit: 931e8830ba62a54c0158fd9a60af6b5f28fa1f11 https://github.com/pytest-dev/pytest/commit/931e8830ba62a54c0158fd9a60af6b5f28fa1f11 Author: Cyrus Maden Date: 2018-01-18 (Thu, 18 Jan 2018) Changed paths: A changelog/pr.doc Log Message: ----------- Update changelog Not issue ID. Will update with pr ID after submitting pr Commit: cd76366d87eaaec6d04234c3d625c4506c058eaf https://github.com/pytest-dev/pytest/commit/cd76366d87eaaec6d04234c3d625c4506c058eaf Author: Cyrus Maden Date: 2018-01-18 (Thu, 18 Jan 2018) Changed paths: A changelog/3131.doc R changelog/pr.doc Log Message: ----------- Rename pr.doc to 3131.doc Commit: ebb4c4715560bbf86b7cd328bef90b0c981bedc7 https://github.com/pytest-dev/pytest/commit/ebb4c4715560bbf86b7cd328bef90b0c981bedc7 Author: Cyrus Maden Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: R doc/.DS_Store Log Message: ----------- Delete .DS_Store Commit: c3d420bf759dd306119d96c63d6ac98dab32023f https://github.com/pytest-dev/pytest/commit/c3d420bf759dd306119d96c63d6ac98dab32023f Author: Cyrus Maden Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: R doc/en/.DS_Store Log Message: ----------- Delete .DS_Store Commit: 0b6df94b12a841a3de2fbced9e6d75c65f29761d https://github.com/pytest-dev/pytest/commit/0b6df94b12a841a3de2fbced9e6d75c65f29761d Author: Cyrus Maden Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: R .DS_Store Log Message: ----------- Delete .DS_Store Commit: 0ab57c413957693aea3a05f959f42d1dac3bd560 https://github.com/pytest-dev/pytest/commit/0ab57c413957693aea3a05f959f42d1dac3bd560 Author: Cyrus Maden Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M doc/en/getting-started.rst Log Message: ----------- Typo fix: "handeling" --> "handling" Commit: 196dcc37a81aa5a0155f10a36a3131338108fa48 https://github.com/pytest-dev/pytest/commit/196dcc37a81aa5a0155f10a36a3131338108fa48 Author: Brian Maissy Date: 2018-01-21 (Sun, 21 Jan 2018) Changed paths: M _pytest/hookspec.py A changelog/2698.doc Log Message: ----------- Clarify a possible confusion when using pytest_fixture_setup with fixture functions that return None Commit: 5c0b340a4b76e4fa5063dfec25508c31fef2c613 https://github.com/pytest-dev/pytest/commit/5c0b340a4b76e4fa5063dfec25508c31fef2c613 Author: Brian Maissy Date: 2018-01-21 (Sun, 21 Jan 2018) Changed paths: A changelog/2457.doc M doc/en/warnings.rst Log Message: ----------- Clarify that warning capturing doesn't change the warning filter by default Commit: 8994603d46d32abc50f50a8967ed042c764b2172 https://github.com/pytest-dev/pytest/commit/8994603d46d32abc50f50a8967ed042c764b2172 Author: Brian Maissy Date: 2018-01-21 (Sun, 21 Jan 2018) Changed paths: M _pytest/hookspec.py A changelog/2423.doc Log Message: ----------- Document hooks (defined with historic=True) which cannot be used with hookwrapper=True Commit: 8a8797df8034fb37ced96406429fe6f1b28bbf1b https://github.com/pytest-dev/pytest/commit/8a8797df8034fb37ced96406429fe6f1b28bbf1b Author: Bruno Oliveira Date: 2018-01-21 (Sun, 21 Jan 2018) Changed paths: M changelog/2423.doc Log Message: ----------- Small changelog formatting Commit: e5739a3115152c6c65069ec625ab2f18f80743f6 https://github.com/pytest-dev/pytest/commit/e5739a3115152c6c65069ec625ab2f18f80743f6 Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: A changelog/2457.doc M doc/en/warnings.rst Log Message: ----------- Merge pull request #3136 from brianmaissy/doc/document_warning_filtering_behavior Clarify that warning capturing doesn't change the warning filter by d? Commit: 060f68bd901904489b5dcf10367370224831f83b https://github.com/pytest-dev/pytest/commit/060f68bd901904489b5dcf10367370224831f83b Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M _pytest/hookspec.py A changelog/2423.doc Log Message: ----------- Merge pull request #3137 from brianmaissy/doc/note_that_certain_hooks_cant_be_used_with_hookwrapper Document hooks (defined with historic=True) which cannot be used with hookwrapper=True Commit: 0d96a5bf9059e51324ac24ec24d68af1c35db6d8 https://github.com/pytest-dev/pytest/commit/0d96a5bf9059e51324ac24ec24d68af1c35db6d8 Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M _pytest/hookspec.py A changelog/2698.doc Log Message: ----------- Merge pull request #3135 from brianmaissy/doc/clarify_pytest_fixture_setup_with_fixture_that_returns_None Clarify a possible confusion when using pytest_fixture_setup with fixture functions that return None Commit: baa189f5a351d41aee291fb46f564dc33b58abbf https://github.com/pytest-dev/pytest/commit/baa189f5a351d41aee291fb46f564dc33b58abbf Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M AUTHORS A changelog/3131.doc M doc/en/getting-started.rst Log Message: ----------- Merge pull request #3131 from soyrice/master Improve readability of Getting Started guide Commit: ff90c9e23765159469a0d21fee6e5fedc13f06d6 https://github.com/pytest-dev/pytest/commit/ff90c9e23765159469a0d21fee6e5fedc13f06d6 Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: A changelog/2022.bugfix M testing/test_pdb.py Log Message: ----------- Merge pull request #3116 from brianmaissy/pexpect_test_hangs_on_mac use flush in order to avoid hanging on mac Commit: 4285325cb88d90ad36724de9d441e51da614f249 https://github.com/pytest-dev/pytest/commit/4285325cb88d90ad36724de9d441e51da614f249 Author: Brian Maissy Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: A changelog/3143.doc M doc/en/usage.rst Log Message: ----------- Added note that calling pytest.main multiple times from the same process is not recommended because of import caching Commit: 3bc7ced97ae2406916f4321ed63d2a4376e4a1aa https://github.com/pytest-dev/pytest/commit/3bc7ced97ae2406916f4321ed63d2a4376e4a1aa Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: A changelog/3143.doc M doc/en/usage.rst Log Message: ----------- Merge pull request #3153 from brianmaissy/document_not_to_call_main_multiple_times Added note that calling pytest.main multiple times from the same process is not recommended because of import caching Commit: aff463a3c4535c859a3fdfc54c96ec64a78e8834 https://github.com/pytest-dev/pytest/commit/aff463a3c4535c859a3fdfc54c96ec64a78e8834 Author: Bruno Oliveira Date: 2018-01-27 (Sat, 27 Jan 2018) Changed paths: M AUTHORS M _pytest/_code/code.py M _pytest/_code/source.py M _pytest/hookspec.py A changelog/2022.bugfix A changelog/2423.doc A changelog/2457.doc A changelog/2698.doc A changelog/3067.trivial A changelog/3129.trivial A changelog/3131.doc A changelog/3143.doc M doc/en/backwards-compatibility.rst M doc/en/example/assertion/failure_demo.py M doc/en/example/reportingdemo.rst M doc/en/example/simple.rst M doc/en/getting-started.rst M doc/en/parametrize.rst M doc/en/usage.rst M doc/en/warnings.rst M doc/en/writing_plugins.rst M extra/get_issues.py M testing/acceptance_test.py M testing/code/test_excinfo.py M testing/code/test_source.py M testing/python/collect.py M testing/python/metafunc.py M testing/test_argcomplete.py M testing/test_assertrewrite.py M testing/test_cache.py M testing/test_collection.py M testing/test_config.py M testing/test_conftest.py M testing/test_parseopt.py M testing/test_pdb.py M testing/test_pluginmanager.py M testing/test_recwarn.py M testing/test_runner.py M testing/test_terminal.py Log Message: ----------- Merge remote-tracking branch 'upstream/master' into features Compare: https://github.com/pytest-dev/pytest/compare/b3247c1d03f0...aff463a3c453 From nicoddemus at gmail.com Sat Jan 27 20:21:10 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Sat, 27 Jan 2018 17:21:10 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] ee6c9f: optimize fixtures.reorder_items Message-ID: <5a6d2586c5235_4b992b0e76875c08102229@hookshot-fe-32b5f5b.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: ee6c9f50a25e8bf2425968afe6d7ed0f359a6d17 https://github.com/pytest-dev/pytest/commit/ee6c9f50a25e8bf2425968afe6d7ed0f359a6d17 Author: Aaron Date: 2018-01-11 (Thu, 11 Jan 2018) Changed paths: M _pytest/fixtures.py Log Message: ----------- optimize fixtures.reorder_items Commit: 4a704bbb55191ccd10b22c4ea4cf8737e63f8e51 https://github.com/pytest-dev/pytest/commit/4a704bbb55191ccd10b22c4ea4cf8737e63f8e51 Author: Aaron Date: 2018-01-11 (Thu, 11 Jan 2018) Changed paths: M _pytest/fixtures.py Log Message: ----------- fix reorder_items_atscope ordering Commit: 3d289b803d24d21424b94333c10975748e00e0bb https://github.com/pytest-dev/pytest/commit/3d289b803d24d21424b94333c10975748e00e0bb Author: Aaron Date: 2018-01-11 (Thu, 11 Jan 2018) Changed paths: M AUTHORS A changelog/3107.feature Log Message: ----------- update AUTHORS and changelog Commit: d314691fd3c8bb5b10d96d28777fa2e5ee506bcc https://github.com/pytest-dev/pytest/commit/d314691fd3c8bb5b10d96d28777fa2e5ee506bcc Author: Aaron Date: 2018-01-12 (Fri, 12 Jan 2018) Changed paths: M changelog/3107.feature Log Message: ----------- more descriptive changelog message Commit: 0e1be01b7a46e0d7425ccc425e26030e4bedcbd7 https://github.com/pytest-dev/pytest/commit/0e1be01b7a46e0d7425ccc425e26030e4bedcbd7 Author: Bruno Oliveira Date: 2018-01-27 (Sat, 27 Jan 2018) Changed paths: M AUTHORS M _pytest/fixtures.py A changelog/3107.feature Log Message: ----------- Merge pull request #3108 from cheezman34/features Optimize reorder_items in fixtures.py Compare: https://github.com/pytest-dev/pytest/compare/aff463a3c453...0e1be01b7a46 From nicoddemus at gmail.com Mon Jan 29 12:42:57 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Mon, 29 Jan 2018 09:42:57 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] a5e60b: implement #3130 - adding record_xml_attribute fixt... Message-ID: <5a6f5d2184a9a_a1c2ad752177c04160f9@hookshot-fe-6e9b612.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: a5e60b6a2d7f8044a08334cd4ca1a9873489528e https://github.com/pytest-dev/pytest/commit/a5e60b6a2d7f8044a08334cd4ca1a9873489528e Author: Raphael Castaneda Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M AUTHORS M _pytest/junitxml.py A changelog/3130.feature M doc/en/usage.rst M testing/test_junitxml.py Log Message: ----------- implement #3130 - adding record_xml_attribute fixture update incorrect expected attribute value in test_record_attribute attr names must be strings Update CHANGELOG formatting update usage documentation Fix versionadded for record_xml_attribute Indent the xml schema properly inside the warning box in the docs Commit: 49773b573f830d74ba5c3e1791ceced1b2614b25 https://github.com/pytest-dev/pytest/commit/49773b573f830d74ba5c3e1791ceced1b2614b25 Author: Bruno Oliveira Date: 2018-01-29 (Mon, 29 Jan 2018) Changed paths: M AUTHORS M _pytest/junitxml.py A changelog/3130.feature M doc/en/usage.rst M testing/test_junitxml.py Log Message: ----------- Merge pull request #3132 from raphaelcastaneda/feature/add-record-xml-attribute implement #3130 - add record_xml_attribute fixture Compare: https://github.com/pytest-dev/pytest/compare/32979def7d20...49773b573f83 From nicoddemus at gmail.com Tue Jan 30 14:41:20 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 30 Jan 2018 11:41:20 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] ebab1b: live-logging: Colorize levelname Message-ID: <5a70ca60dcc11_168482b03c158dc1c10027b@hookshot-fe-dfcc362.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: ebab1b6c69e3b5cd436bfaf31c957c3df1649c64 https://github.com/pytest-dev/pytest/commit/ebab1b6c69e3b5cd436bfaf31c957c3df1649c64 Author: Thomas Hisch Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M _pytest/logging.py A changelog/3142.feature A testing/logging/test_formatter.py Log Message: ----------- live-logging: Colorize levelname Commit: 71a7b3c062d51c61ee8b1ac479b1260d541918c6 https://github.com/pytest-dev/pytest/commit/71a7b3c062d51c61ee8b1ac479b1260d541918c6 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M _pytest/logging.py A changelog/3142.feature A testing/logging/test_formatter.py Log Message: ----------- Merge pull request #3142 from thisch/only_colorize_levelname Colorize live-log levelnames Compare: https://github.com/pytest-dev/pytest/compare/49773b573f83...71a7b3c062d5 From nicoddemus at gmail.com Tue Jan 30 17:07:31 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 30 Jan 2018 14:07:31 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 4c148b: Fix imports in failure_demo.py Message-ID: <5a70eca390724_29662b162291fc04816e5@hookshot-fe-d252ca1.cp1-iad.github.net.mail> Branch: refs/tags/3.4.0 Home: https://github.com/pytest-dev/pytest Commit: 4c148bd0ef8a0cc9d15d7aaf6d3cce044d99bfa3 https://github.com/pytest-dev/pytest/commit/4c148bd0ef8a0cc9d15d7aaf6d3cce044d99bfa3 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M doc/en/example/assertion/failure_demo.py Log Message: ----------- Fix imports in failure_demo.py Commit: 13ee1cffedbce45bd4c01cf72b661f6619c527d5 https://github.com/pytest-dev/pytest/commit/13ee1cffedbce45bd4c01cf72b661f6619c527d5 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M HOWTORELEASE.rst Log Message: ----------- Suggest to update all dependencies when preparing releases Commit: 489e638b4eacc631959ac54017ec4863dd3d751e https://github.com/pytest-dev/pytest/commit/489e638b4eacc631959ac54017ec4863dd3d751e Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M CHANGELOG.rst R changelog/2022.bugfix R changelog/2147.removal R changelog/2423.doc R changelog/2457.doc R changelog/2527.feature R changelog/2698.doc R changelog/2953.trivial R changelog/2976.trivial R changelog/3013.feature R changelog/3016.bugfix R changelog/3038.feature R changelog/3067.trivial R changelog/3074.bugfix R changelog/3076.doc R changelog/3088.bugfix R changelog/3092.doc R changelog/3101.feature R changelog/3103.bugfix R changelog/3107.feature R changelog/3117.feature R changelog/3129.trivial R changelog/3130.feature R changelog/3131.doc R changelog/3138.feature R changelog/3142.feature 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/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/usage.rst Log Message: ----------- Preparing release version 3.4.0 Commit: 527845ef298d94b1e101684bb52e5eac3ce53485 https://github.com/pytest-dev/pytest/commit/527845ef298d94b1e101684bb52e5eac3ce53485 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M CHANGELOG.rst Log Message: ----------- Changelog adjustments suggested during review Compare: https://github.com/pytest-dev/pytest/compare/4c148bd0ef8a^...527845ef298d From nicoddemus at gmail.com Tue Jan 30 17:08:37 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 30 Jan 2018 14:08:37 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 4c148b: Fix imports in failure_demo.py Message-ID: <5a70ece5b30b4_3de72b0b05bf9c04104596@hookshot-fe-d2afb11.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: 4c148bd0ef8a0cc9d15d7aaf6d3cce044d99bfa3 https://github.com/pytest-dev/pytest/commit/4c148bd0ef8a0cc9d15d7aaf6d3cce044d99bfa3 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M doc/en/example/assertion/failure_demo.py Log Message: ----------- Fix imports in failure_demo.py Commit: 13ee1cffedbce45bd4c01cf72b661f6619c527d5 https://github.com/pytest-dev/pytest/commit/13ee1cffedbce45bd4c01cf72b661f6619c527d5 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M HOWTORELEASE.rst Log Message: ----------- Suggest to update all dependencies when preparing releases Commit: 489e638b4eacc631959ac54017ec4863dd3d751e https://github.com/pytest-dev/pytest/commit/489e638b4eacc631959ac54017ec4863dd3d751e Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M CHANGELOG.rst R changelog/2022.bugfix R changelog/2147.removal R changelog/2423.doc R changelog/2457.doc R changelog/2527.feature R changelog/2698.doc R changelog/2953.trivial R changelog/2976.trivial R changelog/3013.feature R changelog/3016.bugfix R changelog/3038.feature R changelog/3067.trivial R changelog/3074.bugfix R changelog/3076.doc R changelog/3088.bugfix R changelog/3092.doc R changelog/3101.feature R changelog/3103.bugfix R changelog/3107.feature R changelog/3117.feature R changelog/3129.trivial R changelog/3130.feature R changelog/3131.doc R changelog/3138.feature R changelog/3142.feature 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/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/usage.rst Log Message: ----------- Preparing release version 3.4.0 Commit: 527845ef298d94b1e101684bb52e5eac3ce53485 https://github.com/pytest-dev/pytest/commit/527845ef298d94b1e101684bb52e5eac3ce53485 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M CHANGELOG.rst Log Message: ----------- Changelog adjustments suggested during review Commit: dc9a9ec4c29d8a9891f1cfc4d112a51d0e90ecd5 https://github.com/pytest-dev/pytest/commit/dc9a9ec4c29d8a9891f1cfc4d112a51d0e90ecd5 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M CHANGELOG.rst M HOWTORELEASE.rst R changelog/2022.bugfix R changelog/2147.removal R changelog/2423.doc R changelog/2457.doc R changelog/2527.feature R changelog/2698.doc R changelog/2953.trivial R changelog/2976.trivial R changelog/3013.feature R changelog/3016.bugfix R changelog/3038.feature R changelog/3067.trivial R changelog/3074.bugfix R changelog/3076.doc R changelog/3088.bugfix R changelog/3092.doc R changelog/3101.feature R changelog/3103.bugfix R changelog/3107.feature R changelog/3117.feature R changelog/3129.trivial R changelog/3130.feature R changelog/3131.doc R changelog/3138.feature R changelog/3142.feature 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/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/usage.rst Log Message: ----------- Merge pull request #3162 from nicoddemus/release-3.4.0 Release 3.4.0 Compare: https://github.com/pytest-dev/pytest/compare/71a7b3c062d5...dc9a9ec4c29d From nicoddemus at gmail.com Tue Jan 30 17:10:11 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 30 Jan 2018 14:10:11 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 912330: Extend _pytest.python._idval to return __name__ of... Message-ID: <5a70ed43c6b54_2f0a2add6cda7c0c156df@hookshot-fe-6b2eebc.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 912330a7e2dfd67db252de4197b00a982043caf3 https://github.com/pytest-dev/pytest/commit/912330a7e2dfd67db252de4197b00a982043caf3 Author: ST John Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M _pytest/python.py Log Message: ----------- Extend _pytest.python._idval to return __name__ of functions as well, not just for classes Commit: 5085aa2bce6dc6494f889fa73aa50965a499ea5a https://github.com/pytest-dev/pytest/commit/5085aa2bce6dc6494f889fa73aa50965a499ea5a Author: ST John Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: A changelog/2976.trivial Log Message: ----------- add changelog file Commit: fdd4abb88a649964259a51db53507cd67a7a60d2 https://github.com/pytest-dev/pytest/commit/fdd4abb88a649964259a51db53507cd67a7a60d2 Author: Bruno Oliveira Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M changelog/2976.trivial Log Message: ----------- Small rewording of the CHANGELOG Commit: e66473853c0ecd80c233eccb8833d6d19d8ac07b https://github.com/pytest-dev/pytest/commit/e66473853c0ecd80c233eccb8833d6d19d8ac07b Author: ST John Date: 2017-11-30 (Thu, 30 Nov 2017) Changed paths: M testing/python/metafunc.py Log Message: ----------- add test Commit: 1fe2e2cb03070a8a3d6d4becf79800406f9aaca3 https://github.com/pytest-dev/pytest/commit/1fe2e2cb03070a8a3d6d4becf79800406f9aaca3 Author: ST John Date: 2017-11-30 (Thu, 30 Nov 2017) Changed paths: M changelog/2976.trivial Log Message: ----------- Merge branch 'master' of https://github.com/st--/pytest Commit: 652936f47fd9167fbfd858fc33c3ed431a49f230 https://github.com/pytest-dev/pytest/commit/652936f47fd9167fbfd858fc33c3ed431a49f230 Author: ST John Date: 2017-11-30 (Thu, 30 Nov 2017) Changed paths: M testing/python/metafunc.py Log Message: ----------- make linter happier Commit: 294729962d1f9d0afc95650cbc1c315a249a7094 https://github.com/pytest-dev/pytest/commit/294729962d1f9d0afc95650cbc1c315a249a7094 Author: Bruno Oliveira Date: 2017-11-30 (Thu, 30 Nov 2017) Changed paths: M _pytest/python.py A changelog/2976.trivial M testing/python/metafunc.py Log Message: ----------- Merge pull request #2976 from st--/master Extend _pytest.python._idval to return __name__ of functions as well Commit: 655146e522d611925d0bcf5778b7ae96b2cf379f https://github.com/pytest-dev/pytest/commit/655146e522d611925d0bcf5778b7ae96b2cf379f Author: Bruno Oliveira Date: 2017-12-05 (Tue, 05 Dec 2017) Changed paths: M .github/PULL_REQUEST_TEMPLATE.md M CHANGELOG.rst M _pytest/config.py M _pytest/fixtures.py M _pytest/terminal.py R changelog/2920.bugfix R changelog/2949.trivial R changelog/2956.bugfix R changelog/2957.bugfix R changelog/2963.doc M doc/en/announce/index.rst A doc/en/announce/release-3.3.1.rst M testing/deprecated_test.py M testing/test_terminal.py Log Message: ----------- Merge remote-tracking branch 'upstream/master' into features Commit: f8f1a52ea0f844226b25364c3d764e52f10c605a https://github.com/pytest-dev/pytest/commit/f8f1a52ea0f844226b25364c3d764e52f10c605a Author: Bruno Oliveira Date: 2017-12-11 (Mon, 11 Dec 2017) Changed paths: M CHANGELOG.rst M _pytest/_code/source.py M _pytest/assertion/rewrite.py M _pytest/assertion/util.py M _pytest/pytester.py A changelog/3015.trivial A changelog/3018.trivial M doc/en/capture.rst M testing/acceptance_test.py M testing/code/test_source.py M testing/test_conftest.py M testing/test_pdb.py M testing/test_pytester.py M tox.ini Log Message: ----------- Merge remote-tracking branch 'upstream/master' into features Commit: 370daf0441dd70dc082490de80ead536c82566c0 https://github.com/pytest-dev/pytest/commit/370daf0441dd70dc082490de80ead536c82566c0 Author: Segev Finer Date: 2017-12-16 (Sat, 16 Dec 2017) Changed paths: M _pytest/terminal.py A changelog/3038.feature M testing/test_terminal.py Log Message: ----------- Use classic console output when -s is used Fixes #3038 Commit: 0a2735a27544a81fcaebaec7305ff9d9acd1def7 https://github.com/pytest-dev/pytest/commit/0a2735a27544a81fcaebaec7305ff9d9acd1def7 Author: Bruno Oliveira Date: 2017-12-16 (Sat, 16 Dec 2017) Changed paths: M changelog/3038.feature Log Message: ----------- Reword changelog entry Commit: d87279115dec63f87f93a1efa4145fa0f78b001a https://github.com/pytest-dev/pytest/commit/d87279115dec63f87f93a1efa4145fa0f78b001a Author: Bruno Oliveira Date: 2017-12-16 (Sat, 16 Dec 2017) Changed paths: M AUTHORS M _pytest/assertion/rewrite.py M _pytest/fixtures.py M _pytest/hookspec.py M _pytest/logging.py M _pytest/main.py M _pytest/pytester.py M _pytest/terminal.py A changelog/2981.bugfix A changelog/2985.bugfix A changelog/2995.bugfix A changelog/3021.trivial A changelog/3038.feature M doc/en/writing_plugins.rst M tasks/generate.py M testing/acceptance_test.py M testing/test_assertrewrite.py M testing/test_terminal.py Log Message: ----------- Merge pull request #3041 from segevfiner/capture-no-disable-progress Use classic console output when -s is used Commit: 67bd60d5c69228d6e71bfd21b7e33426e4617e2b https://github.com/pytest-dev/pytest/commit/67bd60d5c69228d6e71bfd21b7e33426e4617e2b Author: Jurko Gospodneti? Date: 2017-12-17 (Sun, 17 Dec 2017) Changed paths: M _pytest/pytester.py Log Message: ----------- clean up Testdir taking snapshots & restoring global Python state Now extracted to new CwdSnapshot, SysModulesSnapshot & SysPathsSnapshot classes, each saving the state they are interested in on instantiation and restoring it in its `restore()` method. Commit: f3c9c6e8a80a0f87a775cad2fdea1dd1981352b8 https://github.com/pytest-dev/pytest/commit/f3c9c6e8a80a0f87a775cad2fdea1dd1981352b8 Author: Jurko Gospodneti? Date: 2017-12-17 (Sun, 17 Dec 2017) Changed paths: M _pytest/pytester.py M testing/acceptance_test.py M testing/deprecated_test.py M testing/test_pytester.py Log Message: ----------- fix restoring Python state after in-process pytest runs Now each in-process pytest run saves a snapshot of important global Python state and restores it after the test completes, including the list of loaded modules & the Python path settings. Previously only the loaded package data was getting restored, but that was also reverting any loaded package changes done in the test triggering the pytest runs, and not only those done by the pytest runs themselves. Updated acceptance tests broken by this change, which were only passing before by accident as they were making multiple pytest runs with later ones depending on sys.path changes left behind by the initial one. Commit: d85a3ca19adac20ca4512388f4b5b75bdcf1e079 https://github.com/pytest-dev/pytest/commit/d85a3ca19adac20ca4512388f4b5b75bdcf1e079 Author: Jurko Gospodneti? Date: 2017-12-17 (Sun, 17 Dec 2017) Changed paths: A changelog/3016.bugfix Log Message: ----------- add changelog entry Commit: afc607cfd81458d4e4f3b1f3cf8cc931b933907e https://github.com/pytest-dev/pytest/commit/afc607cfd81458d4e4f3b1f3cf8cc931b933907e Author: Ronny Pfannschmidt Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M _pytest/fixtures.py M _pytest/hookspec.py M _pytest/main.py M _pytest/nodes.py M _pytest/python.py M doc/en/writing_plugins.rst M pytest.py M testing/python/collect.py M testing/test_resultlog.py M tox.ini Log Message: ----------- move node base classes from main to nodes Commit: 94608c6110ac45e52c752501c3c50d9df977436a https://github.com/pytest-dev/pytest/commit/94608c6110ac45e52c752501c3c50d9df977436a Author: Ronny Pfannschmidt Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M _pytest/nodes.py Log Message: ----------- port _Compatproperty to attrs Commit: 0d83dd1b31132162ebb41a104749f3d379400c2d https://github.com/pytest-dev/pytest/commit/0d83dd1b31132162ebb41a104749f3d379400c2d Author: Ronny Pfannschmidt Date: 2017-12-18 (Mon, 18 Dec 2017) Changed paths: M _pytest/pytester.py A changelog/3016.bugfix M testing/acceptance_test.py M testing/deprecated_test.py M testing/test_pytester.py Log Message: ----------- Merge pull request #3016 from jurko-gospodnetic/clean-up-state-after-in-process-pytest-runs Clean up state after in process pytest runs Commit: c70efaa0fb955ee4276ebd6d08ccc73d821a22ed https://github.com/pytest-dev/pytest/commit/c70efaa0fb955ee4276ebd6d08ccc73d821a22ed Author: Bruno Oliveira Date: 2017-12-19 (Tue, 19 Dec 2017) Changed paths: M _pytest/fixtures.py M _pytest/hookspec.py M _pytest/main.py M _pytest/nodes.py M _pytest/python.py M doc/en/writing_plugins.rst M pytest.py M testing/python/collect.py M testing/test_resultlog.py M tox.ini Log Message: ----------- Merge pull request #3047 from RonnyPfannschmidt/mark-newapi move node base classes from main to nodes Commit: 93306f6a5ec92d1feef6c3286688ce444a39115a https://github.com/pytest-dev/pytest/commit/93306f6a5ec92d1feef6c3286688ce444a39115a Author: Bruno Oliveira Date: 2018-01-09 (Tue, 09 Jan 2018) Changed paths: M AUTHORS M CHANGELOG.rst M CONTRIBUTING.rst M _pytest/pytester.py M _pytest/python.py M _pytest/skipping.py R changelog/2981.bugfix R changelog/2985.bugfix R changelog/2995.bugfix R changelog/3015.trivial R changelog/3018.trivial R changelog/3021.trivial A changelog/3074.bugfix A changelog/3076.doc A changelog/3092.doc M doc/en/announce/index.rst A doc/en/announce/release-3.3.2.rst M doc/en/doctest.rst M doc/en/example/simple.rst M doc/en/parametrize.rst M doc/en/projects.rst M doc/en/tmpdir.rst M doc/en/writing_plugins.rst M setup.py M testing/acceptance_test.py M testing/code/test_excinfo.py M testing/test_runner.py M testing/test_skipping.py M tox.ini Log Message: ----------- Merge remote-tracking branch 'upstream/master' into features Commit: b68b80aec9562bd9757205be2c1286186e1c0043 https://github.com/pytest-dev/pytest/commit/b68b80aec9562bd9757205be2c1286186e1c0043 Author: Bruno Oliveira Date: 2018-01-09 (Tue, 09 Jan 2018) Changed paths: M _pytest/hookspec.py M _pytest/runner.py A changelog/3101.feature M doc/en/writing_plugins.rst M testing/test_runner.py Log Message: ----------- Add new pytest_runtest_logfinish hook Fix #3101 Commit: b0032ba2b3258ada67bb1fa705c18af1741778fd https://github.com/pytest-dev/pytest/commit/b0032ba2b3258ada67bb1fa705c18af1741778fd Author: Ronny Pfannschmidt Date: 2018-01-10 (Wed, 10 Jan 2018) Changed paths: M _pytest/hookspec.py M _pytest/runner.py A changelog/3101.feature M doc/en/writing_plugins.rst M testing/test_runner.py Log Message: ----------- Merge pull request #3102 from nicoddemus/logfinish-hook-3101 Add new pytest_runtest_logfinish hook Commit: ee6c9f50a25e8bf2425968afe6d7ed0f359a6d17 https://github.com/pytest-dev/pytest/commit/ee6c9f50a25e8bf2425968afe6d7ed0f359a6d17 Author: Aaron Date: 2018-01-11 (Thu, 11 Jan 2018) Changed paths: M _pytest/fixtures.py Log Message: ----------- optimize fixtures.reorder_items Commit: 4a704bbb55191ccd10b22c4ea4cf8737e63f8e51 https://github.com/pytest-dev/pytest/commit/4a704bbb55191ccd10b22c4ea4cf8737e63f8e51 Author: Aaron Date: 2018-01-11 (Thu, 11 Jan 2018) Changed paths: M _pytest/fixtures.py Log Message: ----------- fix reorder_items_atscope ordering Commit: 3d289b803d24d21424b94333c10975748e00e0bb https://github.com/pytest-dev/pytest/commit/3d289b803d24d21424b94333c10975748e00e0bb Author: Aaron Date: 2018-01-11 (Thu, 11 Jan 2018) Changed paths: M AUTHORS A changelog/3107.feature Log Message: ----------- update AUTHORS and changelog Commit: 5939b336cd21c7ef7b7896ed80097765a0a22db7 https://github.com/pytest-dev/pytest/commit/5939b336cd21c7ef7b7896ed80097765a0a22db7 Author: Bruno Oliveira Date: 2018-01-11 (Thu, 11 Jan 2018) Changed paths: M _pytest/terminal.py A changelog/3088.bugfix M testing/test_terminal.py Log Message: ----------- Fix progress report when tests fail during teardown Fix #3088 Commit: abbdb6005147edb6f3fbd8252b29be92a5d36845 https://github.com/pytest-dev/pytest/commit/abbdb6005147edb6f3fbd8252b29be92a5d36845 Author: Bruno Oliveira Date: 2018-01-12 (Fri, 12 Jan 2018) Changed paths: M _pytest/terminal.py Log Message: ----------- Move logic determining if progress should be displayed to a function Commit: 01e37fe892d2f77ee767d8e22dfd5201a3fbefc5 https://github.com/pytest-dev/pytest/commit/01e37fe892d2f77ee767d8e22dfd5201a3fbefc5 Author: Ronny Pfannschmidt Date: 2018-01-12 (Fri, 12 Jan 2018) Changed paths: M _pytest/terminal.py A changelog/3088.bugfix M testing/test_terminal.py Log Message: ----------- Merge pull request #3110 from nicoddemus/progress-teardown-3088 Fix progress report when tests fail during teardown Commit: d314691fd3c8bb5b10d96d28777fa2e5ee506bcc https://github.com/pytest-dev/pytest/commit/d314691fd3c8bb5b10d96d28777fa2e5ee506bcc Author: Aaron Date: 2018-01-12 (Fri, 12 Jan 2018) Changed paths: M changelog/3107.feature Log Message: ----------- more descriptive changelog message Commit: 076fb56f8569ac6424182a174fc3a777c5ae75f4 https://github.com/pytest-dev/pytest/commit/076fb56f8569ac6424182a174fc3a777c5ae75f4 Author: feuillemorte Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: M _pytest/mark.py M testing/test_mark.py Log Message: ----------- show a simple and easy error when keyword expressions trigger a syntax error Commit: dff597dcd02f65eaefdc2be2e1a6123c3d65b35f https://github.com/pytest-dev/pytest/commit/dff597dcd02f65eaefdc2be2e1a6123c3d65b35f Author: feuillemorte Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: A changelog/2953.trivial Log Message: ----------- Add changelog entry Commit: 648d5d0c6bdd5769580b047208891729b8c6d12f https://github.com/pytest-dev/pytest/commit/648d5d0c6bdd5769580b047208891729b8c6d12f Author: feuillemorte Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: M _pytest/mark.py Log Message: ----------- #2953 fix comments: use keyword module Commit: 5d3f7d7142bed840ee9f1dfbeeaf8717c93589c9 https://github.com/pytest-dev/pytest/commit/5d3f7d7142bed840ee9f1dfbeeaf8717c93589c9 Author: feuillemorte Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: A changelog/2953.trivial Log Message: ----------- Merge branch '2953-keyword-expressions-error' of github.com:feuillemorte/pytest into 2953-keyword-expressions-error Commit: 86e1b442308d71ca6ecb79d5a35d532330eecf46 https://github.com/pytest-dev/pytest/commit/86e1b442308d71ca6ecb79d5a35d532330eecf46 Author: Bruno Oliveira Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: M changelog/2953.trivial Log Message: ----------- Improve changelog formatting Commit: 8433e2ba04b39a4edca9795f4df69f843ce8106a https://github.com/pytest-dev/pytest/commit/8433e2ba04b39a4edca9795f4df69f843ce8106a Author: feuillemorte Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: M _pytest/mark.py M testing/test_mark.py Log Message: ----------- #2953 fix comments: fix exception type Commit: dc79116de3e9081d5a4f7b898e070a6a002d09e7 https://github.com/pytest-dev/pytest/commit/dc79116de3e9081d5a4f7b898e070a6a002d09e7 Author: feuillemorte Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: M changelog/2953.trivial Log Message: ----------- Merge branch '2953-keyword-expressions-error' of github.com:feuillemorte/pytest into 2953-keyword-expressions-error Commit: e3406e0818f4496f5d3c601da66b6dca9f53c3ba https://github.com/pytest-dev/pytest/commit/e3406e0818f4496f5d3c601da66b6dca9f53c3ba Author: Bruno Oliveira Date: 2018-01-16 (Tue, 16 Jan 2018) Changed paths: M _pytest/config.py Log Message: ----------- Show usage errors in red Commit: 1fd67c90009b711ff86e8f0f5ac39575f6a08992 https://github.com/pytest-dev/pytest/commit/1fd67c90009b711ff86e8f0f5ac39575f6a08992 Author: Florian Bruhin Date: 2018-01-17 (Wed, 17 Jan 2018) Changed paths: M _pytest/config.py M _pytest/mark.py A changelog/2953.trivial M testing/test_mark.py Log Message: ----------- Merge pull request #3121 from feuillemorte/2953-keyword-expressions-error #2953 show a simple and easy error when keyword expressions trigger a syntax error Commit: 7ea5a22657027d87e7b35f456e9b044a097c910e https://github.com/pytest-dev/pytest/commit/7ea5a22657027d87e7b35f456e9b044a097c910e Author: Anders Hovm?ller Date: 2018-01-19 (Fri, 19 Jan 2018) Changed paths: M AUTHORS M _pytest/logging.py A changelog/3117.feature M doc/en/logging.rst M testing/logging/test_fixture.py Log Message: ----------- Access captures logs in teardown Commit: c4c968fe6979cc2ca7c321b8a2966b7ee52f0430 https://github.com/pytest-dev/pytest/commit/c4c968fe6979cc2ca7c321b8a2966b7ee52f0430 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M changelog/3117.feature Log Message: ----------- Reword CHANGELOG after introduction of caplog.get_handler() Commit: 3b3d237f07cfbf3663e43e8709b50e406e9a0ce3 https://github.com/pytest-dev/pytest/commit/3b3d237f07cfbf3663e43e8709b50e406e9a0ce3 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M AUTHORS M _pytest/logging.py A changelog/3117.feature M doc/en/logging.rst M testing/logging/test_fixture.py Log Message: ----------- Merge pull request #3117 from boxed/access_logs_in_teardown Access captures logs in teardown Commit: 5ad1313b8a18fa3862623d2360cbeb39c202b838 https://github.com/pytest-dev/pytest/commit/5ad1313b8a18fa3862623d2360cbeb39c202b838 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- log_cli must now be enabled explicitly Ref: #3013 Commit: 8dcd2718aa90620d9fdc872f49ba8ccbe9c9dd13 https://github.com/pytest-dev/pytest/commit/8dcd2718aa90620d9fdc872f49ba8ccbe9c9dd13 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- No longer change the level of any logger unless requested explicitly Ref: #3013 Commit: aca1b06747a432e4a7bc3b8b3f98a2a59192c785 https://github.com/pytest-dev/pytest/commit/aca1b06747a432e4a7bc3b8b3f98a2a59192c785 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_fixture.py Log Message: ----------- Undo log level set by caplog.set_level at the end of the test Otherwise this leaks the log level information to other tests Ref: #3013 Commit: 8d735f3e1d3ff24ea15759c4a8abb0bc5776b811 https://github.com/pytest-dev/pytest/commit/8d735f3e1d3ff24ea15759c4a8abb0bc5776b811 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Live log option now writes to the terminal reporter Ref: #3013 Commit: 6bb739516fe86fb3d66d04f6ad354ab37e781b66 https://github.com/pytest-dev/pytest/commit/6bb739516fe86fb3d66d04f6ad354ab37e781b66 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M doc/en/logging.rst Log Message: ----------- Update logging docs with the new changes in 3.4 Ref: #3013 Commit: c53b72fd7b05793b091eb334de1224f15278993b https://github.com/pytest-dev/pytest/commit/c53b72fd7b05793b091eb334de1224f15278993b Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: A changelog/3013.feature Log Message: ----------- Add CHANGELOG for 3013 Commit: 5d89a939779a0aafdf99dd9f5e60ec306a53cddd https://github.com/pytest-dev/pytest/commit/5d89a939779a0aafdf99dd9f5e60ec306a53cddd Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Small improvements to tests suggested during review Commit: 8f6a5928f76f37323ea9cabf1c58472c3f1ac400 https://github.com/pytest-dev/pytest/commit/8f6a5928f76f37323ea9cabf1c58472c3f1ac400 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M doc/en/logging.rst M testing/logging/test_reporting.py Log Message: ----------- Add newline before log messages and enable -v output when log_cli is enabled Commit: 97a4967b036fdbf71ad30cf6505cf459b40d8a78 https://github.com/pytest-dev/pytest/commit/97a4967b036fdbf71ad30cf6505cf459b40d8a78 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py Log Message: ----------- Improve code formatting Commit: 4a436572a85c9f13fba9f242f87b456f54349a32 https://github.com/pytest-dev/pytest/commit/4a436572a85c9f13fba9f242f87b456f54349a32 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M testing/logging/test_reporting.py Log Message: ----------- Simplify test assertions a bit Commit: 9dbcac9af39a032e9ea224d6979a859568b277fd https://github.com/pytest-dev/pytest/commit/9dbcac9af39a032e9ea224d6979a859568b277fd Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Suspend stdout/stderr capturing when emitting live logging messages Commit: 18e053546c6798dc801956433087cafde9986121 https://github.com/pytest-dev/pytest/commit/18e053546c6798dc801956433087cafde9986121 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M testing/logging/test_reporting.py Log Message: ----------- Use six.StringIO and __name__ in test_live_logging_suspends_capture Commit: 2e40a8b3ca520fbb53cdb0a6239a0d03c8fd27bc https://github.com/pytest-dev/pytest/commit/2e40a8b3ca520fbb53cdb0a6239a0d03c8fd27bc Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M testing/logging/test_fixture.py Log Message: ----------- Fix test_caplog_captures_for_all_stages by setting log level Commit: 27ae270159dc027ba6622ca43be3681204e84e2b https://github.com/pytest-dev/pytest/commit/27ae270159dc027ba6622ca43be3681204e84e2b Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M doc/en/logging.rst Log Message: ----------- Mention in docs that log messages of level WARNING or above are captured Commit: 29a7b5e064d57f510dba92861e7977eb4a7cbb22 https://github.com/pytest-dev/pytest/commit/29a7b5e064d57f510dba92861e7977eb4a7cbb22 Author: Bruno Oliveira Date: 2018-01-20 (Sat, 20 Jan 2018) Changed paths: M _pytest/logging.py Log Message: ----------- Initialize log_cli_handler to None during LoggingPlugin init Some of testdir's functionality bypasses pytest_runtestloop so this attribute needs to be set early Commit: 0df42b44265b7b03dd897f1f3ddc33018acf0957 https://github.com/pytest-dev/pytest/commit/0df42b44265b7b03dd897f1f3ddc33018acf0957 Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Show a header for each testing phase during live logging As suggested during review Commit: a5e60b6a2d7f8044a08334cd4ca1a9873489528e https://github.com/pytest-dev/pytest/commit/a5e60b6a2d7f8044a08334cd4ca1a9873489528e Author: Raphael Castaneda Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M AUTHORS M _pytest/junitxml.py A changelog/3130.feature M doc/en/usage.rst M testing/test_junitxml.py Log Message: ----------- implement #3130 - adding record_xml_attribute fixture update incorrect expected attribute value in test_record_attribute attr names must be strings Update CHANGELOG formatting update usage documentation Fix versionadded for record_xml_attribute Indent the xml schema properly inside the warning box in the docs Commit: 3a9d0b26d5700be58bde067e6d8d4ca2e80406de https://github.com/pytest-dev/pytest/commit/3a9d0b26d5700be58bde067e6d8d4ca2e80406de Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Use pytest_runtest_logstart to signal the start of a new test This also simplifies the code a bit because we don't need to keep a set of ids anymore Commit: 9f4688e549cb2688f667ff951f9f28a869f6bf07 https://github.com/pytest-dev/pytest/commit/9f4688e549cb2688f667ff951f9f28a869f6bf07 Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M testing/logging/test_reporting.py Log Message: ----------- Remove unnecessary -s from test_log_cli_enabled_disabled Commit: 113bfb6be88523df3983c358fbed5bb75f234b0c https://github.com/pytest-dev/pytest/commit/113bfb6be88523df3983c358fbed5bb75f234b0c Author: Bruno Oliveira Date: 2018-01-22 (Mon, 22 Jan 2018) Changed paths: M _pytest/logging.py M testing/logging/test_reporting.py Log Message: ----------- Report 'call' phase as 'live log call' As commented in review, this makes it consistent with the headers shown by stdout/stderr capturing ("Captured log call") Commit: b4e8861aa583e9fc365e5bb4769e3a6e5c94f78a https://github.com/pytest-dev/pytest/commit/b4e8861aa583e9fc365e5bb4769e3a6e5c94f78a Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M _pytest/logging.py M doc/en/logging.rst Log Message: ----------- Fix typos Commit: 2c7f94fdb94d166593384ec3455a52654a735e8b https://github.com/pytest-dev/pytest/commit/2c7f94fdb94d166593384ec3455a52654a735e8b Author: Andrew Toolan Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M _pytest/config.py M testing/test_config.py Log Message: ----------- Added basic fix and test Commit: 203508d9f3ea4478317375c1bdf09a8db02c8826 https://github.com/pytest-dev/pytest/commit/203508d9f3ea4478317375c1bdf09a8db02c8826 Author: Aron Coyle Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M testing/test_config.py Log Message: ----------- cleanup test cases Commit: 46d87deb5d38d6138947d981158ca2839c3ad8d7 https://github.com/pytest-dev/pytest/commit/46d87deb5d38d6138947d981158ca2839c3ad8d7 Author: Aron Coyle Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M AUTHORS A changelog/3103.bugfix Log Message: ----------- Add changelog update authors Commit: 30ca9f9d3890c7d83e34014a8ff096744db7e690 https://github.com/pytest-dev/pytest/commit/30ca9f9d3890c7d83e34014a8ff096744db7e690 Author: Aron Coyle Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M changelog/3103.bugfix Log Message: ----------- Add endline Commit: 8426c57a9e8631186a6cadcedd14756246218efb https://github.com/pytest-dev/pytest/commit/8426c57a9e8631186a6cadcedd14756246218efb Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M testing/test_config.py Log Message: ----------- Ensure changes in the message in the future do not make the test pass by accident Commit: 443275f0258715a8975ecf2f003f2919cc00d94e https://github.com/pytest-dev/pytest/commit/443275f0258715a8975ecf2f003f2919cc00d94e Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M changelog/3103.bugfix Log Message: ----------- Reword changelog a bit Commit: 3f5e9ea71e997746f89c71507888414f9477e2b9 https://github.com/pytest-dev/pytest/commit/3f5e9ea71e997746f89c71507888414f9477e2b9 Author: Bruno Oliveira Date: 2018-01-23 (Tue, 23 Jan 2018) Changed paths: M _pytest/config.py M _pytest/helpconfig.py M changelog/3103.bugfix M doc/en/customize.rst M testing/test_config.py Log Message: ----------- Fix -o behavior to no longer swallow all remaining options The current behavior was too error-prone because a "-o" option would swallow all the following non-option parameters: pytest -o foo=bar path/to/test.py path/to/test.py would be captured by the -o option, and would fail because "path/to/test.py" is not in the format "key=value". Commit: af37778b0d8d88b72b485ae53a5dde0478cc1b07 https://github.com/pytest-dev/pytest/commit/af37778b0d8d88b72b485ae53a5dde0478cc1b07 Author: Bruno Oliveira Date: 2018-01-24 (Wed, 24 Jan 2018) Changed paths: 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/main.py M _pytest/mark.py M _pytest/monkeypatch.py M _pytest/pytester.py M _pytest/runner.py M _pytest/terminal.py M _pytest/tmpdir.py A changelog/2147.removal M testing/acceptance_test.py M testing/python/collect.py M testing/python/fixture.py M testing/python/metafunc.py M testing/test_capture.py M testing/test_pytester.py M testing/test_terminal.py Log Message: ----------- All classes now subclass object for better py3 compatibility Fix #2147 Commit: 2f955e0c99d10fc90f103c14aff70b1382295f5f https://github.com/pytest-dev/pytest/commit/2f955e0c99d10fc90f103c14aff70b1382295f5f Author: Bruno Oliveira Date: 2018-01-24 (Wed, 24 Jan 2018) Changed paths: M doc/en/logging.rst Log Message: ----------- Update documentation: rewording and move things for better reading flow Commit: 15cbd6115987ced2e9ae9cd598cc80f0bf07b71c https://github.com/pytest-dev/pytest/commit/15cbd6115987ced2e9ae9cd598cc80f0bf07b71c Author: Bruno Oliveira Date: 2018-01-24 (Wed, 24 Jan 2018) Changed paths: M _pytest/logging.py M changelog/3117.feature M doc/en/logging.rst M testing/logging/test_fixture.py Log Message: ----------- Change caplog.get_handler(when) to caplog.get_records(when) While updating the docs I noticed that caplog.get_handler() exposes the underlying Handler object, which I think it is a bit too much detail at this stage. Update to return the records directly instead. Commit: 2aad8c0fcebe6bc7e9e6ca567dac2e3f3c141bb2 https://github.com/pytest-dev/pytest/commit/2aad8c0fcebe6bc7e9e6ca567dac2e3f3c141bb2 Author: Bruno Oliveira Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M AUTHORS M _pytest/config.py M _pytest/helpconfig.py A changelog/3103.bugfix M doc/en/customize.rst M testing/test_config.py Log Message: ----------- Merge pull request #3147 from nicoddemus/issue-3103 '-o' option no longer swallows all other non-options after it Commit: b8be339632035817ccc65c1d51d0bff7eed68fd5 https://github.com/pytest-dev/pytest/commit/b8be339632035817ccc65c1d51d0bff7eed68fd5 Author: Bruno Oliveira Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: 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/main.py M _pytest/mark.py M _pytest/monkeypatch.py M _pytest/pytester.py M _pytest/runner.py M _pytest/terminal.py M _pytest/tmpdir.py A changelog/2147.removal M testing/acceptance_test.py M testing/python/collect.py M testing/python/fixture.py M testing/python/metafunc.py M testing/test_capture.py M testing/test_pytester.py M testing/test_terminal.py Log Message: ----------- Merge pull request #3148 from nicoddemus/deprecate-old-style-classes-2147 All classes now subclass object for better py3 compatibility Commit: a24ca9872fce47cb897ed0d28f5901c6f4639b16 https://github.com/pytest-dev/pytest/commit/a24ca9872fce47cb897ed0d28f5901c6f4639b16 Author: Alan Velasco Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M AUTHORS M _pytest/cacheprovider.py A changelog/3150.feature M testing/test_cache.py Log Message: ----------- Change cache directory name to include `pytest` Commit: cbbd606b6cac1027c35812f38456fd1dff956840 https://github.com/pytest-dev/pytest/commit/cbbd606b6cac1027c35812f38456fd1dff956840 Author: Bruno Oliveira Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: A changelog/3138.feature R changelog/3150.feature Log Message: ----------- Reword changelog Commit: bf2c10c8105d770354d0abc451de4ffd9b986562 https://github.com/pytest-dev/pytest/commit/bf2c10c8105d770354d0abc451de4ffd9b986562 Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/mark.py M _pytest/python.py Log Message: ----------- parameterset: refactor marking empty parametersets Commit: 37b41de779957b0e0e826016b7dee9ee2f4aec89 https://github.com/pytest-dev/pytest/commit/37b41de779957b0e0e826016b7dee9ee2f4aec89 Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/mark.py A changelog/2527.feature M testing/test_mark.py Log Message: ----------- fix #2527 - introduce a option to pic the empty parameterset action Commit: 7f83605c81205398976b658b868137b41156578a https://github.com/pytest-dev/pytest/commit/7f83605c81205398976b658b868137b41156578a Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M testing/python/metafunc.py Log Message: ----------- fix empty parameterset tests by mocking a config object Commit: d4c11e58aa58fbb6d2e560bc62111a7efb955ca3 https://github.com/pytest-dev/pytest/commit/d4c11e58aa58fbb6d2e560bc62111a7efb955ca3 Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M testing/test_mark.py Log Message: ----------- exted empty parameterset check with reason test Commit: 8979b2a9d78161739fe870ef71be800067cff33a https://github.com/pytest-dev/pytest/commit/8979b2a9d78161739fe870ef71be800067cff33a Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M doc/en/customize.rst Log Message: ----------- document empty_parameterset in customize.rst Commit: a58099022a293f1c73fe116f72a0bdcc080f64d9 https://github.com/pytest-dev/pytest/commit/a58099022a293f1c73fe116f72a0bdcc080f64d9 Author: Bruno Oliveira Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/logging.py A changelog/3013.feature M changelog/3117.feature M doc/en/logging.rst M testing/logging/test_fixture.py M testing/logging/test_reporting.py Log Message: ----------- Merge pull request #3124 from nicoddemus/logging-3013 Changes in the logging plugin for 3.4 Commit: d550c33cd02512fd78a9a6b0e205dbbaf4f5e9d1 https://github.com/pytest-dev/pytest/commit/d550c33cd02512fd78a9a6b0e205dbbaf4f5e9d1 Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/mark.py M doc/en/customize.rst Log Message: ----------- s/empty_parameterset/empty_parameter_set_mark Commit: 77de45cce3bac71119c99581b848b5e20660276d https://github.com/pytest-dev/pytest/commit/77de45cce3bac71119c99581b848b5e20660276d Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M changelog/2527.feature M doc/en/customize.rst Log Message: ----------- enhance docs for empty_parameter_set_mark according to review comments Commit: a54cd4c2fdf63634560920ec7c4a582b8ca32e0e https://github.com/pytest-dev/pytest/commit/a54cd4c2fdf63634560920ec7c4a582b8ca32e0e Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/mark.py M testing/test_mark.py Log Message: ----------- correct testing and usage of the empty_parameter_set_mark config option Commit: 17a1ed5edf73e12d14665a2e6ed2399ae6415579 https://github.com/pytest-dev/pytest/commit/17a1ed5edf73e12d14665a2e6ed2399ae6415579 Author: Ronny Pfannschmidt Date: 2018-01-26 (Fri, 26 Jan 2018) Changed paths: M _pytest/mark.py M testing/test_mark.py Log Message: ----------- use a constant to sort out repeated use of the EMPTY_PARAMETERSET_OPTION Commit: cd0b2ace6744f1eee8689ca92b5a8453113bf2c5 https://github.com/pytest-dev/pytest/commit/cd0b2ace6744f1eee8689ca92b5a8453113bf2c5 Author: Bruno Oliveira Date: 2018-01-27 (Sat, 27 Jan 2018) Changed paths: M AUTHORS M _pytest/cacheprovider.py A changelog/3138.feature M testing/test_cache.py Log Message: ----------- Merge pull request #3150 from alanbato/pytest_cache Change cache directory structure to include `pytest` Commit: 169635e8899e60de8155ad151ff99f10c3652fa0 https://github.com/pytest-dev/pytest/commit/169635e8899e60de8155ad151ff99f10c3652fa0 Author: Bruno Oliveira Date: 2018-01-27 (Sat, 27 Jan 2018) Changed paths: M doc/en/customize.rst Log Message: ----------- Move example of empty_parameter_set_mark closer to the options Commit: b3247c1d03f039b80f69465adada20ddbdeedcdb https://github.com/pytest-dev/pytest/commit/b3247c1d03f039b80f69465adada20ddbdeedcdb Author: Bruno Oliveira Date: 2018-01-27 (Sat, 27 Jan 2018) Changed paths: M _pytest/mark.py M _pytest/python.py A changelog/2527.feature M doc/en/customize.rst M testing/python/metafunc.py M testing/test_mark.py Log Message: ----------- Merge pull request #3044 from RonnyPfannschmidt/parameterset-empty-enable-xfail empty parameterset - enable opt to xfail Commit: aff463a3c4535c859a3fdfc54c96ec64a78e8834 https://github.com/pytest-dev/pytest/commit/aff463a3c4535c859a3fdfc54c96ec64a78e8834 Author: Bruno Oliveira Date: 2018-01-27 (Sat, 27 Jan 2018) Changed paths: M AUTHORS M _pytest/_code/code.py M _pytest/_code/source.py M _pytest/hookspec.py A changelog/2022.bugfix A changelog/2423.doc A changelog/2457.doc A changelog/2698.doc A changelog/3067.trivial A changelog/3129.trivial A changelog/3131.doc A changelog/3143.doc M doc/en/backwards-compatibility.rst M doc/en/example/assertion/failure_demo.py M doc/en/example/reportingdemo.rst M doc/en/example/simple.rst M doc/en/getting-started.rst M doc/en/parametrize.rst M doc/en/usage.rst M doc/en/warnings.rst M doc/en/writing_plugins.rst M extra/get_issues.py M testing/acceptance_test.py M testing/code/test_excinfo.py M testing/code/test_source.py M testing/python/collect.py M testing/python/metafunc.py M testing/test_argcomplete.py M testing/test_assertrewrite.py M testing/test_cache.py M testing/test_collection.py M testing/test_config.py M testing/test_conftest.py M testing/test_parseopt.py M testing/test_pdb.py M testing/test_pluginmanager.py M testing/test_recwarn.py M testing/test_runner.py M testing/test_terminal.py Log Message: ----------- Merge remote-tracking branch 'upstream/master' into features Commit: 0e1be01b7a46e0d7425ccc425e26030e4bedcbd7 https://github.com/pytest-dev/pytest/commit/0e1be01b7a46e0d7425ccc425e26030e4bedcbd7 Author: Bruno Oliveira Date: 2018-01-27 (Sat, 27 Jan 2018) Changed paths: M AUTHORS M _pytest/fixtures.py A changelog/3107.feature Log Message: ----------- Merge pull request #3108 from cheezman34/features Optimize reorder_items in fixtures.py Commit: 269eeec702f84af60d89899cc5318ef8e74096ea https://github.com/pytest-dev/pytest/commit/269eeec702f84af60d89899cc5318ef8e74096ea Author: Bruno Oliveira Date: 2018-01-29 (Mon, 29 Jan 2018) Changed paths: M _pytest/cacheprovider.py Log Message: ----------- Replace deprecated option.getvalue by option.getoption in cacheprovider Commit: 6e4efccc38123aedd86e2a9313552fa3a0f8509b https://github.com/pytest-dev/pytest/commit/6e4efccc38123aedd86e2a9313552fa3a0f8509b Author: Bruno Oliveira Date: 2018-01-29 (Mon, 29 Jan 2018) Changed paths: R testing/test_cache.py A testing/test_cacheprovider.py Log Message: ----------- Rename test_cache to test_cacheprovider for consistency with cacheprovider Commit: ab00c3e9117e22f4a7e138cbbb5b6c8754bf3102 https://github.com/pytest-dev/pytest/commit/ab00c3e9117e22f4a7e138cbbb5b6c8754bf3102 Author: Bruno Oliveira Date: 2018-01-29 (Mon, 29 Jan 2018) Changed paths: M .gitignore Log Message: ----------- Add .pytest_cache directory to gitignore Commit: 32979def7d20ab94bbf665ec2d898eee5819d67c https://github.com/pytest-dev/pytest/commit/32979def7d20ab94bbf665ec2d898eee5819d67c Author: Ronny Pfannschmidt Date: 2018-01-29 (Mon, 29 Jan 2018) Changed paths: M .gitignore M _pytest/cacheprovider.py R testing/test_cache.py A testing/test_cacheprovider.py Log Message: ----------- Merge pull request #3158 from nicoddemus/cache-getvalue Replace deprecated option.getvalue by option.getoption in cache plugin Commit: 49773b573f830d74ba5c3e1791ceced1b2614b25 https://github.com/pytest-dev/pytest/commit/49773b573f830d74ba5c3e1791ceced1b2614b25 Author: Bruno Oliveira Date: 2018-01-29 (Mon, 29 Jan 2018) Changed paths: M AUTHORS M _pytest/junitxml.py A changelog/3130.feature M doc/en/usage.rst M testing/test_junitxml.py Log Message: ----------- Merge pull request #3132 from raphaelcastaneda/feature/add-record-xml-attribute implement #3130 - add record_xml_attribute fixture Commit: ebab1b6c69e3b5cd436bfaf31c957c3df1649c64 https://github.com/pytest-dev/pytest/commit/ebab1b6c69e3b5cd436bfaf31c957c3df1649c64 Author: Thomas Hisch Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M _pytest/logging.py A changelog/3142.feature A testing/logging/test_formatter.py Log Message: ----------- live-logging: Colorize levelname Commit: 71a7b3c062d51c61ee8b1ac479b1260d541918c6 https://github.com/pytest-dev/pytest/commit/71a7b3c062d51c61ee8b1ac479b1260d541918c6 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M _pytest/logging.py A changelog/3142.feature A testing/logging/test_formatter.py Log Message: ----------- Merge pull request #3142 from thisch/only_colorize_levelname Colorize live-log levelnames Compare: https://github.com/pytest-dev/pytest/compare/3bc7ced97ae2...71a7b3c062d5 From nicoddemus at gmail.com Tue Jan 30 17:10:54 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 30 Jan 2018 14:10:54 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 3256fa: Add devpi-client to tasks requirements Message-ID: <5a70ed6e256bf_2fd62ae5f616dbfc71654@hookshot-fe-6b2eebc.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 3256fa9ee9345baa63dc959ecc527435cbfd8393 https://github.com/pytest-dev/pytest/commit/3256fa9ee9345baa63dc959ecc527435cbfd8393 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M tasks/requirements.txt Log Message: ----------- Add devpi-client to tasks requirements From nicoddemus at gmail.com Tue Jan 30 17:14:49 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 30 Jan 2018 14:14:49 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 3256fa: Add devpi-client to tasks requirements Message-ID: <5a70ee595804f_59272b08f8f35c10625ed@hookshot-fe-b0febf1.cp1-iad.github.net.mail> Branch: refs/heads/features Home: https://github.com/pytest-dev/pytest Commit: 3256fa9ee9345baa63dc959ecc527435cbfd8393 https://github.com/pytest-dev/pytest/commit/3256fa9ee9345baa63dc959ecc527435cbfd8393 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M tasks/requirements.txt Log Message: ----------- Add devpi-client to tasks requirements Commit: f2fb841b29826c5ad540260f940cb30c15ae4d6c https://github.com/pytest-dev/pytest/commit/f2fb841b29826c5ad540260f940cb30c15ae4d6c Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M tasks/requirements.txt Log Message: ----------- Merge remote-tracking branch 'upstream/master' into features Compare: https://github.com/pytest-dev/pytest/compare/dc9a9ec4c29d...f2fb841b2982 From nicoddemus at gmail.com Tue Jan 30 17:19:57 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 30 Jan 2018 14:19:57 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 4c148b: Fix imports in failure_demo.py Message-ID: <5a70ef8d2e970_3fb62af899c7bc14219dc@hookshot-fe-d2afb11.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 4c148bd0ef8a0cc9d15d7aaf6d3cce044d99bfa3 https://github.com/pytest-dev/pytest/commit/4c148bd0ef8a0cc9d15d7aaf6d3cce044d99bfa3 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M doc/en/example/assertion/failure_demo.py Log Message: ----------- Fix imports in failure_demo.py Commit: 13ee1cffedbce45bd4c01cf72b661f6619c527d5 https://github.com/pytest-dev/pytest/commit/13ee1cffedbce45bd4c01cf72b661f6619c527d5 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M HOWTORELEASE.rst Log Message: ----------- Suggest to update all dependencies when preparing releases Commit: 489e638b4eacc631959ac54017ec4863dd3d751e https://github.com/pytest-dev/pytest/commit/489e638b4eacc631959ac54017ec4863dd3d751e Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M CHANGELOG.rst R changelog/2022.bugfix R changelog/2147.removal R changelog/2423.doc R changelog/2457.doc R changelog/2527.feature R changelog/2698.doc R changelog/2953.trivial R changelog/2976.trivial R changelog/3013.feature R changelog/3016.bugfix R changelog/3038.feature R changelog/3067.trivial R changelog/3074.bugfix R changelog/3076.doc R changelog/3088.bugfix R changelog/3092.doc R changelog/3101.feature R changelog/3103.bugfix R changelog/3107.feature R changelog/3117.feature R changelog/3129.trivial R changelog/3130.feature R changelog/3131.doc R changelog/3138.feature R changelog/3142.feature 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/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/usage.rst Log Message: ----------- Preparing release version 3.4.0 Commit: 527845ef298d94b1e101684bb52e5eac3ce53485 https://github.com/pytest-dev/pytest/commit/527845ef298d94b1e101684bb52e5eac3ce53485 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M CHANGELOG.rst Log Message: ----------- Changelog adjustments suggested during review Commit: dc9a9ec4c29d8a9891f1cfc4d112a51d0e90ecd5 https://github.com/pytest-dev/pytest/commit/dc9a9ec4c29d8a9891f1cfc4d112a51d0e90ecd5 Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M CHANGELOG.rst M HOWTORELEASE.rst R changelog/2022.bugfix R changelog/2147.removal R changelog/2423.doc R changelog/2457.doc R changelog/2527.feature R changelog/2698.doc R changelog/2953.trivial R changelog/2976.trivial R changelog/3013.feature R changelog/3016.bugfix R changelog/3038.feature R changelog/3067.trivial R changelog/3074.bugfix R changelog/3076.doc R changelog/3088.bugfix R changelog/3092.doc R changelog/3101.feature R changelog/3103.bugfix R changelog/3107.feature R changelog/3117.feature R changelog/3129.trivial R changelog/3130.feature R changelog/3131.doc R changelog/3138.feature R changelog/3142.feature 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/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/usage.rst Log Message: ----------- Merge pull request #3162 from nicoddemus/release-3.4.0 Release 3.4.0 Commit: f2fb841b29826c5ad540260f940cb30c15ae4d6c https://github.com/pytest-dev/pytest/commit/f2fb841b29826c5ad540260f940cb30c15ae4d6c Author: Bruno Oliveira Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M tasks/requirements.txt Log Message: ----------- Merge remote-tracking branch 'upstream/master' into features Compare: https://github.com/pytest-dev/pytest/compare/3256fa9ee934...f2fb841b2982 From nicoddemus at gmail.com Tue Jan 30 18:41:15 2018 From: nicoddemus at gmail.com (Bruno Oliveira) Date: Tue, 30 Jan 2018 15:41:15 -0800 Subject: [Pytest-commit] [pytest-dev/pytest] 547070: Switch `for_parameterize` to `for_parametrize` Message-ID: <5a71029b4db11_9fa2b132adf7c1840445@hookshot-fe-6e9b612.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/pytest-dev/pytest Commit: 547070e2d83617988ce07f2de6240f3ba3705d9c https://github.com/pytest-dev/pytest/commit/547070e2d83617988ce07f2de6240f3ba3705d9c Author: Alan Velasco 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 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: ef7df8f167cdcf774bd3688f4df98ee10b80766d https://github.com/pytest-dev/pytest/commit/ef7df8f167cdcf774bd3688f4df98ee10b80766d Author: Bruno Oliveira 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 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` Compare: https://github.com/pytest-dev/pytest/compare/f2fb841b2982...89a55d85a9d3