Branch: refs/heads/features
Home: https://github.com/pytest-dev/pytest
Commit: bee72a66228762a220474445c9bf019600105528
https://github.com/pytest-dev/pytest/commit/bee72a66228762a220474445c9bf019600105528
Author: Daniel Hahler <[email protected]>
Date: 2018-11-09 (Fri, 09 Nov 2018)
Changed paths:
M src/_pytest/nodes.py
M testing/acceptance_test.py
M testing/test_nodes.py
M testing/test_session.py
Log Message:
-----------
Fix nodes._check_initialpaths_for_relpath for dirs
Ref: https://github.com/pytest-dev/pytest/issues/4321#issuecomment-436951894
Hardens some of the not many tests affected by this:
1. `testing/test_session.py::test_rootdir_option_arg` displayed:
> root/test_rootdir_option_arg2/test_rootdir_option_arg.py
2. `test_cmdline_python_namespace_package` displayed "hello/" prefix for:
> hello/test_hello.py::test_hello
> hello/test_hello.py::test_other
Commit: e14ca19988bb5cb1754a82b6c404b8ae3f746ee7
https://github.com/pytest-dev/pytest/commit/e14ca19988bb5cb1754a82b6c404b8ae3f746ee7
Author: Daniel Hahler <[email protected]>
Date: 2018-11-10 (Sat, 10 Nov 2018)
Changed paths:
M src/_pytest/nodes.py
M testing/acceptance_test.py
M testing/test_nodes.py
M testing/test_session.py
Log Message:
-----------
Merge pull request #4352 from blueyed/_check_initialpaths_for_relpath
Fix nodes._check_initialpaths_for_relpath for dirs
Commit: b51c1c3b8da92c670766fe2fec43f2332bfe7c70
https://github.com/pytest-dev/pytest/commit/b51c1c3b8da92c670766fe2fec43f2332bfe7c70
Author: Daniel Hahler <[email protected]>
Date: 2018-11-10 (Sat, 10 Nov 2018)
Changed paths:
M testing/test_argcomplete.py
Log Message:
-----------
tests: fix equal_with_bash for .coverage files
Fixes https://github.com/pytest-dev/pytest/issues/4162.
Commit: 7ab3d818f03331ebf2765f6c4ea005b721b1c3fe
https://github.com/pytest-dev/pytest/commit/7ab3d818f03331ebf2765f6c4ea005b721b1c3fe
Author: Daniel Hahler <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
M testing/test_argcomplete.py
Log Message:
-----------
Merge pull request #4356 from blueyed/fix-equal_with_bash
tests: fix equal_with_bash to handle appearing .coverage files
Commit: 825085f699f79030475f1632dc4a549b7ad4d45b
https://github.com/pytest-dev/pytest/commit/825085f699f79030475f1632dc4a549b7ad4d45b
Author: Daniel Hahler <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Travis: use coverage from existing tox env [skip appveyor]
Commit: dc9ceda5d2482b3d435b57afaef3e3f4a9a6137a
https://github.com/pytest-dev/pytest/commit/dc9ceda5d2482b3d435b57afaef3e3f4a9a6137a
Author: Daniel Hahler <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Travis: use Xenial by default [skip appveyor]
Commit: be15ad8d2521c8b5f48c6bf36c0e4e8031ef1f1d
https://github.com/pytest-dev/pytest/commit/be15ad8d2521c8b5f48c6bf36c0e4e8031ef1f1d
Author: Daniel Hahler <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
A changelog/4321.bugfix.rst
A changelog/4325.bugfix.rst
M src/_pytest/main.py
M testing/test_collection.py
Log Message:
-----------
Fix collection of direct symlinked files not in python_files
Fixes https://github.com/pytest-dev/pytest/issues/4325.
Commit: a6ff5e6bfc117f9151c6506a5f6f4bba51a1676c
https://github.com/pytest-dev/pytest/commit/a6ff5e6bfc117f9151c6506a5f6f4bba51a1676c
Author: Daniel Hahler <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
M src/_pytest/main.py
Log Message:
-----------
Cleanup/follow-up to #4319
Commit: e5a9f92dfb52bbaaf20efe566a92dc087ea1688b
https://github.com/pytest-dev/pytest/commit/e5a9f92dfb52bbaaf20efe566a92dc087ea1688b
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
A changelog/4321.bugfix.rst
A changelog/4325.bugfix.rst
M src/_pytest/main.py
M testing/test_collection.py
Log Message:
-----------
Merge pull request #4337 from blueyed/fix-sym
Fix collection of symlinked files
Commit: b6f16abfe0f29c0f5a5b4d983950c7b77da40607
https://github.com/pytest-dev/pytest/commit/b6f16abfe0f29c0f5a5b4d983950c7b77da40607
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
M src/_pytest/main.py
Log Message:
-----------
Merge pull request #4369 from blueyed/cleanup
Cleanup/follow-up to #4319
Commit: 2626bd9afa714c9ae1f50b99f7d0d18e7cf29d27
https://github.com/pytest-dev/pytest/commit/2626bd9afa714c9ae1f50b99f7d0d18e7cf29d27
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
M CHANGELOG.rst
R changelog/4287.bugfix.rst
R changelog/4304.bugfix.rst
R changelog/4305.trivial.rst
R changelog/4306.bugfix.rst
R changelog/4310.bugfix.rst
R changelog/4321.bugfix.rst
R changelog/4325.bugfix.rst
R changelog/4329.bugfix.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.10.1.rst
M doc/en/example/nonpython.rst
Log Message:
-----------
Preparing release version 3.10.1
Commit: 11a9cbd50b7f6ada59c8335f759d65439f85c29d
https://github.com/pytest-dev/pytest/commit/11a9cbd50b7f6ada59c8335f759d65439f85c29d
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge pull request #4365 from blueyed/xenial
Travis: use Xenial by default [skip appveyor]
Commit: 7b833ce5f99a8a4a6bd0e41379199a88ffefbea4
https://github.com/pytest-dev/pytest/commit/7b833ce5f99a8a4a6bd0e41379199a88ffefbea4
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge pull request #4368 from blueyed/toxenv-coverage
Travis: use coverage from existing tox env [skip appveyor]
Commit: 9af613bef2ca58c19966cac59a3f038de39fbe31
https://github.com/pytest-dev/pytest/commit/9af613bef2ca58c19966cac59a3f038de39fbe31
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
M CHANGELOG.rst
R changelog/4287.bugfix.rst
R changelog/4304.bugfix.rst
R changelog/4305.trivial.rst
R changelog/4306.bugfix.rst
R changelog/4310.bugfix.rst
R changelog/4321.bugfix.rst
R changelog/4325.bugfix.rst
R changelog/4329.bugfix.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.10.1.rst
M doc/en/example/nonpython.rst
Log Message:
-----------
Merge pull request #4372 from nicoddemus/release-3.10.1
Release version 3.10.1
Commit: 96282424233029ce912e33efb36db0fc8ef91bf1
https://github.com/pytest-dev/pytest/commit/96282424233029ce912e33efb36db0fc8ef91bf1
Author: Daniel Hahler <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
M .travis.yml
M appveyor.yml
Log Message:
-----------
CI: doctesting uses coverage, fiy py37 on AppVeyor
Commit: 74366426b9ea4ee15f2781a5e3d85b47a024e746
https://github.com/pytest-dev/pytest/commit/74366426b9ea4ee15f2781a5e3d85b47a024e746
Author: Daniel Hahler <[email protected]>
Date: 2018-11-11 (Sun, 11 Nov 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Travis: use last TOXENV for PATH
Commit: 935b106213bc14fa45e080051f209c8c5372dd34
https://github.com/pytest-dev/pytest/commit/935b106213bc14fa45e080051f209c8c5372dd34
Author: Daniel Hahler <[email protected]>
Date: 2018-11-12 (Mon, 12 Nov 2018)
Changed paths:
M .travis.yml
M CONTRIBUTING.rst
M appveyor.yml
M tox.ini
Log Message:
-----------
CI: use py37 instead of py36 by default
Closes https://github.com/pytest-dev/pytest/issues/4370.
Commit: 93a98369624fc3fa57f9602bff6d9e9bffb792b0
https://github.com/pytest-dev/pytest/commit/93a98369624fc3fa57f9602bff6d9e9bffb792b0
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-12 (Mon, 12 Nov 2018)
Changed paths:
M .travis.yml
M appveyor.yml
Log Message:
-----------
Merge pull request #4374 from blueyed/doctesting
CI: doctesting uses coverage, fiy py37 on AppVeyor
Commit: 0df5ce408260d1d5f686a8690022a4b0e421e11a
https://github.com/pytest-dev/pytest/commit/0df5ce408260d1d5f686a8690022a4b0e421e11a
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-12 (Mon, 12 Nov 2018)
Changed paths:
M tox.ini
Log Message:
-----------
Fix basepython for linting testenv in tox.ini
Commit: 3cec1482eb841934a409cddd55434b7ba417f6a0
https://github.com/pytest-dev/pytest/commit/3cec1482eb841934a409cddd55434b7ba417f6a0
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-12 (Mon, 12 Nov 2018)
Changed paths:
M .travis.yml
M appveyor.yml
Log Message:
-----------
Merge branch 'master' into py37-by-default
Commit: 243d898b38d3e52523772dd619af66c82b955e97
https://github.com/pytest-dev/pytest/commit/243d898b38d3e52523772dd619af66c82b955e97
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-12 (Mon, 12 Nov 2018)
Changed paths:
M .travis.yml
M CONTRIBUTING.rst
M appveyor.yml
M tox.ini
Log Message:
-----------
Merge pull request #4373 from blueyed/py37-by-default
CI: use py37 instead of py36 by default
Commit: 557cb6cffe0dde3d11affa5da2286353417b6893
https://github.com/pytest-dev/pytest/commit/557cb6cffe0dde3d11affa5da2286353417b6893
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-13 (Tue, 13 Nov 2018)
Changed paths:
M .travis.yml
M CHANGELOG.rst
M CONTRIBUTING.rst
M appveyor.yml
R changelog/4287.bugfix.rst
R changelog/4304.bugfix.rst
R changelog/4305.trivial.rst
R changelog/4306.bugfix.rst
R changelog/4310.bugfix.rst
R changelog/4329.bugfix.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.10.1.rst
M doc/en/example/nonpython.rst
M src/_pytest/main.py
M src/_pytest/nodes.py
M testing/acceptance_test.py
M testing/test_argcomplete.py
M testing/test_collection.py
M testing/test_nodes.py
M testing/test_session.py
M tox.ini
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
Commit: fea09cda6c1db283835d2c72ad5c91831a02f844
https://github.com/pytest-dev/pytest/commit/fea09cda6c1db283835d2c72ad5c91831a02f844
Author: Bruno Oliveira <[email protected]>
Date: 2018-11-13 (Tue, 13 Nov 2018)
Changed paths:
M .travis.yml
M CHANGELOG.rst
M CONTRIBUTING.rst
M appveyor.yml
R changelog/4287.bugfix.rst
R changelog/4304.bugfix.rst
R changelog/4305.trivial.rst
R changelog/4306.bugfix.rst
R changelog/4310.bugfix.rst
R changelog/4329.bugfix.rst
M doc/en/announce/index.rst
A doc/en/announce/release-3.10.1.rst
M doc/en/example/nonpython.rst
M src/_pytest/main.py
M src/_pytest/nodes.py
M testing/acceptance_test.py
M testing/test_argcomplete.py
M testing/test_collection.py
M testing/test_nodes.py
M testing/test_session.py
M tox.ini
Log Message:
-----------
Merge pull request #4383 from nicoddemus/merge-master-into-features
Merge master into features (about to prepare 4.0)
Compare:
https://github.com/pytest-dev/pytest/compare/a72eff5a08b6...fea09cda6c1d
**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
