From 4d3bf29ff4985177439860d687802c47fd0b9bad Mon Sep 17 00:00:00 2001 From: Konstantin Weddige Date: Thu, 10 Jun 2021 09:51:45 +0200 Subject: [PATCH 1/2] Remove misleading list of default locations The list of location in the second paragraph was missing pyproject.toml and the user config files. This change refers to the complete list in the previous paragraph instead of listing all locations again. --- docs/source/config_file.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/source/config_file.rst b/docs/source/config_file.rst index a5235516739f..ffa23bf21e55 100644 --- a/docs/source/config_file.rst +++ b/docs/source/config_file.rst @@ -13,9 +13,8 @@ to read a different file instead (see :ref:`config-file-flag`). It is important to understand that there is no merging of configuration files, as it would lead to ambiguity. The :option:`--config-file ` flag has the highest precedence and must be correct; otherwise mypy will report -an error and exit. Without command line option, mypy will look for defaults, -but will use only one of them. The first one to read is ``mypy.ini``, -then ``.mypy.ini``, and finally ``setup.cfg``. +an error and exit. Without command line option, mypy will look for defaults in the above mentioned order, +but will use only one of them. Most flags correspond closely to :ref:`command-line flags ` but there are some differences in flag names and some From 0056e61d6a6f3ba5be1942bda28505c8b64cb471 Mon Sep 17 00:00:00 2001 From: Shantanu <12621235+hauntsaninja@users.noreply.github.com> Date: Thu, 10 Jun 2021 01:15:07 -0700 Subject: [PATCH 2/2] Update docs/source/config_file.rst --- docs/source/config_file.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/source/config_file.rst b/docs/source/config_file.rst index ffa23bf21e55..cc3a0bc78392 100644 --- a/docs/source/config_file.rst +++ b/docs/source/config_file.rst @@ -13,8 +13,7 @@ to read a different file instead (see :ref:`config-file-flag`). It is important to understand that there is no merging of configuration files, as it would lead to ambiguity. The :option:`--config-file ` flag has the highest precedence and must be correct; otherwise mypy will report -an error and exit. Without command line option, mypy will look for defaults in the above mentioned order, -but will use only one of them. +an error and exit. Without command line option, mypy will look for configuration files in the above mentioned order. Most flags correspond closely to :ref:`command-line flags ` but there are some differences in flag names and some