Branch: refs/heads/master
Home: https://github.com/pytest-dev/pytest
Commit: d0bd01beca0308cfb263ec7f44c9acf0933a1fc0
https://github.com/pytest-dev/pytest/commit/d0bd01beca0308cfb263ec7f44c9acf0933a1fc0
Author: turturica <Ionut Turturica>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M src/_pytest/python.py
Log Message:
-----------
Collect any tests from a package's __init__.py
Commit: e4f76f63505aaa3574e4e71b57fe9b173ed85225
https://github.com/pytest-dev/pytest/commit/e4f76f63505aaa3574e4e71b57fe9b173ed85225
Author: turturica <Ionut Turturica>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M .pre-commit-config.yaml
M AUTHORS
M CHANGELOG.rst
A changelog/3033.bugfix.rst
R changelog/3771.bugfix.rst
R changelog/3775.bugfix.rst
R changelog/3788.bugfix.rst
A changelog/3816.bugfix.rst
A changelog/3819.bugfix.rst
A changelog/3824.doc.rst
A changelog/3826.trivial.rst
A changelog/3833.doc.rst
A changelog/3843.bugfix.rst
A changelog/3845.trivial.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.7.2.rst
M doc/en/example/markers.rst
M doc/en/example/nonpython.rst
M doc/en/example/parametrize.rst
M doc/en/example/pythoncollection.rst
M doc/en/reference.rst
M doc/en/skipping.rst
M src/_pytest/_code/code.py
M src/_pytest/capture.py
M src/_pytest/compat.py
M src/_pytest/config/argparsing.py
M src/_pytest/debugging.py
M src/_pytest/fixtures.py
M src/_pytest/logging.py
M src/_pytest/main.py
M src/_pytest/pytester.py
M src/_pytest/python.py
M src/_pytest/setuponly.py
M src/_pytest/terminal.py
M src/_pytest/warnings.py
M testing/acceptance_test.py
M testing/code/test_excinfo.py
M testing/logging/test_reporting.py
M testing/python/collect.py
M testing/test_capture.py
M testing/test_collection.py
M testing/test_terminal.py
M testing/test_warnings.py
M tox.ini
Log Message:
-----------
Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854
Commit: 4d3c1ab4f09ad352b9b0a274f0d802826771e4ed
https://github.com/pytest-dev/pytest/commit/4d3c1ab4f09ad352b9b0a274f0d802826771e4ed
Author: turturica <Ionut Turturica>
Date: 2018-08-22 (Wed, 22 Aug 2018)
Changed paths:
M src/_pytest/python.py
M testing/python/collect.py
Log Message:
-----------
Fixes #3854
Commit: 5f8b50c0946b17d5ee5054066cd2ee6dd75e187b
https://github.com/pytest-dev/pytest/commit/5f8b50c0946b17d5ee5054066cd2ee6dd75e187b
Author: turturica <Ionut Turturica>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M src/_pytest/python.py
M testing/python/fixture.py
Log Message:
-----------
Address #3796 and add a test for it.
Commit: 72e6482994974741ddc2058807cf4d3f7b771ced
https://github.com/pytest-dev/pytest/commit/72e6482994974741ddc2058807cf4d3f7b771ced
Author: turturica <Ionut Turturica>
Date: 2018-08-23 (Thu, 23 Aug 2018)
Changed paths:
M src/_pytest/python.py
Log Message:
-----------
Make linting happy.
Commit: 3396225f74561f741dcc576e63c6f169bc08eda5
https://github.com/pytest-dev/pytest/commit/3396225f74561f741dcc576e63c6f169bc08eda5
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M bench/empty.py
A changelog/3848.bugfix.rst
M doc/en/example/assertion/failure_demo.py
M doc/en/example/assertion/global_testmodule_config/conftest.py
M doc/en/example/multipython.py
M doc/en/goodpractices.rst
M src/_pytest/_code/_py2traceback.py
M src/_pytest/_code/code.py
M src/_pytest/assertion/rewrite.py
M src/_pytest/assertion/util.py
M src/_pytest/config/argparsing.py
M src/_pytest/fixtures.py
M src/_pytest/outcomes.py
M src/_pytest/pytester.py
M src/_pytest/python.py
M src/_pytest/python_api.py
M src/_pytest/recwarn.py
M src/_pytest/runner.py
M testing/acceptance_test.py
M testing/code/test_code.py
M testing/code/test_excinfo.py
M testing/code/test_source.py
M testing/example_scripts/acceptance/fixture_mock_integration.py
M testing/python/collect.py
M testing/python/fixture.py
M testing/python/metafunc.py
M testing/test_argcomplete.py
M testing/test_assertion.py
M testing/test_assertrewrite.py
M testing/test_cacheprovider.py
M testing/test_capture.py
M testing/test_collection.py
M testing/test_config.py
M testing/test_conftest.py
M testing/test_doctest.py
M testing/test_helpconfig.py
M testing/test_junitxml.py
M testing/test_parseopt.py
M testing/test_pdb.py
M testing/test_pytester.py
M testing/test_terminal.py
Log Message:
-----------
Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854
Commit: 459b040d2179ba6af0a8c51c1134a9979331959c
https://github.com/pytest-dev/pytest/commit/459b040d2179ba6af0a8c51c1134a9979331959c
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M testing/python/fixture.py
Log Message:
-----------
Fix dedent after merge.
Commit: e3df1031ca2662763a5d9ad7d9282e62accb8821
https://github.com/pytest-dev/pytest/commit/e3df1031ca2662763a5d9ad7d9282e62accb8821
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M testing/python/fixture.py
Log Message:
-----------
Add encoding: utf8 for python 2.7
Commit: dce8df45d5b86c7b20802ee790a8c6da2ecd55cb
https://github.com/pytest-dev/pytest/commit/dce8df45d5b86c7b20802ee790a8c6da2ecd55cb
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
A changelog/3796.bugfix.rst
A changelog/3854.bugfix.rst
M testing/python/fixture.py
Log Message:
-----------
Added changelog items.
Commit: f0226e9329d364084be6bc22f0c11a8053ae9d9c
https://github.com/pytest-dev/pytest/commit/f0226e9329d364084be6bc22f0c11a8053ae9d9c
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M testing/python/collect.py
Log Message:
-----------
Fix test_package_ordering on Windows
Commit: 8cf0e46bbf51bcf1d95019ce7c4d501e8cc4b7d7
https://github.com/pytest-dev/pytest/commit/8cf0e46bbf51bcf1d95019ce7c4d501e8cc4b7d7
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M changelog/3796.bugfix.rst
M changelog/3854.bugfix.rst
M testing/python/collect.py
Log Message:
-----------
test_package_ordering: Collect *.py, but keep a mix of case for filenames.
The test doesn't make sense for Windows, because of its case-insensitivity.
Commit: 1e4ecda8845dcf32bdfd395063b797a91d54e80d
https://github.com/pytest-dev/pytest/commit/1e4ecda8845dcf32bdfd395063b797a91d54e80d
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M src/_pytest/fixtures.py
Log Message:
-----------
Fix the package fixture ordering in Windows.
Commit: c336449729659ede3f3f2535172f911a8c268b86
https://github.com/pytest-dev/pytest/commit/c336449729659ede3f3f2535172f911a8c268b86
Author: turturica <Ionut Turturica>
Date: 2018-08-24 (Fri, 24 Aug 2018)
Changed paths:
M src/_pytest/fixtures.py
Log Message:
-----------
Make linting happy. Argh.
Commit: be4b359c7430eef2b18041e0dab2fa5e4ee7ec22
https://github.com/pytest-dev/pytest/commit/be4b359c7430eef2b18041e0dab2fa5e4ee7ec22
Author: Bruno Oliveira <[email protected]>
Date: 2018-08-25 (Sat, 25 Aug 2018)
Changed paths:
A changelog/3796.bugfix.rst
A changelog/3854.bugfix.rst
M src/_pytest/fixtures.py
M src/_pytest/python.py
M testing/python/collect.py
M testing/python/fixture.py
Log Message:
-----------
Merge pull request #3861 from jonozzz/fix-3854
Fix #3854
Compare:
https://github.com/pytest-dev/pytest/compare/72a58bbafef9...be4b359c7430
**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
