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

--metadata accepts YAML as well as JSON - closes #713

Browse source
This commit is contained in:
Simon Willison 2020-04-02 12:30:53 -07:00 • committed by GitHub
commit 6717c719dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 149 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datasette/publish/common.py
View file

@ -12,7 +12,7 @@ def add_common_publish_arguments_and_options(subcommand):
"-m",
"--metadata",
type=click.File(mode="r"),
help="Path to JSON file containing metadata to publish",
help="Path to JSON/YAML file containing metadata to publish",
),
click.option(
"--extra-options", help="Extra options to pass to datasette serve"

4
datasette/publish/heroku.py
View file

@ -11,7 +11,7 @@ from .common import (
add_common_publish_arguments_and_options,
fail_if_publish_binary_not_installed,
)
from datasette.utils import link_or_copy, link_or_copy_directory
from datasette.utils import link_or_copy, link_or_copy_directory, parse_metadata
@hookimpl
@ -154,7 +154,7 @@ def temporary_heroku_directory(
file_names = [os.path.split(f)[-1] for f in files]
if metadata:
metadata_content = json.load(metadata)
metadata_content = parse_metadata(metadata.read())
else:
metadata_content = {}
for key, value in extra_metadata.items():