Merge branch 'master' of https://github.com/encode/uvicorn into patch-1

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,7 @@
+# Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
+blank_issues_enabled: true
+contact_links:
+- name: Question
+  url: https://gitter.im/encode/community
+  about: >
+    Ask a question

requirements.txt

@@ -25,7 +25,6 @@ pytest
 pytest-cov
 pytest-mock
 requests
-seed-isort-config
 mypy
 
 # Documentation

scripts/lint

@@ -9,6 +9,5 @@ export SOURCE_FILES="uvicorn tests"
 set -x
 
 ${PREFIX}autoflake --in-place --recursive $SOURCE_FILES
-${PREFIX}seed-isort-config --application-directories=uvicorn
 ${PREFIX}isort --project=uvicorn $SOURCE_FILES
 ${PREFIX}black --target-version=py36 $SOURCE_FILES

setup.cfg

@@ -16,7 +16,7 @@ check_untyped_defs = True
 profile = black
 combine_as_imports = True
 known_first_party = uvicorn,tests
-known_third_party = click,does_not_exist,gunicorn,h11,httptools,pytest,requests,setuptools,urllib3,uvloop,watchgod,websockets,wsproto
+known_third_party = click,does_not_exist,gunicorn,h11,httptools,pytest,requests,setuptools,urllib3,uvloop,watchgod,websockets,wsproto,yaml
 
 [tool:pytest]
 addopts = --cov=uvicorn --cov=tests -rxXs

tests/protocols/test_http.py

@@ -696,7 +696,7 @@ async def asgi(receive, send):
 @pytest.mark.parametrize("asgi2or3_app, expected_scopes", asgi_scope_data)
 @pytest.mark.parametrize("protocol_cls", HTTP_PROTOCOLS)
 def test_scopes(asgi2or3_app, expected_scopes, protocol_cls):
-    protocol = get_connected_protocol(asgi2or3_app, protocol_cls,)
+    protocol = get_connected_protocol(asgi2or3_app, protocol_cls)
     protocol.data_received(SIMPLE_GET_REQUEST)
     protocol.loop.run_one()
     assert expected_scopes == protocol.scope.get("asgi")

tests/test_config.py

@@ -127,7 +127,7 @@ def test_log_config_default(mocked_logging_config_module, use_colors, expected):
 
     mocked_logging_config_module.dictConfig.assert_called_once_with(LOGGING_CONFIG)
 
-    ((provided_dict_config,), _,) = mocked_logging_config_module.dictConfig.call_args
+    (provided_dict_config,), _ = mocked_logging_config_module.dictConfig.call_args
     assert provided_dict_config["formatters"]["default"]["use_colors"] == expected
 
 

uvicorn/supervisors/basereload.py

@@ -62,7 +62,8 @@ def startup(self):
 
     def restart(self):
         self.mtimes = {}
-        os.kill(self.process.pid, signal.SIGTERM)
+
+        self.process.terminate()
         self.process.join()
 
         self.process = get_subprocess(