Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: 9d41eaedbf098ad62f7b41de889230a82260b523
https://github.com/pytest-dev/pytest/commit/9d41eaedbf098ad62f7b41de889230a82260b523
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-06-05 (Mon, 05 Jun 2017)
Changed paths:
M _pytest/warnings.py
A changelog/2463.bugfix
M testing/test_warnings.py
Log Message:
-----------
Issue UnicodeWarning only for non-ascii unicode
Fix #2463
Commit: d2db6626cf527287434805bfb15118baac9b6416
https://github.com/pytest-dev/pytest/commit/d2db6626cf527287434805bfb15118baac9b6416
Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths:
M _pytest/warnings.py
A changelog/2463.bugfix
M testing/test_warnings.py
Log Message:
-----------
Merge pull request #2466 from nicoddemus/remove-unicode-warning
Remove UnicodeWarning from pytest warnings
Commit: 2127a2378ad92bf0483f7659524027ab3c49ab15
https://github.com/pytest-dev/pytest/commit/2127a2378ad92bf0483f7659524027ab3c49ab15
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths:
M _pytest/_code/code.py
A changelog/2459.bugfix
M testing/code/test_excinfo.py
Log Message:
-----------
Fix internal error with recursive tracebacks with that frames contain objects
that can't be compared
Fix #2459
Commit: 917b9a835277ae54bfa296a030a69a0e2c6bc19e
https://github.com/pytest-dev/pytest/commit/917b9a835277ae54bfa296a030a69a0e2c6bc19e
Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths:
M _pytest/_code/code.py
A changelog/2459.bugfix
M testing/code/test_excinfo.py
Log Message:
-----------
Merge pull request #2476 from nicoddemus/fix-2459-numpy-comparison
Fix internal error when a recursion error occurs and frames contain objects
that can't be compared
Commit: 7cbf265bb5b279d8c39ba6dd85d4ef96aacd0163
https://github.com/pytest-dev/pytest/commit/7cbf265bb5b279d8c39ba6dd85d4ef96aacd0163
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-06-08 (Thu, 08 Jun 2017)
Changed paths:
M CHANGELOG.rst
R changelog/1999.bugfix
R changelog/2121.bugfix
R changelog/2331.doc
R changelog/2459.bugfix
R changelog/2463.bugfix
R changelog/2467.bugfix
R changelog/810.doc
M doc/en/announce/index.rst
A doc/en/announce/release-3.1.2.rst
M doc/en/skipping.rst
Log Message:
-----------
Preparing release version 3.1.2
Commit: b2d7c26d80aedb8533430d2e70c3d472614c7c0c
https://github.com/pytest-dev/pytest/commit/b2d7c26d80aedb8533430d2e70c3d472614c7c0c
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-06-09 (Fri, 09 Jun 2017)
Changed paths:
M CHANGELOG.rst
R changelog/1999.bugfix
R changelog/2121.bugfix
R changelog/2331.doc
R changelog/2459.bugfix
R changelog/2463.bugfix
R changelog/2467.bugfix
R changelog/810.doc
M doc/en/announce/index.rst
A doc/en/announce/release-3.1.2.rst
M doc/en/skipping.rst
Log Message:
-----------
Merge pull request #2483 from nicoddemus/release-3.1.2
Preparing release version 3.1.2
Commit: 467c5263071ba9cc24ec9b37214b007c21b2c761
https://github.com/pytest-dev/pytest/commit/467c5263071ba9cc24ec9b37214b007c21b2c761
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2017-06-09 (Fri, 09 Jun 2017)
Changed paths:
M CHANGELOG.rst
M _pytest/_code/code.py
M _pytest/warnings.py
R changelog/1999.bugfix
R changelog/2121.bugfix
R changelog/2331.doc
R changelog/2467.bugfix
R changelog/810.doc
M doc/en/announce/index.rst
A doc/en/announce/release-3.1.2.rst
M doc/en/skipping.rst
M testing/code/test_excinfo.py
M testing/test_warnings.py
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into features
Compare:
https://github.com/pytest-dev/pytest/compare/c67bf9d82aa7...467c5263071b_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
