Branch: refs/heads/master
Home: https://github.com/pytest-dev/pytest
Commit: bfd0addaeb29d25e88cbc56fb529b2181d401308
https://github.com/pytest-dev/pytest/commit/bfd0addaeb29d25e88cbc56fb529b2181d401308
Author: turturica <Ionut Turturica>
Date: 2018-08-10 (Fri, 10 Aug 2018)
Changed paths:
M src/_pytest/python.py
Log Message:
-----------
Fix test collection from packages mixed with directories. #3768 and #3789
Commit: e92893ed2443840058a1ed3321e471b319534f62
https://github.com/pytest-dev/pytest/commit/e92893ed2443840058a1ed3321e471b319534f62
Author: turturica <Ionut Turturica>
Date: 2018-08-10 (Fri, 10 Aug 2018)
Changed paths:
M testing/python/collect.py
Log Message:
-----------
Add test for packages mixed with modules.
Commit: abae60c8d047aae92f5bb5215f42ab15771673a6
https://github.com/pytest-dev/pytest/commit/abae60c8d047aae92f5bb5215f42ab15771673a6
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-08-10 (Fri, 10 Aug 2018)
Changed paths:
A changelog/3768.bugfix.rst
A changelog/3789.bugfix.rst
Log Message:
-----------
Add CHANGELOG entries
Commit: 64faa41d061a700b380daf12afb5bda385a21c10
https://github.com/pytest-dev/pytest/commit/64faa41d061a700b380daf12afb5bda385a21c10
Author: Bruno Oliveira <nicodde...@gmail.com>
Date: 2018-08-15 (Wed, 15 Aug 2018)
Changed paths:
A changelog/3768.bugfix.rst
A changelog/3789.bugfix.rst
M src/_pytest/python.py
M testing/python/collect.py
Log Message:
-----------
Merge pull request #3802 from jonozzz/fix-3768
Fix test collection from packages mixed with directories. #3768 and #3789
Compare:
https://github.com/pytest-dev/pytest/compare/ca1bb9a3a183...64faa41d061a
**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
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
