Skip to content

Start simplifying collection code in Session #7670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Aug 25, 2020
Merged

Start simplifying collection code in Session #7670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d121d7c
main: inline Session._perform_collect() into perform_collect()
bluetech Aug 15, 2020
32edc46
main: inline Session._matchnodes() into Session.matchnodes()
bluetech Aug 15, 2020
4b8e1a1
Revert "Move common code between Session and Package to FSCollector"
bluetech Aug 14, 2020
57aca11
hookspec: type annotate parent argument to pytest_collect_file
bluetech Aug 20, 2020
0b41b79
main: better solution to a type ignore
bluetech Aug 21, 2020
5356a09
main: small code simplification in matchnodes
bluetech Aug 21, 2020
1b2de81
main: remove unneeded condition in matchnodes
bluetech Aug 21, 2020
adaec2d
main: remove impossible condition in matchnodes
bluetech Aug 21, 2020
a2c919d
main: refactor a bit to reduce indentation
bluetech Aug 21, 2020
0c6b2f3
main: move NoMatch raising to _collect()
bluetech Aug 21, 2020
841521f
main: only perform one recursive matchnodes call per node
bluetech Aug 21, 2020
c225618
main: make matchnodes non-recursive
bluetech Aug 21, 2020
c4fd461
main: better name for _collection_node_cache3
bluetech Aug 21, 2020
eec13ba
main: get rid of NoMatch
bluetech Aug 21, 2020
d0e8b71
main: inline _collect() into collect()
bluetech Aug 22, 2020
c867452
main: inline matchnodes() into collect()
bluetech Aug 22, 2020
023f051
main: move collection cache attributes to local variables in collect()
bluetech Aug 22, 2020
c1f9756
main: couple of code simplifications
bluetech Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/_pytest/doctest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
from _pytest.config import Config
from _pytest.config.argparsing import Parser
from _pytest.fixtures import FixtureRequest
from _pytest.nodes import Collector
from _pytest.outcomes import OutcomeException
from _pytest.pathlib import import_path
from _pytest.python_api import approx
Expand Down Expand Up @@ -118,7 +119,7 @@ def pytest_unconfigure() -> None:


def pytest_collect_file(
path: py.path.local, parent
path: py.path.local, parent: Collector,
) -> Optional[Union["DoctestModule", "DoctestTextfile"]]:
config = parent.config
if path.ext == ".py":
Expand Down
8 changes: 5 additions & 3 deletions src/_pytest/hookspec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,12 @@ def pytest_ignore_collect(path: py.path.local, config: "Config") -> Optional[boo
"""


def pytest_collect_file(path: py.path.local, parent) -> "Optional[Collector]":
"""Return collection Node or None for the given path.
def pytest_collect_file(
path: py.path.local, parent: "Collector"
) -> "Optional[Collector]":
"""Create a Collector for the given path, or None if not relevant.

Any new node needs to have the specified ``parent`` as a parent.
The new node needs to have the specified ``parent`` as a parent.

:param py.path.local path: The path to collect.
"""
Expand Down
Loading