Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: 853975d93b72a08175a313d5c5c4958b5f55935b
https://github.com/pytest-dev/pytest/commit/853975d93b72a08175a313d5c5c4958b5f55935b
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-26 (Tue, 26 Jun 2018)
Changed paths:
M testing/test_mark.py
Log Message:
-----------
add failing test for #3605
Commit: 78a82c05ef8662afa79721807a112d29e3b7c1bc
https://github.com/pytest-dev/pytest/commit/78a82c05ef8662afa79721807a112d29e3b7c1bc
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-26 (Tue, 26 Jun 2018)
Changed paths:
M testing/test_mark.py
Log Message:
-----------
consistent failure on all python versions for test_markers_from_parametrize
Commit: b8486037d3fc7c61c742ced91ef3109da1448439
https://github.com/pytest-dev/pytest/commit/b8486037d3fc7c61c742ced91ef3109da1448439
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-26 (Tue, 26 Jun 2018)
Changed paths:
A changelog/3605.bugfix.rst
M src/_pytest/mark/structures.py
M src/_pytest/python.py
M testing/test_mark.py
Log Message:
-----------
fix #3605 - unpack markdecorators from parameterization
Commit: 643e5a9c445a8104e0eff4d3b0bef025bd342912
https://github.com/pytest-dev/pytest/commit/643e5a9c445a8104e0eff4d3b0bef025bd342912
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-26 (Tue, 26 Jun 2018)
Changed paths:
M changelog/3605.bugfix.rst
M src/_pytest/mark/structures.py
Log Message:
-----------
fix docs
Commit: ef1b91ba8721e85430eead4c2849d8e072fe8350
https://github.com/pytest-dev/pytest/commit/ef1b91ba8721e85430eead4c2849d8e072fe8350
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-26 (Tue, 26 Jun 2018)
Changed paths:
A changelog/3605.bugfix.rst
M src/_pytest/mark/structures.py
M src/_pytest/python.py
M testing/test_mark.py
Log Message:
-----------
Merge pull request #3606 from RonnyPfannschmidt/fix-3605
Fix 3605
Commit: 3c73d6298a53733d6fea4d7fd12be64c77e8e1f3
https://github.com/pytest-dev/pytest/commit/3c73d6298a53733d6fea4d7fd12be64c77e8e1f3
Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
Date: 2018-06-28 (Thu, 28 Jun 2018)
Changed paths:
A changelog/3605.bugfix.rst
M src/_pytest/mark/structures.py
M src/_pytest/python.py
M testing/test_mark.py
Log Message:
-----------
merge from master to features
Commit: 7b47dfb74401ff59b9f95a8f9ac195ecbeaf05bd
https://github.com/pytest-dev/pytest/commit/7b47dfb74401ff59b9f95a8f9ac195ecbeaf05bd
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-06-28 (Thu, 28 Jun 2018)
Changed paths:
A changelog/3605.bugfix.rst
M src/_pytest/mark/structures.py
M src/_pytest/python.py
M testing/test_mark.py
Log Message:
-----------
Merge pull request #3634 from RonnyPfannschmidt/merge-from-master
Merge from master
Compare:
https://github.com/pytest-dev/pytest/compare/e9371a58a0d1...7b47dfb74401
**NOTE:** This service 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
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
