mirror
/
datasette
kopia lustrzana https://github.com/simonw/datasette
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

about and about_url metadata options

pull/416/head
Simon Willison 2019-03-10 14:37:11 -07:00
rodzic 41744d7690
commit bf6b0f918d
12 zmienionych plików z 37 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
datasette/app.py
Wyświetl plik

@ -267,6 +267,9 @@ class Datasette:
"license": metadata.get("license") or self.metadata("license"),
"license_url": metadata.get("license_url")
or self.metadata("license_url"),
"about": metadata.get("about") or self.metadata("about"),
"about_url": metadata.get("about_url")
or self.metadata("about_url"),
}
)

2
datasette/cli.py
Wyświetl plik

@ -217,6 +217,8 @@ def plugins(all, plugins_dir):
@click.option("--license_url", help="License URL for metadata")
@click.option("--source", help="Source label for metadata")
@click.option("--source_url", help="Source URL for metadata")
@click.option("--about", help="About label for metadata")
@click.option("--about_url", help="About URL for metadata")
def package(
files,
tag,

2
datasette/publish/common.py
Wyświetl plik

@ -42,6 +42,8 @@ def add_common_publish_arguments_and_options(subcommand):
click.option("--license_url", help="License URL for metadata"),
click.option("--source", help="Source label for metadata"),
click.option("--source_url", help="Source URL for metadata"),
click.option("--about", help="About label for metadata"),
click.option("--about_url", help="About URL for metadata"),
)):
subcommand = decorator(subcommand)
return subcommand

4
datasette/publish/heroku.py
Wyświetl plik

@ -35,6 +35,8 @@ def publish_subcommand(publish):
license_url,
source,
source_url,
about,
about_url,
name,
):
fail_if_publish_binary_not_installed(
@ -72,6 +74,8 @@ def publish_subcommand(publish):
"license_url": license_url,
"source": source,
"source_url": source_url,
"about": about,
"about_url": about_url,
},
):
app_name = None

4
datasette/publish/now.py
Wyświetl plik

@ -39,6 +39,8 @@ def publish_subcommand(publish):
license_url,
source,
source_url,
about,
about_url,
name,
force,
token,
@ -70,6 +72,8 @@ def publish_subcommand(publish):
"license_url": license_url,
"source": source,
"source_url": source_url,
"about": about,
"about_url": about_url,
},
):
now_json = {

5
datasette/templates/_description_source_license.html
Wyświetl plik

@ -21,5 +21,10 @@
<a href="{{ metadata.source_url }}">
{% endif %}{{ metadata.source or metadata.source_url }}{% if metadata.source_url %}</a>{% endif %}
{% endif %}
{% if metadata.about or metadata.about_url %}{% if metadata.license or metadata.license_url or metadata.source or metadat.source_url %}&middot;{% endif %}
About: {% if metadata.about_url %}
<a href="{{ metadata.about_url }}">
{% endif %}{{ metadata.about or metadata.about_url }}{% if metadata.about_url %}</a>{% endif %}
{% endif %}
</p>
{% endif %}

5
datasette/templates/base.html
Wyświetl plik

@ -33,6 +33,11 @@
<a href="{{ metadata.source_url }}">
{% endif %}{{ metadata.source or metadata.source_url }}{% if metadata.source_url %}</a>{% endif %}
{% endif %}
{% if metadata.about or metadata.about_url %}&middot;
About: {% if metadata.about_url %}
<a href="{{ metadata.about_url }}">
{% endif %}{{ metadata.about or metadata.about_url }}{% if metadata.about_url %}</a>{% endif %}
{% endif %}
{% endif %}
</div>

2
docs/datasette-package-help.txt
Wyświetl plik

@ -21,4 +21,6 @@ Options:
--license_url TEXT License URL for metadata
--source TEXT Source label for metadata
--source_url TEXT Source URL for metadata
--about TEXT About label for metadata
--about_url TEXT About URL for metadata
--help Show this message and exit.

2
docs/datasette-publish-heroku-help.txt
Wyświetl plik

@ -16,5 +16,7 @@ Options:
--license_url TEXT License URL for metadata
--source TEXT Source label for metadata
--source_url TEXT Source URL for metadata
--about TEXT About label for metadata
--about_url TEXT About URL for metadata
-n, --name TEXT Application name to use when deploying
--help Show this message and exit.

2
docs/datasette-publish-now-help.txt
Wyświetl plik

@ -16,6 +16,8 @@ Options:
--license_url TEXT License URL for metadata
--source TEXT Source label for metadata
--source_url TEXT Source URL for metadata
--about TEXT About label for metadata
--about_url TEXT About URL for metadata
-n, --name TEXT Application name to use when deploying
--force Pass --force option to now
--token TEXT Auth token to use for deploy

2
tests/fixtures.py
Wyświetl plik

@ -133,6 +133,8 @@ METADATA = {
'license_url': 'https://github.com/simonw/datasette/blob/master/LICENSE',
'source': 'tests/fixtures.py',
'source_url': 'https://github.com/simonw/datasette/blob/master/tests/fixtures.py',
'about': 'About Datasette',
'about_url': 'https://github.com/simonw/datasette',
"plugins": {
"name-of-plugin": {
"depth": "root"

6
tests/test_html.py
Wyświetl plik

@ -744,14 +744,16 @@ def assert_querystring_equal(expected, actual):
def assert_footer_links(soup):
footer_links = soup.find('div', {'class': 'ft'}).findAll('a')
assert 3 == len(footer_links)
datasette_link, license_link, source_link = footer_links
assert 4 == len(footer_links)
datasette_link, license_link, source_link, about_link = footer_links
assert 'Datasette' == datasette_link.text.strip()
assert 'tests/fixtures.py' == source_link.text.strip()
assert 'Apache License 2.0' == license_link.text.strip()
assert 'About Datasette' == about_link.text.strip()
assert 'https://github.com/simonw/datasette' == datasette_link['href']
assert 'https://github.com/simonw/datasette/blob/master/tests/fixtures.py' == source_link['href']
assert 'https://github.com/simonw/datasette/blob/master/LICENSE' == license_link['href']
assert 'https://github.com/simonw/datasette' == about_link['href']
def inner_html(soup):