summaryrefslogtreecommitdiff
path: root/src/_pytest/main.py
diff options
context:
space:
mode:
authorRan Benita <ran@unusedvar.com>2020-06-25 15:38:54 +0300
committerRan Benita <ran@unusedvar.com>2020-06-25 17:33:21 +0300
commit256a5d8b1458bcd0f73b1722423b07c03e450f5b (patch)
treef1e4b3bd25ef3910c48bab42c5532769fae0cab4 /src/_pytest/main.py
parent97a11726e2bcfdf2fcbcb38c5cb859257bc48f71 (diff)
downloadpytest-256a5d8b1458bcd0f73b1722423b07c03e450f5b.tar.gz
hookspec: improve typing of some remaining hooks
Diffstat (limited to 'src/_pytest/main.py')
-rw-r--r--src/_pytest/main.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/_pytest/main.py b/src/_pytest/main.py
index b7a3a958a..98dabaf87 100644
--- a/src/_pytest/main.py
+++ b/src/_pytest/main.py
@@ -302,8 +302,8 @@ def _main(config: Config, session: "Session") -> Optional[Union[int, ExitCode]]:
return None
-def pytest_collection(session: "Session") -> Sequence[nodes.Item]:
- return session.perform_collect()
+def pytest_collection(session: "Session") -> None:
+ session.perform_collect()
def pytest_runtestloop(session: "Session") -> bool:
@@ -343,9 +343,7 @@ def _in_venv(path: py.path.local) -> bool:
return any([fname.basename in activates for fname in bindir.listdir()])
-def pytest_ignore_collect(
- path: py.path.local, config: Config
-) -> "Optional[Literal[True]]":
+def pytest_ignore_collect(path: py.path.local, config: Config) -> Optional[bool]:
ignore_paths = config._getconftest_pathlist("collect_ignore", path=path.dirpath())
ignore_paths = ignore_paths or []
excludeopt = config.getoption("ignore")