From c7ca8e3d2c5a957510e70163c8155f2cd9a3f017 Mon Sep 17 00:00:00 2001 From: James Braza Date: Thu, 16 Dec 2021 20:33:19 -0800 Subject: [PATCH 1/5] Added lxml and reporting extras option --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 10042279a446..9fdc5c673d26 100644 --- a/setup.py +++ b/setup.py @@ -199,7 +199,11 @@ def run(self): 'tomli>=1.1.0', ], # Same here. - extras_require={'dmypy': 'psutil >= 4.0', 'python2': 'typed_ast >= 1.4.0, < 2'}, + extras_require={ + 'dmypy': 'psutil >= 4.0', + 'python2': 'typed_ast >= 1.4.0, < 2', + 'reporting': 'lxml' + }, python_requires=">=3.6", include_package_data=True, project_urls={ From ff005a9bc9ecb4f851190e08426de6e87e5da9bb Mon Sep 17 00:00:00 2001 From: James Braza Date: Sat, 1 Jan 2022 14:14:41 -0500 Subject: [PATCH 2/5] Changed extras name from reporting to reports --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9fdc5c673d26..00d207b51ca2 100644 --- a/setup.py +++ b/setup.py @@ -202,7 +202,7 @@ def run(self): extras_require={ 'dmypy': 'psutil >= 4.0', 'python2': 'typed_ast >= 1.4.0, < 2', - 'reporting': 'lxml' + 'reports': 'lxml' }, python_requires=">=3.6", include_package_data=True, From 00e991cc4d7b7f1e835d82a753ad9e03a12e0867 Mon Sep 17 00:00:00 2001 From: James Braza Date: Sat, 1 Jan 2022 14:26:47 -0500 Subject: [PATCH 3/5] Testing what updated docs look like in browser --- docs/source/command_line.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/source/command_line.rst b/docs/source/command_line.rst index 7405ab563e0d..19b409efb098 100644 --- a/docs/source/command_line.rst +++ b/docs/source/command_line.rst @@ -853,7 +853,9 @@ format into the specified directory. Causes mypy to generate a Cobertura XML type checking coverage report. - You must install the `lxml`_ library to generate this report. + To generate this report, you must either manually install the `lxml`_ + library or specify mypy installation with the setuptools extra + ``mypy[reports]``. .. option:: --html-report / --xslt-html-report DIR From 4f6f85746301402421c12d761c54d9f3f7e0b487 Mon Sep 17 00:00:00 2001 From: James Braza Date: Sat, 1 Jan 2022 14:33:30 -0500 Subject: [PATCH 4/5] Made changes to rest of lxml mentions since change was a success --- docs/source/command_line.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/source/command_line.rst b/docs/source/command_line.rst index 19b409efb098..b8b14ad61434 100644 --- a/docs/source/command_line.rst +++ b/docs/source/command_line.rst @@ -861,7 +861,9 @@ format into the specified directory. Causes mypy to generate an HTML type checking coverage report. - You must install the `lxml`_ library to generate this report. + To generate this report, you must either manually install the `lxml`_ + library or specify mypy installation with the setuptools extra + ``mypy[reports]``. .. option:: --linecount-report DIR @@ -883,13 +885,17 @@ format into the specified directory. Causes mypy to generate a text file type checking coverage report. - You must install the `lxml`_ library to generate this report. + To generate this report, you must either manually install the `lxml`_ + library or specify mypy installation with the setuptools extra + ``mypy[reports]``. .. option:: --xml-report DIR Causes mypy to generate an XML type checking coverage report. - You must install the `lxml`_ library to generate this report. + To generate this report, you must either manually install the `lxml`_ + library or specify mypy installation with the setuptools extra + ``mypy[reports]``. Miscellaneous ************* From 1f4d81d29854534a6f7999126eb8e2dc3a032ce3 Mon Sep 17 00:00:00 2001 From: James Braza Date: Sat, 1 Jan 2022 14:36:55 -0500 Subject: [PATCH 5/5] Changed in config_file as well --- docs/source/config_file.rst | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/source/config_file.rst b/docs/source/config_file.rst index c34f23d9e169..11d3a31d13e3 100644 --- a/docs/source/config_file.rst +++ b/docs/source/config_file.rst @@ -820,7 +820,9 @@ format into the specified directory. Causes mypy to generate a Cobertura XML type checking coverage report. - You must install the `lxml`_ library to generate this report. + To generate this report, you must either manually install the `lxml`_ + library or specify mypy installation with the setuptools extra + ``mypy[reports]``. .. confval:: html_report / xslt_html_report @@ -828,7 +830,9 @@ format into the specified directory. Causes mypy to generate an HTML type checking coverage report. - You must install the `lxml`_ library to generate this report. + To generate this report, you must either manually install the `lxml`_ + library or specify mypy installation with the setuptools extra + ``mypy[reports]``. .. confval:: linecount_report @@ -858,7 +862,9 @@ format into the specified directory. Causes mypy to generate a text file type checking coverage report. - You must install the `lxml`_ library to generate this report. + To generate this report, you must either manually install the `lxml`_ + library or specify mypy installation with the setuptools extra + ``mypy[reports]``. .. confval:: xml_report @@ -866,7 +872,9 @@ format into the specified directory. Causes mypy to generate an XML type checking coverage report. - You must install the `lxml`_ library to generate this report. + To generate this report, you must either manually install the `lxml`_ + library or specify mypy installation with the setuptools extra + ``mypy[reports]``. Miscellaneous