[Pytest-commit] [pytest-dev/pytest] 5eb401: Merge pull request #4301 from nicoddemus/merge-mas...

Wed Nov 14 12:11:11 EST 2018

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 5eb4016110787b8603d0b6382798becf0de373a8
      https://github.com/pytest-dev/pytest/commit/5eb4016110787b8603d0b6382798becf0de373a8
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-11-04 (Sun, 04 Nov 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/2619.feature.rst
    R changelog/4147.feature.rst
    R changelog/4188.feature.rst
    R changelog/4225.feature.rst
    R changelog/4272.trivial.rst
    R changelog/4277.trivial.rst
    A changelog/4287.bugfix.rst
    R changelog/611.bugfix.rst
    A doc/4266.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.10.0.rst
    M doc/en/cache.rst
    M doc/en/contents.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/fixture.rst
    A doc/en/flaky.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    M doc/en/reference.rst
    M doc/en/talks.rst
    M doc/en/writing_plugins.rst
    M src/_pytest/_code/source.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/hookspec.py
    M src/_pytest/main.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/pathlib.py
    M src/_pytest/python.py
    M testing/python/raises.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_monkeypatch.py
    A testing/test_pathlib.py
    R testing/test_paths.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #4301 from nicoddemus/merge-master-into-features

Merge master into features

  Commit: f521f5e012d8780b3509d3422dce9e02bfa801e9
      https://github.com/pytest-dev/pytest/commit/f521f5e012d8780b3509d3422dce9e02bfa801e9
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-11-05 (Mon, 05 Nov 2018)

  Changed paths:
    M src/_pytest/main.py
    M src/_pytest/nodes.py

  Log Message:
  -----------
  move the _bestrelpathcache to session

  Commit: 1752c7e710c2172c121c0746bf9e8c48ec1fa0b9
      https://github.com/pytest-dev/pytest/commit/1752c7e710c2172c121c0746bf9e8c48ec1fa0b9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-05 (Mon, 05 Nov 2018)

  Changed paths:
    M src/_pytest/main.py
    M src/_pytest/nodes.py

  Log Message:
  -----------
  Merge pull request #4314 from RonnyPfannschmidt/bestrelpath-cache-move-to-session

move Bestrelpath cache move to session

  Commit: cb57159e017747609e540c9be0f41e42ec6f9ef7
      https://github.com/pytest-dev/pytest/commit/cb57159e017747609e540c9be0f41e42ec6f9ef7
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-05 (Mon, 05 Nov 2018)

  Changed paths:
    M src/_pytest/config/__init__.py
    M testing/test_collection.py

  Log Message:
  -----------
  Handle os.chdir() during collection

  Commit: 4c00552192aced4022cbabdf691a0e966c2d48ca
      https://github.com/pytest-dev/pytest/commit/4c00552192aced4022cbabdf691a0e966c2d48ca
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-11-07 (Wed, 07 Nov 2018)

  Changed paths:
    M src/_pytest/config/__init__.py
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #4317 from blueyed/cwd

Handle os.chdir() during collection

  Commit: 9d838fa86172705acd1480f88ca25ff4f6483422
      https://github.com/pytest-dev/pytest/commit/9d838fa86172705acd1480f88ca25ff4f6483422
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-08 (Thu, 08 Nov 2018)

  Changed paths:
    M CHANGELOG.rst
    A changelog/4305.trivial.rst
    A changelog/4306.bugfix.rst
    A changelog/4310.bugfix.rst
    R doc/4266.bugfix.rst
    M doc/en/plugins.rst
    M src/_pytest/assertion/util.py
    M src/_pytest/capture.py
    M src/_pytest/config/__init__.py
    M src/_pytest/main.py
    M src/_pytest/python.py
    M testing/test_assertion.py
    M testing/test_capture.py
    M testing/test_collection.py

  Log Message:
  -----------
  Merge branch 'master' into features

Conflicts:
	src/_pytest/main.py

  Commit: 5dd509c963e85a01d718487164fa3955aff52576
      https://github.com/pytest-dev/pytest/commit/5dd509c963e85a01d718487164fa3955aff52576
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-11-08 (Thu, 08 Nov 2018)

  Changed paths:
    M CHANGELOG.rst
    A changelog/4305.trivial.rst
    A changelog/4306.bugfix.rst
    A changelog/4310.bugfix.rst
    R doc/4266.bugfix.rst
    M doc/en/plugins.rst
    M src/_pytest/assertion/util.py
    M src/_pytest/capture.py
    M src/_pytest/config/__init__.py
    M src/_pytest/main.py
    M src/_pytest/python.py
    M testing/test_assertion.py
    M testing/test_capture.py
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #4338 from blueyed/merge-master

Merge master into features

  Commit: 3137c89cf1232d5c68802cdc187354b8d9909f31
      https://github.com/pytest-dev/pytest/commit/3137c89cf1232d5c68802cdc187354b8d9909f31
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-08 (Thu, 08 Nov 2018)

  Changed paths:
    M src/_pytest/config/__init__.py
    M testing/test_collection.py

  Log Message:
  -----------
  Fix/improve handling of chdir with no-args and testpaths

Fixes https://github.com/pytest-dev/pytest/issues/4332.

  Commit: 6c0605724252e939289e77d2a2290adac609eee7
      https://github.com/pytest-dev/pytest/commit/6c0605724252e939289e77d2a2290adac609eee7
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-11-09 (Fri, 09 Nov 2018)

  Changed paths:
    M src/_pytest/config/__init__.py
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #4336 from blueyed/cwd2

Fix/improve handling of chdir with no-args and testpaths

  Commit: a507f44465566c1aadbfcc0514dcd2bec8e8847b
      https://github.com/pytest-dev/pytest/commit/a507f44465566c1aadbfcc0514dcd2bec8e8847b
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-09 (Fri, 09 Nov 2018)

  Changed paths:
    A changelog/4270.feature.rst
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  cache_dir: use $TOX_ENV_DIR/ prefix if set

Fixes https://github.com/pytest-dev/pytest/issues/4270

  Commit: b92530de783a91fb771c49f2a9b25661b51aa584
      https://github.com/pytest-dev/pytest/commit/b92530de783a91fb771c49f2a9b25661b51aa584
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-11-09 (Fri, 09 Nov 2018)

  Changed paths:
    A changelog/4270.feature.rst
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #4271 from blueyed/pytest_cache

cache_dir: use $TOX_ENV_DIR/ prefix if set

  Commit: 1b260a844fa317542c0ffc3f2ff8d8e3a0d4da85
      https://github.com/pytest-dev/pytest/commit/1b260a844fa317542c0ffc3f2ff8d8e3a0d4da85
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-09 (Fri, 09 Nov 2018)

  Changed paths:
    M .travis.yml
    M AUTHORS
    A changelog/4304.bugfix.rst
    A changelog/4329.bugfix.rst
    M doc/en/usage.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/fixtures.py
    M src/_pytest/main.py
    M src/_pytest/pytester.py
    M src/_pytest/terminal.py
    M testing/acceptance_test.py
    M testing/example_scripts/conftest_usageerror/conftest.py
    M testing/logging/test_fixture.py
    M testing/test_config.py
    M testing/test_modimport.py
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Merge branch 'master' into features

  Commit: 10d27f412b20b1d45b4163e3809b9f19896ccfdf
      https://github.com/pytest-dev/pytest/commit/10d27f412b20b1d45b4163e3809b9f19896ccfdf
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-11-09 (Fri, 09 Nov 2018)

  Changed paths:
    M .travis.yml
    M AUTHORS
    A changelog/4304.bugfix.rst
    A changelog/4329.bugfix.rst
    M doc/en/usage.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/fixtures.py
    M src/_pytest/main.py
    M src/_pytest/pytester.py
    M src/_pytest/terminal.py
    M testing/acceptance_test.py
    M testing/example_scripts/conftest_usageerror/conftest.py
    M testing/logging/test_fixture.py
    M testing/test_config.py
    M testing/test_modimport.py
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Merge pull request #4360 from blueyed/merge-master

Merge master into features

  Commit: ac8b9c6e9dbb66114a1c3f79cd1fdeb0b2b2c54d
      https://github.com/pytest-dev/pytest/commit/ac8b9c6e9dbb66114a1c3f79cd1fdeb0b2b2c54d
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-10 (Sat, 10 Nov 2018)

  Changed paths:
    A changelog/4358.removal.rst
    M src/_pytest/nodes.py
    M src/_pytest/runner.py
    M src/_pytest/terminal.py
    M testing/test_collection.py
    M testing/test_nodes.py

  Log Message:
  -----------
  Node: do not add "::()" to nodeid

Fixes https://github.com/pytest-dev/pytest/issues/4127.

  Commit: 87254ca59352124afecf13d3cbf62268ae54dd98
      https://github.com/pytest-dev/pytest/commit/87254ca59352124afecf13d3cbf62268ae54dd98
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-10 (Sat, 10 Nov 2018)

  Changed paths:
    M testing/test_session.py

  Log Message:
  -----------
  Add test for --deselect without "::()"

Closes: https://github.com/pytest-dev/pytest/issues/4127.

  Commit: f551cb9677bfd14829a403cbd583d590c2d49ce8
      https://github.com/pytest-dev/pytest/commit/f551cb9677bfd14829a403cbd583d590c2d49ce8
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-10 (Sat, 10 Nov 2018)

  Changed paths:
    M changelog/4358.removal.rst
    M src/_pytest/terminal.py
    M testing/python/collect.py

  Log Message:
  -----------
  Skip Instances with --collect-only

  Commit: b1312147e0a6cef77e97cb80aeb9f0962115a401
      https://github.com/pytest-dev/pytest/commit/b1312147e0a6cef77e97cb80aeb9f0962115a401
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-11-11 (Sun, 11 Nov 2018)

  Changed paths:
    A changelog/4358.removal.rst
    M src/_pytest/nodes.py
    M src/_pytest/runner.py
    M src/_pytest/terminal.py
    M testing/python/collect.py
    M testing/test_collection.py
    M testing/test_nodes.py
    M testing/test_session.py

  Log Message:
  -----------
  Merge pull request #4358 from blueyed/instance

Node: do not add "::()" to nodeid

  Commit: dc20dedbc788bc41927612c9ca66b30cc614ecac
      https://github.com/pytest-dev/pytest/commit/dc20dedbc788bc41927612c9ca66b30cc614ecac
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    A changelog/3737.removal.rst
    M doc/en/example/assertion/failure_demo.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_config.py
    M testing/test_mark.py
    M testing/test_nose.py
    M testing/test_pdb.py
    M testing/test_runner_xunit.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Change RemovedInPytest4Warnings to errors by default

To keep existing tests which emit RemovedInPytest4Warnings running, decided
to go with a command line option because:

* Is harder to integrate an ini option with tests which already use an ini file
* It also marks tests which need to be removed/updated in 4.1, when
  RemovedInPytest4Warning and related functionality are removed.

Fix #3737

  Commit: f8f22d29eebb2c8fab51fc6f6c0f00fc119532d5
      https://github.com/pytest-dev/pytest/commit/f8f22d29eebb2c8fab51fc6f6c0f00fc119532d5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-12 (Mon, 12 Nov 2018)

  Changed paths:
    M testing/test_stepwise.py

  Log Message:
  -----------
  Use a custom cache directory for test_stepwise tests

Otherwise the tests will use tox's env cache which makes them flaky

  Commit: a6a96469ca25cc3e6066638679286ebe6cde82c1
      https://github.com/pytest-dev/pytest/commit/a6a96469ca25cc3e6066638679286ebe6cde82c1
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-11-13 (Tue, 13 Nov 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  pytester: pop TOX_ENV_DIR from os.environ

Closes: https://github.com/pytest-dev/pytest/pull/4378
Fixes: https://github.com/pytest-dev/pytest/issues/4366

  Commit: 8198e7cd33d5ddb55231d3fab58511003dcdbaef
      https://github.com/pytest-dev/pytest/commit/8198e7cd33d5ddb55231d3fab58511003dcdbaef
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-13 (Tue, 13 Nov 2018)

  Changed paths:
    A changelog/3737.removal.rst
    M doc/en/example/assertion/failure_demo.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_config.py
    M testing/test_mark.py
    M testing/test_nose.py
    M testing/test_pdb.py
    M testing/test_runner_xunit.py
    M testing/test_stepwise.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #4349 from nicoddemus/pytest4-warnings-as-errors

Change RemovedInPytest4Warnings to errors by default

  Commit: 557cb6cffe0dde3d11affa5da2286353417b6893
      https://github.com/pytest-dev/pytest/commit/557cb6cffe0dde3d11affa5da2286353417b6893
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  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: a72eff5a08b637099aa040665381a638e1422ac4
      https://github.com/pytest-dev/pytest/commit/a72eff5a08b637099aa040665381a638e1422ac4
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-11-13 (Tue, 13 Nov 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #4382 from blueyed/pytester-pop-TOX_ENV_DIR

pytester: pop TOX_ENV_DIR from os.environ

  Commit: fea09cda6c1db283835d2c72ad5c91831a02f844
      https://github.com/pytest-dev/pytest/commit/fea09cda6c1db283835d2c72ad5c91831a02f844
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  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)

  Commit: e025974cbd4102e613a3833e35b8feefe4800d0d
      https://github.com/pytest-dev/pytest/commit/e025974cbd4102e613a3833e35b8feefe4800d0d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-13 (Tue, 13 Nov 2018)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    A changelog/3554.bugfix.rst
    M src/_pytest/runner.py
    M testing/test_runner.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into release-4.0.0

  Commit: c2d6b3524cc0039e152da52fe21eb375e63704cf
      https://github.com/pytest-dev/pytest/commit/c2d6b3524cc0039e152da52fe21eb375e63704cf
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-13 (Tue, 13 Nov 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3554.bugfix.rst
    R changelog/3737.removal.rst
    R changelog/4270.feature.rst
    R changelog/4358.removal.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-4.0.0.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst

  Log Message:
  -----------
  Preparing release version 4.0.0

  Commit: 9dec146edf5baf74a82b91fc85762c8676b604b8
      https://github.com/pytest-dev/pytest/commit/9dec146edf5baf74a82b91fc85762c8676b604b8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-14 (Wed, 14 Nov 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3554.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-4.0.0.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M src/_pytest/cacheprovider.py
    M src/_pytest/config/__init__.py
    M src/_pytest/main.py
    M src/_pytest/nodes.py
    M src/_pytest/pytester.py
    M src/_pytest/runner.py
    M src/_pytest/terminal.py
    M src/_pytest/warnings.py
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_cacheprovider.py
    M testing/test_collection.py
    M testing/test_config.py
    M testing/test_mark.py
    M testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_pdb.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_stepwise.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #4388 from nicoddemus/release-4.0.0

Release 4.0.0

Compare: https://github.com/pytest-dev/pytest/compare/b7863a5f481b...9dec146edf5b
      **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.