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])), diff --git a/setup.py b/setup.py index 45af0253..30f118dc 100644 --- a/setup.py +++ b/setup.py @@ -47,10 +47,8 @@ setup( "click~=7.1.1", "click-default-group~=1.2.2", "Jinja2>=2.10.3,<2.12.0", - "hupper~=1.9", "pint~=0.9", "pluggy~=0.13.0", - "uvicorn~=0.11", "aiofiles>=0.4,<0.6", "janus>=0.4,<0.6", "asgi-csrf>=0.5.1",