[Pytest-commit] [pytest-dev/pytest] 661055: Restructured project.

Bruno Oliveira nicoddemus at gmail.com
Sun Nov 4 10:25:32 EST 2018


  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 661055105c35039774c06be129fdf868b56dbdac
      https://github.com/pytest-dev/pytest/commit/661055105c35039774c06be129fdf868b56dbdac
  Author: Niclas Olofsson <n at niclasolofsson.se>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    A pytest_stepwise/__init__.py
    A pytest_stepwise/compat.py
    A pytest_stepwise/plugin.py
    A tests/conftest.py
    A tests/test_pytest_stepwise.py

  Log Message:
  -----------
  Restructured project.


  Commit: 1d23bef3fb0bf3bf5efba933ccb7ac1bf5b65efa
      https://github.com/pytest-dev/pytest/commit/1d23bef3fb0bf3bf5efba933ccb7ac1bf5b65efa
  Author: Niclas Olofsson <n at niclasolofsson.se>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M pytest_stepwise/plugin.py

  Log Message:
  -----------
  Use a single node ID rather than a set for failed tests.


  Commit: 33f1ff4e8cb49f05c0fe8df38765741e926dd12e
      https://github.com/pytest-dev/pytest/commit/33f1ff4e8cb49f05c0fe8df38765741e926dd12e
  Author: Niclas Olofsson <n at niclasolofsson.se>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M tests/test_pytest_stepwise.py

  Log Message:
  -----------
  Use result.stderr in tests since result.errlines has changed behaviour.


  Commit: bd9495486b7c45a1aadd5fa94a95110ac450a143
      https://github.com/pytest-dev/pytest/commit/bd9495486b7c45a1aadd5fa94a95110ac450a143
  Author: Niclas Olofsson <n at niclasolofsson.se>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M pytest_stepwise/compat.py
    M pytest_stepwise/plugin.py

  Log Message:
  -----------
  pytest 2.7 compatibility.


  Commit: d9c428c1ded12bae5ac98c6780e20bb0d211c90a
      https://github.com/pytest-dev/pytest/commit/d9c428c1ded12bae5ac98c6780e20bb0d211c90a
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M pytest_stepwise/compat.py
    M tests/test_pytest_stepwise.py

  Log Message:
  -----------
  add compat for pytest 3.7 and tox config for (some of) the versions i could still get working


  Commit: c56d7ac40e795494a0f6b445402dec5d36b9f5ed
      https://github.com/pytest-dev/pytest/commit/c56d7ac40e795494a0f6b445402dec5d36b9f5ed
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    R pytest_stepwise/__init__.py
    R pytest_stepwise/compat.py
    R pytest_stepwise/plugin.py
    A src/_pytest/stepwise.py
    A testing/test_stepwise.py
    R tests/conftest.py
    R tests/test_pytest_stepwise.py

  Log Message:
  -----------
  move files into the pytest file structure


  Commit: 63c01d1541eda890cdb10909af09195711c8a36a
      https://github.com/pytest-dev/pytest/commit/63c01d1541eda890cdb10909af09195711c8a36a
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

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

  Log Message:
  -----------
  update for builtin plugin


  Commit: fd66f69c1997fb9dc38a7891ec59210ecbb09558
      https://github.com/pytest-dev/pytest/commit/fd66f69c1997fb9dc38a7891ec59210ecbb09558
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M doc/en/cache.rst

  Log Message:
  -----------
  draft doc


  Commit: 8c059dbc48d201cbaf24a9fc6cc95f357c31abed
      https://github.com/pytest-dev/pytest/commit/8c059dbc48d201cbaf24a9fc6cc95f357c31abed
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    A changelog/xxx.feature.rst

  Log Message:
  -----------
  draft changelog


  Commit: 126bb0760e3f489562d7f7658f26362dcecddc32
      https://github.com/pytest-dev/pytest/commit/126bb0760e3f489562d7f7658f26362dcecddc32
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  authors


  Commit: 4f652c9045ad9cbae3d7f67a1ffd319c95c7face
      https://github.com/pytest-dev/pytest/commit/4f652c9045ad9cbae3d7f67a1ffd319c95c7face
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    A changelog/4147.feature.rst
    R changelog/xxx.feature.rst

  Log Message:
  -----------
  we have a pr number now


  Commit: e773c8ceda6ca576bca148f9018b6d287d709e3a
      https://github.com/pytest-dev/pytest/commit/e773c8ceda6ca576bca148f9018b6d287d709e3a
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M src/_pytest/stepwise.py
    M testing/test_stepwise.py

  Log Message:
  -----------
  linting


  Commit: 8187c148d96de08bac2d1cdad34b825d3675fdef
      https://github.com/pytest-dev/pytest/commit/8187c148d96de08bac2d1cdad34b825d3675fdef
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M testing/test_stepwise.py

  Log Message:
  -----------
  now pinned to pytest version


  Commit: d67d189d00c913218cdec3626460536ecae7d351
      https://github.com/pytest-dev/pytest/commit/d67d189d00c913218cdec3626460536ecae7d351
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M src/_pytest/stepwise.py

  Log Message:
  -----------
  grammar


  Commit: c25310d34f3ef454b7c3e363e0bd6802dab78e6e
      https://github.com/pytest-dev/pytest/commit/c25310d34f3ef454b7c3e363e0bd6802dab78e6e
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-15 (Mon, 15 Oct 2018)

  Changed paths:
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  fix cacheprovider test


  Commit: e478f66d8b9d0e25af7aa4695192bf1adf063ba4
      https://github.com/pytest-dev/pytest/commit/e478f66d8b9d0e25af7aa4695192bf1adf063ba4
  Author: David Szotten <davidszotten at gmail.com>
  Date:   2018-10-17 (Wed, 17 Oct 2018)

  Changed paths:
    M src/_pytest/stepwise.py

  Log Message:
  -----------
  cache is set by the cacheprovider


  Commit: f694d8d6ad4320276001f2a4e40c717a8291d705
      https://github.com/pytest-dev/pytest/commit/f694d8d6ad4320276001f2a4e40c717a8291d705
  Author: Sven-Hendrik Haase <svenstaro at gmail.com>
  Date:   2018-10-18 (Thu, 18 Oct 2018)

  Changed paths:
    M AUTHORS
    A changelog/4188.feature.rst
    M src/_pytest/terminal.py

  Log Message:
  -----------
  Make --color more colorful


  Commit: 43c3f596605ad3ccf989a1d0aa41b5fcc872d25b
      https://github.com/pytest-dev/pytest/commit/43c3f596605ad3ccf989a1d0aa41b5fcc872d25b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-10-18 (Thu, 18 Oct 2018)

  Changed paths:
    M AUTHORS
    A changelog/4188.feature.rst
    M src/_pytest/terminal.py

  Log Message:
  -----------
  Merge pull request #4188 from svenstaro/make-it-more-colorful

Make --color more colorful


  Commit: b432f1207c6f24d96bc07b8cc1ae1bff9311c74d
      https://github.com/pytest-dev/pytest/commit/b432f1207c6f24d96bc07b8cc1ae1bff9311c74d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-10-18 (Thu, 18 Oct 2018)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    A changelog/3533.bugfix.rst
    A changelog/4177.bugfix.rst
    A changelog/4179.bugfix.rst
    M doc/en/deprecations.rst
    M doc/en/warnings.rst
    M pyproject.toml
    M setup.py
    M src/_pytest/junitxml.py
    M src/_pytest/logging.py
    M src/_pytest/pathlib.py
    M testing/test_junitxml.py
    M testing/test_tmpdir.py
    M tox.ini

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

Merge master into features


  Commit: f947cb261325af662e9c455b35f64945f24edc28
      https://github.com/pytest-dev/pytest/commit/f947cb261325af662e9c455b35f64945f24edc28
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-10-20 (Sat, 20 Oct 2018)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M appveyor.yml
    R changelog/2293.feature.rst
    R changelog/2293.trivial.rst
    R changelog/2535.bugfix.rst
    R changelog/3057.bugfix.rst
    R changelog/3332.feature.rst
    A changelog/3533.bugfix.rst
    R changelog/3616.deprecation.rst
    R changelog/3713.doc.rst
    R changelog/3849.feature.rst
    R changelog/3946.bugfix.rst
    R changelog/3964.feature.rst
    R changelog/3985.feature.rst
    R changelog/3988.deprecation.rst
    R changelog/3988.trivial.rst
    R changelog/4013.feature.rst
    R changelog/4058.doc.rst
    R changelog/4064.doc.rst
    R changelog/4066.bugfix.rst
    R changelog/4073.feature.rst
    R changelog/4093.trivial.rst
    R changelog/4098.feature.rst
    R changelog/4102.bugfix.rst
    R changelog/4102.feature.rst
    R changelog/4108.bugfix.rst
    R changelog/4135.bugfix.rst
    R changelog/4149.feature.rst
    A changelog/4177.bugfix.rst
    A changelog/4179.bugfix.rst
    A changelog/4188.feature.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.9.0.rst
    A doc/en/announce/release-3.9.1.rst
    M doc/en/builtin.rst
    M doc/en/deprecations.rst
    M doc/en/example/simple.rst
    M doc/en/tmpdir.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pyproject.toml
    M setup.cfg
    M setup.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/debugging.py
    M src/_pytest/fixtures.py
    M src/_pytest/junitxml.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/pathlib.py
    M src/_pytest/pytester.py
    M src/_pytest/runner.py
    M src/_pytest/terminal.py
    M testing/acceptance_test.py
    M testing/python/fixture.py
    M testing/test_junitxml.py
    M testing/test_pdb.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/features' into davidszotten/stepwise


  Commit: 7bb51b8ceb1df7dad1363ddbaa9abaeb333b4522
      https://github.com/pytest-dev/pytest/commit/7bb51b8ceb1df7dad1363ddbaa9abaeb333b4522
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-10-20 (Sat, 20 Oct 2018)

  Changed paths:
    A changelog/611.bugfix.rst
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    A testing/example_scripts/deprecated/test_fixture_named_request.py

  Log Message:
  -----------
  Issue a warning when a fixture named 'request' is collected

Fix #611


  Commit: f30911d3aff1da91495efdd97d085cb032dcf207
      https://github.com/pytest-dev/pytest/commit/f30911d3aff1da91495efdd97d085cb032dcf207
  Author: Ankit Goel <ankitgoel616 at gmail.com>
  Date:   2018-10-21 (Sun, 21 Oct 2018)

  Changed paths:
    A changelog/611.bugfix.rst
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    A testing/example_scripts/deprecated/test_fixture_named_request.py

  Log Message:
  -----------
  Merge pull request #4209 from nicoddemus/fixture-named-request

Issue a warning when a fixture named 'request' is collected


  Commit: b51ee48f787680a41f025118e87a37ca9388a1f3
      https://github.com/pytest-dev/pytest/commit/b51ee48f787680a41f025118e87a37ca9388a1f3
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-23 (Tue, 23 Oct 2018)

  Changed paths:
    M src/_pytest/pathlib.py

  Log Message:
  -----------
  minor: remove unused _shutil_rmtree_remove_writable


  Commit: 2a45851c9e44c2dac9723364019fe08088aa31c2
      https://github.com/pytest-dev/pytest/commit/2a45851c9e44c2dac9723364019fe08088aa31c2
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-10-23 (Tue, 23 Oct 2018)

  Changed paths:
    M src/_pytest/pathlib.py

  Log Message:
  -----------
  Merge pull request #4218 from blueyed/remove-_shutil_rmtree_remove_writable

minor: remove unused _shutil_rmtree_remove_writable


  Commit: f8f4c16020b8aff3fca398e9f8c6d16f8c001fed
      https://github.com/pytest-dev/pytest/commit/f8f4c16020b8aff3fca398e9f8c6d16f8c001fed
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-24 (Wed, 24 Oct 2018)

  Changed paths:
    A changelog/4225.feature.rst
    M src/_pytest/terminal.py

  Log Message:
  -----------
  TerminalWriter: write "collecting" msg only once every 0.1s

Running `pytest -k doesnotmatch` on pytest's own tests takes ~3s with
Kitty terminal for me, but only ~1s with `-q`.
It also is faster with urxvt, but still takes 2.2s there.

This patch only calls `report_collect` every 0.1s, which is good enough
for reporting collection progress, and improves the time with both Kitty
and urxvt to ~1.2s for me.


  Commit: d40cd3ec6b9afe563ad0ec14173ace2d665861d1
      https://github.com/pytest-dev/pytest/commit/d40cd3ec6b9afe563ad0ec14173ace2d665861d1
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-24 (Wed, 24 Oct 2018)

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

  Log Message:
  -----------
  Use functools.lru_cache with _getconftest_pathlist

For pytest's own suite the `cache_info()` looks as follows:

    > session.config._getconftest_pathlist.cache_info()
    CacheInfo(hits=231, misses=19, maxsize=None, currsize=19)

While it does not really make a difference for me this might help with
larger test suites / the case mentioned in
https://github.com/pytest-dev/pytest/issues/2206#issuecomment-432623646.


  Commit: e690e191fd4c1635d5420e5bd323768716c53ff4
      https://github.com/pytest-dev/pytest/commit/e690e191fd4c1635d5420e5bd323768716c53ff4
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-10-24 (Wed, 24 Oct 2018)

  Changed paths:
    A changelog/4225.feature.rst
    M src/_pytest/terminal.py

  Log Message:
  -----------
  Merge pull request #4225 from blueyed/collect-performance

TerminalWriter: write "collecting" msg only once every 0.5s


  Commit: eee8201e4f85b5c70ac7127a67104410fba50e16
      https://github.com/pytest-dev/pytest/commit/eee8201e4f85b5c70ac7127a67104410fba50e16
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-24 (Wed, 24 Oct 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    R changelog/3533.bugfix.rst
    A changelog/3851.doc.rst
    A changelog/4174.bugfix.rst
    R changelog/4177.bugfix.rst
    R changelog/4179.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.9.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/py2py3/test_py2.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/writing_plugins.rst
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/fixtures.py
    M src/_pytest/logging.py
    M src/_pytest/pathlib.py
    M src/_pytest/recwarn.py
    M src/_pytest/warnings.py
    A testing/example_scripts/fixtures/fill_fixtures/test_detect_recursive_dependency_error.py
    M testing/logging/test_reporting.py
    M testing/python/fixture.py
    M testing/test_collection.py
    M testing/test_conftest.py
    M testing/test_recwarn.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into merge-master


  Commit: 66ce952da687819fc6d9022b0d043f5093f78e48
      https://github.com/pytest-dev/pytest/commit/66ce952da687819fc6d9022b0d043f5093f78e48
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-10-24 (Wed, 24 Oct 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    R changelog/3533.bugfix.rst
    A changelog/3851.doc.rst
    A changelog/4174.bugfix.rst
    R changelog/4177.bugfix.rst
    R changelog/4179.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.9.2.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/py2py3/test_py2.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/tmpdir.rst
    M doc/en/writing_plugins.rst
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/fixtures.py
    M src/_pytest/logging.py
    M src/_pytest/pathlib.py
    M src/_pytest/recwarn.py
    M src/_pytest/warnings.py
    A testing/example_scripts/fixtures/fill_fixtures/test_detect_recursive_dependency_error.py
    M testing/logging/test_reporting.py
    M testing/python/fixture.py
    M testing/test_collection.py
    M testing/test_conftest.py
    M testing/test_recwarn.py
    M testing/test_warnings.py
    M tox.ini

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

Merge master into features


  Commit: 1786ad16a7851cd28d1f3f2ebdbbefd30bab7177
      https://github.com/pytest-dev/pytest/commit/1786ad16a7851cd28d1f3f2ebdbbefd30bab7177
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-10-24 (Wed, 24 Oct 2018)

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

  Log Message:
  -----------
  functools.lru_cache does not exist on Python 2, apply for Python 3 only


  Commit: 65b97c2f41315de1b39fe9f9595727ec3b327077
      https://github.com/pytest-dev/pytest/commit/65b97c2f41315de1b39fe9f9595727ec3b327077
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-10-25 (Thu, 25 Oct 2018)

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

  Log Message:
  -----------
  Merge pull request #4227 from blueyed/_getconftest_pathlist-lru

Use functools.lru_cache with _getconftest_pathlist


  Commit: a4ea66cb1fcbb8a7723c764d67a817a0afdee36d
      https://github.com/pytest-dev/pytest/commit/a4ea66cb1fcbb8a7723c764d67a817a0afdee36d
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-25 (Thu, 25 Oct 2018)

  Changed paths:
    A changelog/2619.feature.rst
    M src/_pytest/debugging.py
    M src/_pytest/hookspec.py
    M testing/test_pdb.py

  Log Message:
  -----------
  pdb: resume capturing after `continue`

After `pdb.set_trace()` capturing is turned off.
This patch resumes it after using the `continue` (or `c` / `cont`)
command.

Store _pytest_capman on the class, for pdbpp's do_debug hack to keep it.

Without this, `debug …` would fail like this:

    /usr/lib/python3.6/cmd.py:217: in onecmd
  return func(arg)
    .venv/lib/python3.6/site-packages/pdb.py:608: in do_debug
  return orig_do_debug(self, arg)
    /usr/lib/python3.6/pdb.py:1099: in do_debug
  sys.call_tracing(p.run, (arg, globals, locals))
    /usr/lib/python3.6/bdb.py:434: in run
  exec(cmd, globals, locals)
    /usr/lib/python3.6/bdb.py:51: in trace_dispatch
  return self.dispatch_line(frame)
    /usr/lib/python3.6/bdb.py:69: in dispatch_line
  self.user_line(frame)
    /usr/lib/python3.6/pdb.py:261: in user_line
  self.interaction(frame, None)
    .venv/lib/python3.6/site-packages/pdb.py:203: in interaction
  self.setup(frame, traceback)
    E   AttributeError: 'PytestPdb' object has no attribute '_pytest_capman'

- add pytest_leave_pdb hook
- fixes test_pdb_interaction_capturing_twice: would fail on master now,
  but works here


  Commit: ede3a4e850e8d2d3dedbb90eca84bc80a6f6bc27
      https://github.com/pytest-dev/pytest/commit/ede3a4e850e8d2d3dedbb90eca84bc80a6f6bc27
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-25 (Thu, 25 Oct 2018)

  Changed paths:
    M changelog/2619.feature.rst
    M src/_pytest/debugging.py
    M src/_pytest/hookspec.py
    M testing/test_pdb.py

  Log Message:
  -----------
  pytest_{enter,leave}_pdb: pass through pdb instance


  Commit: f466105d66723f226555224e619683abbce93fe4
      https://github.com/pytest-dev/pytest/commit/f466105d66723f226555224e619683abbce93fe4
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-10-25 (Thu, 25 Oct 2018)

  Changed paths:
    A changelog/2619.feature.rst
    M src/_pytest/debugging.py
    M src/_pytest/hookspec.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #2619 from blueyed/pdb-resume-capture

pdb: resume capturing after `continue`


  Commit: 0dc6cb298e4e35b8f4192973ffa73db0b24575d8
      https://github.com/pytest-dev/pytest/commit/0dc6cb298e4e35b8f4192973ffa73db0b24575d8
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-25 (Thu, 25 Oct 2018)

  Changed paths:
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py

  Log Message:
  -----------
  Move lru_cache wrapper to compat

Ref: https://github.com/pytest-dev/pytest/pull/4227#discussion_r228060373


  Commit: 6dc575f5eebc470fcb39fe8627d80818f449ff17
      https://github.com/pytest-dev/pytest/commit/6dc575f5eebc470fcb39fe8627d80818f449ff17
  Author: Daniel Hahler <github at thequod.de>
  Date:   2018-10-25 (Thu, 25 Oct 2018)

  Changed paths:
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py

  Log Message:
  -----------
  Merge pull request #4239 from blueyed/lru_cache

Move lru_cache wrapper to compat


  Commit: e04182364338ed9cd2a63945204701c99e297f21
      https://github.com/pytest-dev/pytest/commit/e04182364338ed9cd2a63945204701c99e297f21
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-25 (Thu, 25 Oct 2018)

  Changed paths:
    M src/_pytest/main.py
    M src/_pytest/python.py
    M testing/test_session.py

  Log Message:
  -----------
  Move handling of duplicate files

This removes the hack added in https://github.com/pytest-dev/pytest/pull/3802.

Adjusts test:

- it appears to not have been changed to 7 intentionally.
- removes XXX comment, likely not relevant anymore since 6dac7743.


  Commit: 777e9e1e17ffe389f92010802484b5b18c7406bf
      https://github.com/pytest-dev/pytest/commit/777e9e1e17ffe389f92010802484b5b18c7406bf
  Author: Anthony Sottile <asottile at umich.edu>
  Date:   2018-10-25 (Thu, 25 Oct 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M bench/bench_argcomplete.py
    M bench/skip.py
    A changelog/4028.trivial.rst
    A changelog/4221.bugfix.rst
    A changelog/4233.trivial.rst
    M doc/en/_themes/flask_theme_support.py
    M doc/en/conf.py
    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/example/nonpython/conftest.py
    M doc/en/example/py2py3/conftest.py
    M extra/get_issues.py
    M scripts/release.py
    M setup.py
    M src/_pytest/_argcomplete.py
    M src/_pytest/_code/__init__.py
    M src/_pytest/_code/_py2traceback.py
    M src/_pytest/_code/code.py
    M src/_pytest/_code/source.py
    M src/_pytest/assertion/__init__.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/truncate.py
    M src/_pytest/assertion/util.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/config/argparsing.py
    M src/_pytest/config/findpaths.py
    M src/_pytest/debugging.py
    M src/_pytest/deprecated.py
    M src/_pytest/doctest.py
    M src/_pytest/fixtures.py
    M src/_pytest/freeze_support.py
    M src/_pytest/helpconfig.py
    M src/_pytest/hookspec.py
    M src/_pytest/junitxml.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/mark/__init__.py
    M src/_pytest/mark/evaluate.py
    M src/_pytest/mark/legacy.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/nodes.py
    M src/_pytest/nose.py
    M src/_pytest/outcomes.py
    M src/_pytest/pastebin.py
    M src/_pytest/pathlib.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/reports.py
    M src/_pytest/resultlog.py
    M src/_pytest/runner.py
    M src/_pytest/setuponly.py
    M src/_pytest/setupplan.py
    M src/_pytest/skipping.py
    M src/_pytest/terminal.py
    M src/_pytest/tmpdir.py
    M src/_pytest/unittest.py
    M src/_pytest/warnings.py
    M src/pytest.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/deprecated_test.py
    M testing/example_scripts/issue_519.py
    M testing/example_scripts/unittest/test_parametrized_fixture_error_message.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/raises.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_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_paths.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into merge-master


  Commit: bf199175371349999d2e65f5f25c59be2a9c6f00
      https://github.com/pytest-dev/pytest/commit/bf199175371349999d2e65f5f25c59be2a9c6f00
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-10-26 (Fri, 26 Oct 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M bench/bench_argcomplete.py
    M bench/skip.py
    A changelog/4028.trivial.rst
    A changelog/4221.bugfix.rst
    A changelog/4233.trivial.rst
    M doc/en/_themes/flask_theme_support.py
    M doc/en/conf.py
    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/example/nonpython/conftest.py
    M doc/en/example/py2py3/conftest.py
    M extra/get_issues.py
    M scripts/release.py
    M setup.py
    M src/_pytest/_argcomplete.py
    M src/_pytest/_code/__init__.py
    M src/_pytest/_code/_py2traceback.py
    M src/_pytest/_code/code.py
    M src/_pytest/_code/source.py
    M src/_pytest/assertion/__init__.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/truncate.py
    M src/_pytest/assertion/util.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/config/argparsing.py
    M src/_pytest/config/findpaths.py
    M src/_pytest/debugging.py
    M src/_pytest/deprecated.py
    M src/_pytest/doctest.py
    M src/_pytest/fixtures.py
    M src/_pytest/freeze_support.py
    M src/_pytest/helpconfig.py
    M src/_pytest/hookspec.py
    M src/_pytest/junitxml.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/mark/__init__.py
    M src/_pytest/mark/evaluate.py
    M src/_pytest/mark/legacy.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/nodes.py
    M src/_pytest/nose.py
    M src/_pytest/outcomes.py
    M src/_pytest/pastebin.py
    M src/_pytest/pathlib.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/reports.py
    M src/_pytest/resultlog.py
    M src/_pytest/runner.py
    M src/_pytest/setuponly.py
    M src/_pytest/setupplan.py
    M src/_pytest/skipping.py
    M src/_pytest/terminal.py
    M src/_pytest/tmpdir.py
    M src/_pytest/unittest.py
    M src/_pytest/warnings.py
    M src/pytest.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/deprecated_test.py
    M testing/example_scripts/issue_519.py
    M testing/example_scripts/unittest/test_parametrized_fixture_error_message.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/raises.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_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_paths.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py

  Log Message:
  -----------
  Merge pull request #4242 from pytest-dev/merge-master

merge master into features


  Commit: 8d0e1a99e49ac0fbe08721c7abbbbb379f6cae59
      https://github.com/pytest-dev/pytest/commit/8d0e1a99e49ac0fbe08721c7abbbbb379f6cae59
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-10-26 (Fri, 26 Oct 2018)

  Changed paths:
    M src/_pytest/main.py
    M src/_pytest/python.py
    M testing/test_session.py

  Log Message:
  -----------
  Merge pull request #4241 from blueyed/move-duplicates

Move handling of duplicate files


  Commit: dcdf86ef5bdfffddbed6e5748ea83553a5294370
      https://github.com/pytest-dev/pytest/commit/dcdf86ef5bdfffddbed6e5748ea83553a5294370
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-26 (Fri, 26 Oct 2018)

  Changed paths:
    M src/_pytest/python.py

  Log Message:
  -----------
  python: collect: revisit


  Commit: e986d06ade5d54ddcc6091caab7063e0acf14ada
      https://github.com/pytest-dev/pytest/commit/e986d06ade5d54ddcc6091caab7063e0acf14ada
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-10-27 (Sat, 27 Oct 2018)

  Changed paths:
    M src/_pytest/python.py

  Log Message:
  -----------
  Merge pull request #4251 from blueyed/python-collect

python: collect: revisit


  Commit: 9fe871016db65f5ef2a7bfb57765c49a56e3b54a
      https://github.com/pytest-dev/pytest/commit/9fe871016db65f5ef2a7bfb57765c49a56e3b54a
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-10-27 (Sat, 27 Oct 2018)

  Changed paths:
    M AUTHORS
    A changelog/4147.feature.rst
    M doc/en/cache.rst
    M src/_pytest/config/__init__.py
    A src/_pytest/stepwise.py
    M testing/test_cacheprovider.py
    A testing/test_stepwise.py

  Log Message:
  -----------
  Merge pull request #4147 from davidszotten/stepwise

Stepwise


  Commit: 3b7fbcd47fee9676224a06cf73cf1dd31bb7c215
      https://github.com/pytest-dev/pytest/commit/3b7fbcd47fee9676224a06cf73cf1dd31bb7c215
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-10-27 (Sat, 27 Oct 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3851.doc.rst
    R changelog/4028.trivial.rst
    R changelog/4174.bugfix.rst
    R changelog/4221.bugfix.rst
    R changelog/4233.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.9.3.rst
    M doc/en/builtin.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/pathlib.py
    M src/_pytest/recwarn.py
    A testing/example_scripts/perf_examples/collect_stats/.gitignore
    A testing/example_scripts/perf_examples/collect_stats/generate_folders.py
    A testing/example_scripts/perf_examples/collect_stats/template_test.py
    M testing/test_recwarn.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into merge-master-into-features


  Commit: cc531a1ca998fc8358610d14eae03f44a7726daf
      https://github.com/pytest-dev/pytest/commit/cc531a1ca998fc8358610d14eae03f44a7726daf
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-10-28 (Sun, 28 Oct 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3851.doc.rst
    R changelog/4028.trivial.rst
    R changelog/4174.bugfix.rst
    R changelog/4221.bugfix.rst
    R changelog/4233.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.9.3.rst
    M doc/en/builtin.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M src/_pytest/config/__init__.py
    M src/_pytest/pathlib.py
    M src/_pytest/recwarn.py
    A testing/example_scripts/perf_examples/collect_stats/.gitignore
    A testing/example_scripts/perf_examples/collect_stats/generate_folders.py
    A testing/example_scripts/perf_examples/collect_stats/template_test.py
    M testing/test_recwarn.py
    M testing/test_tmpdir.py

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

Merge master into features


  Commit: 40228fce5a7b3aaab07870ca73998c46eb410460
      https://github.com/pytest-dev/pytest/commit/40228fce5a7b3aaab07870ca73998c46eb410460
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-30 (Tue, 30 Oct 2018)

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

  Log Message:
  -----------
  collection: _recurse: skip __pycache__


  Commit: 233c2a23de1c5e11c26eaa06a79977fd5811f7f2
      https://github.com/pytest-dev/pytest/commit/233c2a23de1c5e11c26eaa06a79977fd5811f7f2
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-10-30 (Tue, 30 Oct 2018)

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

  Log Message:
  -----------
  Merge pull request #4250 from blueyed/ignore-pyc

collection: _recurse: skip __pycache__


  Commit: 1f1d4aaf6881dd40e69a0388d42b78b072ba4e8c
      https://github.com/pytest-dev/pytest/commit/1f1d4aaf6881dd40e69a0388d42b78b072ba4e8c
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-30 (Tue, 30 Oct 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  cacheprovider: display cachedir also in non-verbose mode if customized


  Commit: e0038b82f7e76b73f2555fc8b065f94513570020
      https://github.com/pytest-dev/pytest/commit/e0038b82f7e76b73f2555fc8b065f94513570020
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-31 (Wed, 31 Oct 2018)

  Changed paths:
    M src/_pytest/capture.py
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  pdb: improve msg about output capturing with set_trace

Do not display "IO-capturing turned off/on" when ``-s`` is used to avoid
confusion.


  Commit: 65817dd7975610d459467c4911b45f6bffe5352d
      https://github.com/pytest-dev/pytest/commit/65817dd7975610d459467c4911b45f6bffe5352d
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-31 (Wed, 31 Oct 2018)

  Changed paths:
    A changelog/4277.trivial.rst

  Log Message:
  -----------
  changelog  [ci skip]


  Commit: ce1cc3dddb384d7f73d8409280931342e9c539e2
      https://github.com/pytest-dev/pytest/commit/ce1cc3dddb384d7f73d8409280931342e9c539e2
  Author: Daniel Hahler <git at thequod.de>
  Date:   2018-10-31 (Wed, 31 Oct 2018)

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

  Log Message:
  -----------
  _getconftestmodules: use functools.lru_cache

Also renames `_path2confmods` to `_dirpath2confmods` for clarity (it is
expected to be a dirpath in `_importconftest`).

Uses an explicit maxsize, since it appears to be only relevant for a
short period [1].

Removes the lru_cache on _getconftest_pathlist, which makes no
difference when caching _getconftestmodules, at least with the
performance test of 100x10 files (#4237).

1: https://github.com/pytest-dev/pytest/pull/4237#discussion_r228528007


  Commit: 017e504a11278d1edd9a29f12962bb6caeb85b9b
      https://github.com/pytest-dev/pytest/commit/017e504a11278d1edd9a29f12962bb6caeb85b9b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-10-31 (Wed, 31 Oct 2018)

  Changed paths:
    A changelog/4277.trivial.rst
    M src/_pytest/capture.py
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #4277 from blueyed/pdb-set_trace-capture-msg

pdb: improve msg about output capturing with set_trace


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

  Changed paths:
    A changelog/4272.trivial.rst

  Log Message:
  -----------
  changelog  [ci skip]


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

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

  Log Message:
  -----------
  Merge pull request #4247 from blueyed/lru

_getconftestmodules: use functools.lru_cache


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

  Changed paths:
    A changelog/4272.trivial.rst
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  Merge pull request #4272 from blueyed/cache-non-default

cacheprovider: display cachedir also in non-verbose mode if customized


  Commit: a41820fbf0ca5ba25fc64bc0f976c3b3d4af53ea
      https://github.com/pytest-dev/pytest/commit/a41820fbf0ca5ba25fc64bc0f976c3b3d4af53ea
  Author: Anders Hovmöller <anders.hovmoller at trioptima.com>
  Date:   2018-11-02 (Fri, 02 Nov 2018)

  Changed paths:
    M src/_pytest/main.py
    M src/_pytest/pathlib.py
    M src/_pytest/python.py

  Log Message:
  -----------
  collection: performance: use optimized parts function

Time: 8.53s => 5.73s


  Commit: 2b50911c9d9e7cc2c3ffa38c70bff398109718ef
      https://github.com/pytest-dev/pytest/commit/2b50911c9d9e7cc2c3ffa38c70bff398109718ef
  Author: Anders Hovmöller <anders.hovmoller at trioptima.com>
  Date:   2018-11-02 (Fri, 02 Nov 2018)

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

  Log Message:
  -----------
  Minor refactor for readability

Time: 5.73s => 5.88s/5.82s


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

  Changed paths:
    M src/_pytest/main.py

  Log Message:
  -----------
  Handle dirs only once

Time: 5.73s/5.88s => 5.36s

(Before rebase: 4.86s => 4.45s)


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

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

  Log Message:
  -----------
  paths: use set and isdisjoint

Time: 5.36s => 4.85s (before rebase: 4.45s => 3.55s)


  Commit: 4cb838d97809bbe573c69c6683b1b9a6b0108a8c
      https://github.com/pytest-dev/pytest/commit/4cb838d97809bbe573c69c6683b1b9a6b0108a8c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-03 (Sat, 03 Nov 2018)

  Changed paths:
    M src/_pytest/main.py
    M src/_pytest/pathlib.py
    M src/_pytest/python.py

  Log Message:
  -----------
  Merge pull request #4237 from boxed/master

Performance fixes


  Commit: 6befdf8b46dea2138dcd4e275c930dcd83a586ac
      https://github.com/pytest-dev/pytest/commit/6befdf8b46dea2138dcd4e275c930dcd83a586ac
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-03 (Sat, 03 Nov 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    A changelog/2701.bugfix.rst
    A changelog/4046.bugfix.rst
    A changelog/4255.doc.rst
    A changelog/4260.bugfix.rst
    A changelog/4262.bugfix.rst
    A changelog/4279.trivial.rst
    A doc/4266.bugfix.rst
    M doc/en/contents.rst
    M doc/en/example/multipython.py
    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/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

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


  Commit: 1ec6805112fdec201fc94d2a586c40ba8aaf57dd
      https://github.com/pytest-dev/pytest/commit/1ec6805112fdec201fc94d2a586c40ba8aaf57dd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-03 (Sat, 03 Nov 2018)

  Changed paths:
    M doc/en/example/multipython.py

  Log Message:
  -----------
  Fix escape in code sample


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/2619.feature.rst
    R changelog/2701.bugfix.rst
    R changelog/4046.bugfix.rst
    R changelog/4147.feature.rst
    R changelog/4188.feature.rst
    R changelog/4225.feature.rst
    R changelog/4255.doc.rst
    R changelog/4260.bugfix.rst
    R changelog/4262.bugfix.rst
    R changelog/4272.trivial.rst
    R changelog/4277.trivial.rst
    R changelog/4279.trivial.rst
    R changelog/611.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/example/nonpython.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Preparing release version 3.10.0


  Commit: 3d88d1827b42b7f7b0e774d19ac58f02e5c67d0a
      https://github.com/pytest-dev/pytest/commit/3d88d1827b42b7f7b0e774d19ac58f02e5c67d0a
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-11-03 (Sat, 03 Nov 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fixed linting


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

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    R changelog/2701.bugfix.rst
    R changelog/4046.bugfix.rst
    R changelog/4255.doc.rst
    R changelog/4260.bugfix.rst
    R changelog/4262.bugfix.rst
    R changelog/4279.trivial.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.10.0.rst
    M doc/en/cache.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/writing_plugins.rst
    M src/_pytest/cacheprovider.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/debugging.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/hookspec.py
    M src/_pytest/main.py
    M src/_pytest/pathlib.py
    M src/_pytest/python.py
    A src/_pytest/stepwise.py
    M src/_pytest/terminal.py
    M testing/deprecated_test.py
    A testing/example_scripts/deprecated/test_fixture_named_request.py
    M testing/test_cacheprovider.py
    M testing/test_conftest.py
    M testing/test_pdb.py
    A testing/test_stepwise.py

  Log Message:
  -----------
  Merge pull request #4297 from nicoddemus/release-3.10.0

Release 3.10.0


Compare: https://github.com/pytest-dev/pytest/compare/bb2ed2f89853...d1c9c545716e
      **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.


More information about the pytest-commit mailing list