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

Fixed master -> main in a bunch of places, mainly docs

pull/1279/head
Simon Willison 2021-03-23 09:19:41 -07:00
rodzic c4f1ec7f33
commit 6ad544df5e
13 zmienionych plików z 26 dodań i 27 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
datasette/cli.py
Wyświetl plik

@ -191,7 +191,7 @@ def plugins(all, plugins_dir):
help="Path to JSON/YAML file containing metadata to publish",
)
@click.option("--extra-options", help="Extra options to pass to datasette serve")
@click.option("--branch", help="Install datasette from a GitHub branch e.g. master")
@click.option("--branch", help="Install datasette from a GitHub branch e.g. main")
@click.option(
"--template-dir",
type=click.Path(exists=True, file_okay=False, dir_okay=True),

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

@ -19,7 +19,7 @@ def add_common_publish_arguments_and_options(subcommand):
"--extra-options", help="Extra options to pass to datasette serve"
),
click.option(
"--branch", help="Install datasette from a GitHub branch e.g. master"
"--branch", help="Install datasette from a GitHub branch e.g. main"
),
click.option(
"--template-dir",

16
datasette/templates/patterns.html
Wyświetl plik

@ -70,10 +70,10 @@
</div>
<p>
Data license:
<a href="https://github.com/simonw/datasette/blob/master/LICENSE">Apache License 2.0</a>
<a href="https://github.com/simonw/datasette/blob/main/LICENSE">Apache License 2.0</a>
&middot;
Data source:
<a href="https://github.com/simonw/datasette/blob/master/tests/fixtures.py">
<a href="https://github.com/simonw/datasette/blob/main/tests/fixtures.py">
tests/fixtures.py</a>
&middot;
About:
@ -118,10 +118,10 @@
</div>
<p>
Data license:
<a href="https://github.com/simonw/datasette/blob/master/LICENSE">Apache License 2.0</a>
<a href="https://github.com/simonw/datasette/blob/main/LICENSE">Apache License 2.0</a>
&middot;
Data source:
<a href="https://github.com/simonw/datasette/blob/master/tests/fixtures.py">
<a href="https://github.com/simonw/datasette/blob/main/tests/fixtures.py">
tests/fixtures.py</a>
&middot;
About:
@ -177,10 +177,10 @@
<p>
Data license:
<a href="https://github.com/simonw/datasette/blob/master/LICENSE">Apache License 2.0</a>
<a href="https://github.com/simonw/datasette/blob/main/LICENSE">Apache License 2.0</a>
&middot;
Data source:
<a href="https://github.com/simonw/datasette/blob/master/tests/fixtures.py">
<a href="https://github.com/simonw/datasette/blob/main/tests/fixtures.py">
tests/fixtures.py</a>
&middot;
About:
@ -478,10 +478,10 @@
<footer class="ft">Powered by <a href="https://datasette.io/" title="Datasette v0+unknown">Datasette</a>
&middot; Data license:
<a href="https://github.com/simonw/datasette/blob/master/LICENSE">Apache License 2.0</a>
<a href="https://github.com/simonw/datasette/blob/main/LICENSE">Apache License 2.0</a>
&middot;
Data source:
<a href="https://github.com/simonw/datasette/blob/master/tests/fixtures.py">
<a href="https://github.com/simonw/datasette/blob/main/tests/fixtures.py">
tests/fixtures.py</a>
&middot;
About:

2
docs/contributing.rst
Wyświetl plik

@ -10,7 +10,7 @@ This document describes how to contribute to Datasette core. You can also contri
General guidelines
------------------
* **master should always be releasable**. Incomplete features should live in branches. This ensures that any small bug fixes can be quickly released.
* **main should always be releasable**. Incomplete features should live in branches. This ensures that any small bug fixes can be quickly released.
* **The ideal commit** should bundle together the implementation, unit tests and associated documentation updates. The commit message should link to an associated issue.
* **New plugin hooks** should only be shipped if accompanied by a separate release of a non-demo plugin that uses them.

2
docs/custom_templates.rst
Wyświetl plik

@ -303,7 +303,7 @@ from the default template.
The ``_table.html`` template is included by both the row and the table pages,
and a list of rows. The default ``_table.html`` template renders them as an
HTML template and `can be seen here <https://github.com/simonw/datasette/blob/master/datasette/templates/_table.html>`_.
HTML template and `can be seen here <https://github.com/simonw/datasette/blob/main/datasette/templates/_table.html>`_.
You can provide a custom template that applies to all of your databases and
tables, or you can provide custom templates for specific tables using the

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

@ -10,7 +10,7 @@ Options:
-m, --metadata FILENAME Path to JSON/YAML file containing metadata to publish
--extra-options TEXT Extra options to pass to datasette serve
--branch TEXT Install datasette from a GitHub branch e.g. master
--branch TEXT Install datasette from a GitHub branch e.g. main
--template-dir DIRECTORY Path to directory containing custom templates
--plugins-dir DIRECTORY Path to directory containing custom plugins
--static MOUNT:DIRECTORY Serve static files from this directory at /MOUNT/...

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

@ -5,7 +5,7 @@ Usage: datasette publish cloudrun [OPTIONS] [FILES]...
Options:
-m, --metadata FILENAME Path to JSON/YAML file containing metadata to publish
--extra-options TEXT Extra options to pass to datasette serve
--branch TEXT Install datasette from a GitHub branch e.g. master
--branch TEXT Install datasette from a GitHub branch e.g. main
--template-dir DIRECTORY Path to directory containing custom templates
--plugins-dir DIRECTORY Path to directory containing custom plugins
--static MOUNT:DIRECTORY Serve static files from this directory at /MOUNT/...

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

@ -5,7 +5,7 @@ Usage: datasette publish heroku [OPTIONS] [FILES]...
Options:
-m, --metadata FILENAME Path to JSON/YAML file containing metadata to publish
--extra-options TEXT Extra options to pass to datasette serve
--branch TEXT Install datasette from a GitHub branch e.g. master
--branch TEXT Install datasette from a GitHub branch e.g. main
--template-dir DIRECTORY Path to directory containing custom templates
--plugins-dir DIRECTORY Path to directory containing custom plugins
--static MOUNT:DIRECTORY Serve static files from this directory at /MOUNT/...

4
docs/plugin_hooks.rst
Wyświetl plik

@ -304,7 +304,7 @@ publish_subcommand(publish)
This hook allows you to create new providers for the ``datasette publish``
command. Datasette uses this hook internally to implement the default ``now``
and ``heroku`` subcommands, so you can read
`their source <https://github.com/simonw/datasette/tree/master/datasette/publish>`_
`their source <https://github.com/simonw/datasette/tree/main/datasette/publish>`_
to see examples of this hook in action.
Let's say you want to build a plugin that adds a ``datasette publish my_hosting_provider --api_key=xxx mydatabase.db`` publish command. Your implementation would start like this:
@ -641,7 +641,7 @@ Each Facet subclass implements a new type of facet operation. The class should l
return facet_results, facets_timed_out
See `datasette/facets.py <https://github.com/simonw/datasette/blob/master/datasette/facets.py>`__ for examples of how these classes can work.
See `datasette/facets.py <https://github.com/simonw/datasette/blob/main/datasette/facets.py>`__ for examples of how these classes can work.
The plugin hook can then be used to register the new facet class like this:

4
docs/publish.rst
Wyświetl plik

@ -78,7 +78,7 @@ Publishing to Vercel
pip install datasette-publish-vercel
datasette publish vercel mydatabase.db --project my-database-project
Not every feature is supported: consult the `datasette-publish-vercel README <https://github.com/simonw/datasette-publish-vercel/blob/master/README.md>`__ for more details.
Not every feature is supported: consult the `datasette-publish-vercel README <https://github.com/simonw/datasette-publish-vercel/blob/main/README.md>`__ for more details.
.. _publish_fly:
@ -92,7 +92,7 @@ Publishing to Fly
pip install datasette-publish-fly
datasette publish fly mydatabase.db
Consult the `datasette-publish-fly README <https://github.com/simonw/datasette-publish-fly/blob/master/README.md>`__ for more details.
Consult the `datasette-publish-fly README <https://github.com/simonw/datasette-publish-fly/blob/main/README.md>`__ for more details.
.. _publish_custom_metadata_and_plugins:

2
docs/spatialite.rst
Wyświetl plik

@ -53,7 +53,7 @@ If you are unsure of the location of the module, try running ``locate mod_spatia
Building SpatiaLite from source
-------------------------------
The packaged versions of SpatiaLite usually provide SpatiaLite 4.3.0a. For an example of how to build the most recent unstable version, 4.4.0-RC0 (which includes the powerful `VirtualKNN module <https://www.gaia-gis.it/fossil/libspatialite/wiki?name=KNN>`_), take a look at the `Datasette Dockerfile <https://github.com/simonw/datasette/blob/master/Dockerfile>`_.
The packaged versions of SpatiaLite usually provide SpatiaLite 4.3.0a. For an example of how to build the most recent unstable version, 4.4.0-RC0 (which includes the powerful `VirtualKNN module <https://www.gaia-gis.it/fossil/libspatialite/wiki?name=KNN>`_), take a look at the `Datasette Dockerfile <https://github.com/simonw/datasette/blob/main/Dockerfile>`_.
Spatial indexing latitude/longitude columns
===========================================

4
tests/fixtures.py
Wyświetl plik

@ -283,9 +283,9 @@ METADATA = {
"title": "Datasette Fixtures",
"description_html": 'An example SQLite database demonstrating Datasette. <a href="/login-as-root">Sign in as root user</a>',
"license": "Apache License 2.0",
"license_url": "https://github.com/simonw/datasette/blob/master/LICENSE",
"license_url": "https://github.com/simonw/datasette/blob/main/LICENSE",
"source": "tests/fixtures.py",
"source_url": "https://github.com/simonw/datasette/blob/master/tests/fixtures.py",
"source_url": "https://github.com/simonw/datasette/blob/main/tests/fixtures.py",
"about": "About Datasette",
"about_url": "https://github.com/simonw/datasette",
"extra_css_urls": ["/static/extra-css-urls.css"],

9
tests/test_html.py
Wyświetl plik

@ -1093,12 +1093,11 @@ def assert_footer_links(soup):
assert "About Datasette" == about_link.text.strip()
assert "https://datasette.io/" == datasette_link["href"]
assert (
"https://github.com/simonw/datasette/blob/master/tests/fixtures.py"
"https://github.com/simonw/datasette/blob/main/tests/fixtures.py"
== source_link["href"]
)
assert (
"https://github.com/simonw/datasette/blob/master/LICENSE"
== license_link["href"]
"https://github.com/simonw/datasette/blob/main/LICENSE" == license_link["href"]
)
assert "https://github.com/simonw/datasette" == about_link["href"]
@ -1513,8 +1512,8 @@ def test_base_url_config(app_client_base_url_prefix, path):
and href
not in {
"https://datasette.io/",
"https://github.com/simonw/datasette/blob/master/LICENSE",
"https://github.com/simonw/datasette/blob/master/tests/fixtures.py",
"https://github.com/simonw/datasette/blob/main/LICENSE",
"https://github.com/simonw/datasette/blob/main/tests/fixtures.py",
"/login-as-root", # Only used for the latest.datasette.io demo
}
and not href.startswith("https://plugin-example.datasette.io/")