Merge branch 'uvicorn'

ipmb · ipmb · commit 98316788b18d · 2018-10-31T16:45:32.000-06:00
diff --git a/README.md b/README.md
@@ -101,6 +101,12 @@ Same as the standard gunicorn configuration, but the application will be set for
 
 _Note: Unlike the other servers, you have to configure gunicorn with environment variables or via `sys.argv`. If you use it with Django's `call_command`, keep in mind any additional arguments you pass will not be applied._
 
+### With uvicorn
+
+[uvicorn docs](https://www.uvicorn.org/)
+
+Same as the standard uvicorn configuration, but the application will be set for you from `settings.WSGI_APPLICATION` as well as `--wsgi`.
+
 ### With waitress
 
 [waitress docs](https://docs.pylonsproject.org/projects/waitress/en/latest/index.html)
diff --git a/django_webserver/management/commands/uvicorn.py b/django_webserver/management/commands/uvicorn.py
@@ -0,0 +1,21 @@
+from __future__ import absolute_import
+
+import uvicorn.main
+
+from ...base_command import WebserverCommand
+from ...utils import wsgi_app_name
+
+
+class Command(WebserverCommand):
+    """
+    This bypasses any Django handling of the command and sends all arguments straight
+    to uvicorn.
+    """
+
+    help = "Start uvicorn server"
+
+    def prep_server_args(self, argv):
+        return argv[2:] + [wsgi_app_name(), "--wsgi"]
+
+    def start_server(self, *args):
+        uvicorn.main.main(args)
diff --git a/django_webserver/tests/tests.py b/django_webserver/tests/tests.py
@@ -20,6 +20,7 @@
 
 
 def run_server(name, *args):
+    pytest.importorskip(name)
     # timeout isn't supported in Python 2.7, do it the hard way...
     proc = subprocess.Popen(
         ["django-admin", name] + list(args),
@@ -48,6 +49,15 @@ def test_gunicorn():
     assert "Booting worker with pid:" in output
 
 
+def test_uvicorn():
+    proc = run_server("uvicorn", "--port=0")
+    output = proc.communicate()[0].decode("utf-8")
+    assert "Uvicorn running on http://127.0.0.1:" in output
+    # :8000 is the default, ensure we aren't just seeing that
+    assert "127.0.0.1:8000" not in output
+    assert "Started server process [" in output
+
+
 def test_waitress():
     proc = run_server("waitress", "--port=0", "--host=127.0.0.1")
     output = proc.communicate()[0].decode("utf-8")
diff --git a/pyproject.toml b/pyproject.toml
@@ -30,4 +30,5 @@ test = [
 ]
 pyuwsgi = ["pyuwsgi"]
 gunicorn = ["gunicorn"]
+uvicorn = ["uvicorn; python_version >= '3.5'"]
 waitress = ["waitress"]

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,5 @@ test = [`
`30`	`30`	`]`
`31`	`31`	`pyuwsgi = ["pyuwsgi"]`
`32`	`32`	`gunicorn = ["gunicorn"]`
	`33`	`+uvicorn = ["uvicorn; python_version >= '3.5'"]`
`33`	`34`	`waitress = ["waitress"]`