Skip to content

Commit df6f8cd

Browse files
committed
Fix all-formats flag
* Fix MyPy validation for the newest version
1 parent 1d302c5 commit df6f8cd

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
install:
7676
- *upgrade_python_toolset
7777
- *install_deps
78-
- pip install --upgrade "mypy >= 0.700"
78+
- pip install --upgrade "mypy >= 0.720"
7979
script:
8080
- python setup.py --version
8181
- mypy --strict exec_helpers

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Extras:
8484

8585
* ``lxml`` - install `lxml` for advanced XML parsing. Can be unsafe.
8686

87-
* ``ALL_FORMATS`` - install all parsers. When new parsers will be added, it will ne also supported.
87+
* ``ALL_FORMATS`` (``all-formats``) - install all parsers. When new parsers will be added, it will ne also supported.
8888

8989
Usage
9090
=====

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
python -m pip install --upgrade pip
7575
pip install -U setuptools
7676
pip install -r CI_REQUIREMENTS.txt
77-
pip install -U "mypy>=0.700"
77+
pip install -U "mypy>=0.720"
7878
displayName: 'Install dependencies'
7979
8080
- script: |

exec_helpers/async_api/subprocess_runner.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ def stdin(self) -> typing.Optional[asyncio.StreamWriter]: # type: ignore
5353
return super(SubprocessExecuteAsyncResult, self).stdin
5454

5555
@property
56-
def stderr(self) -> typing.Optional[asyncio.StreamReader]: # type: ignore
56+
def stderr(self) -> typing.Optional[typing.AsyncIterable[bytes]]: # type: ignore
5757
"""Override original NamedTuple with proper typing."""
5858
return super(SubprocessExecuteAsyncResult, self).stderr
5959

6060
@property
61-
def stdout(self) -> typing.Optional[asyncio.StreamReader]: # type: ignore
61+
def stdout(self) -> typing.Optional[typing.AsyncIterable[bytes]]: # type: ignore
6262
"""Override original NamedTuple with proper typing."""
6363
return super(SubprocessExecuteAsyncResult, self).stdout
6464

exec_helpers/exec_result.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
except ImportError:
3636
yaml = None # type:ignore # pylint: disable=invalid-name
3737
try:
38-
import ruamel.yaml as ruamel_yaml # type: ignore
38+
import ruamel.yaml as ruamel_yaml
3939
except ImportError:
40-
ruamel_yaml = None # pylint: disable=invalid-name
40+
ruamel_yaml = None # type:ignore # pylint: disable=invalid-name
4141
try:
4242
import defusedxml.ElementTree # type: ignore
4343
except ImportError:

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,8 @@ def get_simple_vars_from_src(src):
266266
"xml": XML_DEPS,
267267
"lxml": LXML_DEPS,
268268
"yaml": YAML_DEPS,
269-
"ALL_FORMATS": XML_DEPS + LXML_DEPS + YAML_DEPS
269+
"all_formats": XML_DEPS + LXML_DEPS + YAML_DEPS,
270+
"all-formats": XML_DEPS + LXML_DEPS + YAML_DEPS,
270271
},
271272
package_data={"exec_helpers": ["py.typed"]},
272273
)

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ commands = pipdeptree
107107

108108
[testenv:mypy]
109109
deps =
110-
mypy>=0.700
110+
mypy>=0.720
111111
-r{toxinidir}/CI_REQUIREMENTS.txt
112112
commands =
113113
python setup.py --version

0 commit comments

Comments
 (0)