Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: c14a23d4e46810e613401ec095803debcf3b4af5
https://github.com/pytest-dev/pytest/commit/c14a23d4e46810e613401ec095803debcf3b4af5
Author: Niklas JQ <[email protected]>
Date: 2018-10-10 (Wed, 10 Oct 2018)
Changed paths:
M doc/en/example/assertion/failure_demo.py
M doc/en/example/reportingdemo.rst
M src/_pytest/assertion/util.py
M src/_pytest/cacheprovider.py
M src/_pytest/capture.py
M src/_pytest/compat.py
M src/_pytest/deprecated.py
M src/_pytest/helpconfig.py
M src/_pytest/python.py
M src/_pytest/recwarn.py
M src/_pytest/terminal.py
M testing/acceptance_test.py
M testing/logging/test_formatter.py
M testing/test_junitxml.py
M testing/test_pdb.py
Log Message:
-----------
Fix #4093: multiple string literals on a line
Commit: d1322570ddb8f1ec65924f990fe6d5c1e1ac6f36
https://github.com/pytest-dev/pytest/commit/d1322570ddb8f1ec65924f990fe6d5c1e1ac6f36
Author: Niklas JQ <[email protected]>
Date: 2018-10-10 (Wed, 10 Oct 2018)
Changed paths:
A changelog/4093.trivial.rst
Log Message:
-----------
Fix issue 4093
Commit: f36f9d26983d55d861968757e075b2f8d02e5a1c
https://github.com/pytest-dev/pytest/commit/f36f9d26983d55d861968757e075b2f8d02e5a1c
Author: Daniel Hahler <[email protected]>
Date: 2018-10-10 (Wed, 10 Oct 2018)
Changed paths:
M testing/test_pdb.py
Log Message:
-----------
tests: fix/clarify expect for Pdb
`expect()` expects an regular expression, so "Pdb" is equivalent to
"(Pdb)".
But instead of escaping the parenthesis this patch removes them, to
allow for matching "(Pdb++)", too.
Commit: be511c1a054b718b839dc847001ea50262c834b1
https://github.com/pytest-dev/pytest/commit/be511c1a054b718b839dc847001ea50262c834b1
Author: Daniel Hahler <[email protected]>
Date: 2018-10-10 (Wed, 10 Oct 2018)
Changed paths:
M testing/test_pdb.py
Log Message:
-----------
tests: add missing expect before sendeof for pdbpp
With pdb++ this additional `expect` is required, otherwise `sendeof()`
will block forever.
Commit: c9a85b0e78e744e2101473d313f7b50e2ecc408f
https://github.com/pytest-dev/pytest/commit/c9a85b0e78e744e2101473d313f7b50e2ecc408f
Author: Bruno Oliveira <[email protected]>
Date: 2018-10-10 (Wed, 10 Oct 2018)
Changed paths:
M changelog/4093.trivial.rst
M doc/en/example/assertion/failure_demo.py
M src/_pytest/terminal.py
M testing/test_pdb.py
Log Message:
-----------
Fix linting
Commit: e20987ce825e6b012ae7e57594a37d3bcc7a6485
https://github.com/pytest-dev/pytest/commit/e20987ce825e6b012ae7e57594a37d3bcc7a6485
Author: Bruno Oliveira <[email protected]>
Date: 2018-10-11 (Thu, 11 Oct 2018)
Changed paths:
M testing/test_pdb.py
Log Message:
-----------
Merge pull request #4110 from blueyed/pdb
tests: fixes for pdbpp
Commit: 0f5263cdc36db27295f31298338bbd91f5bbc8c1
https://github.com/pytest-dev/pytest/commit/0f5263cdc36db27295f31298338bbd91f5bbc8c1
Author: Bruno Oliveira <[email protected]>
Date: 2018-10-11 (Thu, 11 Oct 2018)
Changed paths:
A changelog/4093.trivial.rst
M doc/en/example/assertion/failure_demo.py
M doc/en/example/reportingdemo.rst
M src/_pytest/assertion/util.py
M src/_pytest/cacheprovider.py
M src/_pytest/capture.py
M src/_pytest/compat.py
M src/_pytest/deprecated.py
M src/_pytest/helpconfig.py
M src/_pytest/python.py
M src/_pytest/recwarn.py
M src/_pytest/terminal.py
M testing/acceptance_test.py
M testing/logging/test_formatter.py
M testing/test_junitxml.py
M testing/test_pdb.py
Log Message:
-----------
Merge pull request #4109 from njonesu/master
Fix multiple string literals on a line #4093
Commit: dbaa9464ba3a3fd2b8ef9b31c795f99740048b1f
https://github.com/pytest-dev/pytest/commit/dbaa9464ba3a3fd2b8ef9b31c795f99740048b1f
Author: Jose Carlos Menezes <[email protected]>
Date: 2018-10-12 (Fri, 12 Oct 2018)
Changed paths:
A changelog/3713.doc.rst
M doc/en/reference.rst
Log Message:
-----------
Update usefixtures documentation
Clarifying that it can't be used with fixture functions
Commit: d46b6b2bc33babe76ceea91ab36b453b2731e4b4
https://github.com/pytest-dev/pytest/commit/d46b6b2bc33babe76ceea91ab36b453b2731e4b4
Author: Ankit Goel <[email protected]>
Date: 2018-10-12 (Fri, 12 Oct 2018)
Changed paths:
A changelog/3713.doc.rst
M doc/en/reference.rst
Log Message:
-----------
Merge pull request #4121 from labcodes/3713
Update usefixtures documentation
Commit: 2dc619cbf471d579f05edb2141963aa3316b69a9
https://github.com/pytest-dev/pytest/commit/2dc619cbf471d579f05edb2141963aa3316b69a9
Author: Bruno Oliveira <[email protected]>
Date: 2018-10-12 (Fri, 12 Oct 2018)
Changed paths:
M .travis.yml
M appveyor.yml
Log Message:
-----------
Run docs, doctesting and linting in the same environment to save some CI time
Commit: eabf15b6263275a5ebbdf02aab37fe2634ede918
https://github.com/pytest-dev/pytest/commit/eabf15b6263275a5ebbdf02aab37fe2634ede918
Author: Bruno Oliveira <[email protected]>
Date: 2018-10-12 (Fri, 12 Oct 2018)
Changed paths:
M .travis.yml
M appveyor.yml
Log Message:
-----------
Merge pull request #4125 from nicoddemus/docs-baseline
Run docs, doctesting and linting in the same job to save some CI time
Commit: 29d58495190e3e214aeedc74869b9e2ebab14cbb
https://github.com/pytest-dev/pytest/commit/29d58495190e3e214aeedc74869b9e2ebab14cbb
Author: Bruno Oliveira <[email protected]>
Date: 2018-10-13 (Sat, 13 Oct 2018)
Changed paths:
M .travis.yml
M appveyor.yml
A changelog/3713.doc.rst
A changelog/4093.trivial.rst
M doc/en/example/assertion/failure_demo.py
M doc/en/example/reportingdemo.rst
M doc/en/reference.rst
M src/_pytest/assertion/util.py
M src/_pytest/cacheprovider.py
M src/_pytest/capture.py
M src/_pytest/compat.py
M src/_pytest/deprecated.py
M src/_pytest/helpconfig.py
M src/_pytest/python.py
M src/_pytest/recwarn.py
M src/_pytest/terminal.py
M testing/acceptance_test.py
M testing/logging/test_formatter.py
M testing/test_junitxml.py
M testing/test_pdb.py
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
Commit: 24c83d725ad75edecc678344130d91affbacf0f3
https://github.com/pytest-dev/pytest/commit/24c83d725ad75edecc678344130d91affbacf0f3
Author: Bruno Oliveira <[email protected]>
Date: 2018-10-13 (Sat, 13 Oct 2018)
Changed paths:
M .travis.yml
M appveyor.yml
A changelog/3713.doc.rst
A changelog/4093.trivial.rst
M doc/en/example/assertion/failure_demo.py
M doc/en/example/reportingdemo.rst
M doc/en/reference.rst
M src/_pytest/assertion/util.py
M src/_pytest/cacheprovider.py
M src/_pytest/capture.py
M src/_pytest/compat.py
M src/_pytest/deprecated.py
M src/_pytest/helpconfig.py
M src/_pytest/python.py
M src/_pytest/recwarn.py
M src/_pytest/terminal.py
M testing/acceptance_test.py
M testing/logging/test_formatter.py
M testing/test_junitxml.py
M testing/test_pdb.py
Log Message:
-----------
Merge pull request #4129 from nicoddemus/merge-master-into-features
Merge master into features (prepare for 3.9)
Compare:
https://github.com/pytest-dev/pytest/compare/ed42ada3739d...24c83d725ad7
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
_______________________________________________
pytest-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pytest-commit
