From: Ben Darnell Date: Sun, 7 Oct 2018 02:02:00 +0000 (-0400) Subject: mypy: Update to 0.630 and pin that version X-Git-Tag: v6.0.0b1~28^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4265f549123408ef43ba4b415b270cd319e50e5a;p=thirdparty%2Ftornado.git mypy: Update to 0.630 and pin that version --- diff --git a/.travis.yml b/.travis.yml index e200778a3..3a5d4accd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ install: # version supported. But Python 3.7 requires slower-to-start VMs, # so we run it on 3.6 to minimize total CI run time. - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install -r docs/requirements.txt; fi - - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install flake8 mypy; fi + - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install flake8 mypy==0.630; fi # On travis the extension should always be built - if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then export TORNADO_EXTENSION=1; fi - travis_retry python setup.py install diff --git a/tornado/wsgi.py b/tornado/wsgi.py index ad49c5cf9..053864877 100644 --- a/tornado/wsgi.py +++ b/tornado/wsgi.py @@ -93,13 +93,13 @@ class WSGIContainer(object): response = [] # type: List[bytes] def start_response( - status: str, response_headers: List[Tuple[str, str]], + status: str, headers: List[Tuple[str, str]], exc_info: Optional[Tuple[Optional[Type[BaseException]], Optional[BaseException], Optional[TracebackType]]]=None ) -> Callable[[bytes], Any]: data["status"] = status - data["headers"] = response_headers + data["headers"] = headers return response.append app_response = self.wsgi_application( WSGIContainer.environ(request), start_response) diff --git a/tox.ini b/tox.ini index b3defc065..f43ac4fa1 100644 --- a/tox.ini +++ b/tox.ini @@ -129,4 +129,4 @@ changedir = {toxinidir} [testenv:py3-mypy] commands = mypy {posargs:tornado} changedir = {toxinidir} -deps = mypy +deps = mypy==0.630