Skip to content

Commit 63dd5ba

Browse files
nicoddemusbluetech
andauthored
Apply suggestions from code review
Co-authored-by: Ran Benita <[email protected]>
1 parent 597b5c4 commit 63dd5ba

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

doc/en/reference.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ Configuration Options
10201020
---------------------
10211021

10221022
Here is a list of builtin configuration options that may be written in a ``pytest.ini``, ``pyproject.toml``, ``tox.ini`` or ``setup.cfg``
1023-
file, usually located at the root of your repository. To see each file format in details, see
1023+
file, usually located at the root of your repository. To see each file format in detail, see
10241024
:ref:`config file formats`.
10251025

10261026
.. warning::

src/_pytest/config/findpaths.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def _parse_ini_config(path: py.path.local) -> py.iniconfig.IniConfig:
3535
raise UsageError(str(exc))
3636

3737

38-
def _get_ini_config_from_pytest_ini(path: py.path.local) -> Optional[Dict[str, Any]]:
38+
def _get_ini_config_from_pytest_ini(path: py.path.local) -> Optional[Dict[str, Optional[str]]]:
3939
"""Parses and validates a 'pytest.ini' file.
4040
4141
If present, 'pytest.ini' files are always considered the source of truth of pytest
@@ -48,7 +48,7 @@ def _get_ini_config_from_pytest_ini(path: py.path.local) -> Optional[Dict[str, A
4848
return {}
4949

5050

51-
def _get_ini_config_from_tox_ini(path: py.path.local) -> Optional[Dict[str, Any]]:
51+
def _get_ini_config_from_tox_ini(path: py.path.local) -> Optional[Dict[str, Optional[str]]]:
5252
"""Parses and validates a 'tox.ini' file for pytest configuration.
5353
5454
'tox.ini' files are only considered for pytest configuration if they contain a "[pytest]"
@@ -61,7 +61,7 @@ def _get_ini_config_from_tox_ini(path: py.path.local) -> Optional[Dict[str, Any]
6161
return None
6262

6363

64-
def _get_ini_config_from_setup_cfg(path: py.path.local) -> Optional[Dict[str, Any]]:
64+
def _get_ini_config_from_setup_cfg(path: py.path.local) -> Optional[Dict[str, Optional[str]]]:
6565
"""Parses and validates a 'setup.cfg' file for pytest configuration.
6666
6767
'setup.cfg' files are only considered for pytest configuration if they contain a "[tool:pytest]"

0 commit comments

Comments
 (0)