Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Ran Benita <ran@unusedvar.com>
  • Loading branch information
nicoddemus and bluetech authored Jun 4, 2020
1 parent 597b5c4 commit 63dd5ba
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion doc/en/reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ Configuration Options
---------------------

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

.. warning::
Expand Down
6 changes: 3 additions & 3 deletions src/_pytest/config/findpaths.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def _parse_ini_config(path: py.path.local) -> py.iniconfig.IniConfig:
raise UsageError(str(exc))


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


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


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

0 comments on commit 63dd5ba

Please sign in to comment.