Branch: refs/heads/master
Home: https://github.com/pytest-dev/pytest
Commit: af2c15332422421ac280f90ac9a7ab470c44ed7b
https://github.com/pytest-dev/pytest/commit/af2c15332422421ac280f90ac9a7ab470c44ed7b
Author: Nguyễn Hồng Quân <ng.hong.q...@gmail.com>
Date: 2017-07-24 (Mon, 24 Jul 2017)
Changed paths:
M _pytest/doctest.py
Log Message:
-----------
Report lineno from doctest
This is to fix pytest-sugar#122 issue.
Commit: cdaa720bc4cc8cd5d5e0af178e30f259dcb21baf
https://github.com/pytest-dev/pytest/commit/cdaa720bc4cc8cd5d5e0af178e30f259dcb21baf
Author: Nguyễn Hồng Quân <ng.hong.q...@gmail.com>
Date: 2017-07-24 (Mon, 24 Jul 2017)
Changed paths:
M .travis.yml
M CONTRIBUTING.rst
M _pytest/config.py
M doc/en/cache.rst
M doc/en/contents.rst
M doc/en/customize.rst
M doc/en/example/index.rst
M doc/en/nose.rst
A doc/en/pythonpath.rst
M doc/en/usage.rst
M doc/en/writing_plugins.rst
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into doctest-lineno
Commit: dea671f8ba3a76283735e8414a11595bc755872d
https://github.com/pytest-dev/pytest/commit/dea671f8ba3a76283735e8414a11595bc755872d
Author: Nguyễn Hồng Quân <ng.hong.q...@gmail.com>
Date: 2017-07-24 (Mon, 24 Jul 2017)
Changed paths:
A changelog/2610.bugfix
Log Message:
-----------
Add changelog for #2610
Commit: d40d77432c71d8eaa6bbc1dfb908fbcd4fe2bbb1
https://github.com/pytest-dev/pytest/commit/d40d77432c71d8eaa6bbc1dfb908fbcd4fe2bbb1
Author: Nguyễn Hồng Quân <ng.hong.q...@gmail.com>
Date: 2017-07-24 (Mon, 24 Jul 2017)
Changed paths:
M testing/test_doctest.py
Log Message:
-----------
Add test case for DoctestItem.reportinfo()
Commit: 70d9f8638f95a8b4808f3ba6523cbce31db0c6c9
https://github.com/pytest-dev/pytest/commit/70d9f8638f95a8b4808f3ba6523cbce31db0c6c9
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-07-24 (Mon, 24 Jul 2017)
Changed paths:
M _pytest/doctest.py
A changelog/2610.bugfix
M testing/test_doctest.py
Log Message:
-----------
Merge pull request #2610 from AgriConnect/doctest-lineno
Report lineno from doctest
Compare:
https://github.com/pytest-dev/pytest/compare/e44284c12574...70d9f8638f95_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
