From 0ac8bbce2e73c0759ec48661a7b740d2c368b2a2 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Sat, 4 Nov 2017 16:53:50 -0700 Subject: [PATCH] Default subcommand is now serve Using click-default-group: https://github.com/click-contrib/click-default-group Also removed requirements.txt in favour of setup.py --- datasite/app.py | 1 - datasite/cli.py | 6 ++++-- requirements.txt | 2 -- setup.py | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 requirements.txt diff --git a/datasite/app.py b/datasite/app.py index c7a8cc55..a1f50e32 100644 --- a/datasite/app.py +++ b/datasite/app.py @@ -4,7 +4,6 @@ from sanic.exceptions import NotFound from sanic.views import HTTPMethodView from sanic_jinja2 import SanicJinja2 from jinja2 import FileSystemLoader -import click import sqlite3 from contextlib import contextmanager from pathlib import Path diff --git a/datasite/cli.py b/datasite/cli.py index 84c13dea..71f0cab1 100644 --- a/datasite/cli.py +++ b/datasite/cli.py @@ -1,7 +1,9 @@ import click +from click_default_group import DefaultGroup from .app import app, ensure_build_metadata -@click.group() + +@click.group(cls=DefaultGroup, default='serve', default_if_no_args=True) def cli(): """ Datasite! @@ -19,6 +21,6 @@ def build(): @click.option('-p', '--port', default=8001) @click.option('--debug', is_flag=True) def serve(files, host, port, debug): - '''Serve up specified database files with a web UI''' + """Serve up specified database files with a web UI""" click.echo('Serve! files={} on port {}'.format(files, port)) app.run(host=host, port=port, debug=debug) diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 26410e3e..00000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -sanic==0.6.0 -sanic-jinja2==0.5.5 diff --git a/setup.py b/setup.py index a39aa337..a232df34 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,7 @@ setup( include_package_data=True, install_requires=[ 'click==6.7', + 'click-default-group==1.2', 'sanic==0.6.0', 'sanic-jinja2==0.5.5', ],