From fd5cc78f6df86df03332dbb1b2d78102dbb4803e Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Tue, 16 Jun 2020 16:28:26 -0700
Subject: [PATCH] uvicorn is now optional, refs #850

---
 datasette/app.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/datasette/app.py b/datasette/app.py
index ca2efa91..8513ad5a 100644
--- a/datasette/app.py
+++ b/datasette/app.py
@@ -22,7 +22,6 @@ import jinja2
 from jinja2 import ChoiceLoader, Environment, FileSystemLoader, PrefixLoader, escape
 from jinja2.environment import Template
 from jinja2.exceptions import TemplateNotFound
-import uvicorn
 
 from .views.base import DatasetteError, ureg, AsgiRouter
 from .views.database import DatabaseDownload, DatabaseView
@@ -589,6 +588,11 @@ class Datasette:
         datasette_version = {"version": __version__}
         if self.version_note:
             datasette_version["note"] = self.version_note
+        try:
+            import uvicorn
+            uvicorn_version = uvicorn.__version__
+        except ImportError:
+            uvicorn_version = None
         return {
             "python": {
                 "version": ".".join(map(str, sys.version_info[:3])),