github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

datasette and datasette publish --version-note

Browse source
This commit is contained in:
Simon Willison 2018-06-17 13:14:55 -07:00
commit ea0069ef44
No known key found for this signature in database
GPG key ID: 17E2DEA2588B7F52
3 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
datasette/app.py
View file

@ -119,6 +119,7 @@ class Datasette:
plugins_dir=None,
static_mounts=None,
config=None,
version_note=None,
):
self.files = files
self.cache_headers = cache_headers
@ -131,6 +132,7 @@ class Datasette:
self.plugins_dir = plugins_dir
self.static_mounts = static_mounts or []
self.config = dict(DEFAULT_CONFIG, **(config or {}))
self.version_note = version_note
self.executor = futures.ThreadPoolExecutor(
max_workers=self.config["num_sql_threads"]
)
@ -298,12 +300,14 @@ class Datasette:
fts_versions.append(fts)
except sqlite3.OperationalError:
continue
datasette_version = {"version": __version__}
if self.version_note:
datasette_version["note"] = self.version_note
return {
"python": {
"version": ".".join(map(str, sys.version_info[:3])), "full": sys.version
},
"datasette": {"version": __version__},
"datasette": datasette_version,
"sqlite": {
"version": sqlite_version,
"fts_versions": fts_versions,

6
datasette/cli.py
View file

@ -136,6 +136,7 @@ def inspect(files, inspect_file, sqlite_extensions):
@click.option(
"--spatialite", is_flag=True, help="Enable SpatialLite extension"
)
@click.option("--version-note", help="Additional note to show on /-/versions")
@click.option("--title", help="Title for metadata")
@click.option("--license", help="License label for metadata")
@click.option("--license_url", help="License URL for metadata")
@ -155,6 +156,7 @@ def publish(
static,
install,
spatialite,
version_note,
**extra_metadata
):
"""
@ -200,6 +202,7 @@ def publish(
static,
install,
spatialite,
version_note,
extra_metadata,
):
args = []
@ -478,6 +481,7 @@ def package(
help="Set config option using configname:value datasette.readthedocs.io/en/latest/config.html",
multiple=True,
)
@click.option("--version-note", help="Additional note to show on /-/versions")
@click.option(
"--help-config",
is_flag=True,
@ -497,6 +501,7 @@ def serve(
plugins_dir,
static,
config,
version_note,
help_config,
):
"""Serve up specified SQLite database files with a web UI"""
@ -538,6 +543,7 @@ def serve(
plugins_dir=plugins_dir,
static_mounts=static,
config=dict(config),
version_note=version_note,
)
# Force initial hashing/table counting
ds.inspect()

6
datasette/utils.py
View file

@ -241,7 +241,7 @@ def escape_sqlite(s):
return '[{}]'.format(s)
def make_dockerfile(files, metadata_file, extra_options, branch, template_dir, plugins_dir, static, install, spatialite):
def make_dockerfile(files, metadata_file, extra_options, branch, template_dir, plugins_dir, static, install, spatialite, version_note):
cmd = ['"datasette"', '"serve"', '"--host"', '"0.0.0.0"']
cmd.append('"' + '", "'.join(files) + '"')
cmd.extend(['"--cors"', '"--port"', '"8001"', '"--inspect-file"', '"inspect-data.json"'])
@ -251,6 +251,8 @@ def make_dockerfile(files, metadata_file, extra_options, branch, template_dir, p
cmd.extend(['"--template-dir"', '"templates/"'])
if plugins_dir:
cmd.extend(['"--plugins-dir"', '"plugins/"'])
if version_note:
cmd.extend(['"--version-note"', '"{}"'.format(version_note)])
if static:
for mount_point, _ in static:
cmd.extend(['"--static"', '"{}:{}"'.format(mount_point, mount_point)])
@ -293,6 +295,7 @@ def temporary_docker_directory(
static,
install,
spatialite,
version_note,
extra_metadata=None
):
extra_metadata = extra_metadata or {}
@ -324,6 +327,7 @@ def temporary_docker_directory(
static,
install,
spatialite,
version_note,
)
os.chdir(datasette_dir)
if metadata_content: