`__.
+
+Specific branches can also be set to automatically deploy by adding them to the ``on: push: branches`` block at the top of the workflow YAML file. Branches configured in this way will be deployed to a new Cloud Run service whether or not their tests pass.
+
+The Cloud Run URL for a branch demo can be found in the GitHub Actions logs.
+
.. _contributing_release:
Release process
diff --git a/docs/datasette-serve-help.txt b/docs/datasette-serve-help.txt
index ec3f41a0..2911977a 100644
--- a/docs/datasette-serve-help.txt
+++ b/docs/datasette-serve-help.txt
@@ -32,7 +32,7 @@ Options:
--get TEXT Run an HTTP GET request against this path, print results and
exit
--version-note TEXT Additional note to show on /-/versions
- --help-config Show available config options
+ --help-settings Show available settings
--pdb Launch debugger on any errors
-o, --open Open Datasette in your web browser
--create Create database files if they do not exist
diff --git a/tests/fixtures.py b/tests/fixtures.py
index 4a420e4b..dc22c609 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -99,7 +99,7 @@ def make_app_client(
max_returned_rows=None,
cors=False,
memory=False,
- config=None,
+ settings=None,
filename="fixtures.db",
is_immutable=False,
extra_databases=None,
@@ -129,7 +129,7 @@ def make_app_client(
# Insert at start to help test /-/databases ordering:
files.insert(0, extra_filepath)
os.chdir(os.path.dirname(filepath))
- config = config or {}
+ settings = settings or {}
for key, value in {
"default_page_size": 50,
"max_returned_rows": max_returned_rows or 100,
@@ -138,8 +138,8 @@ def make_app_client(
# errors when running the full test suite:
"num_sql_threads": 1,
}.items():
- if key not in config:
- config[key] = value
+ if key not in settings:
+ settings[key] = value
ds = Datasette(
files,
immutables=immutables,
@@ -147,7 +147,7 @@ def make_app_client(
cors=cors,
metadata=metadata or METADATA,
plugins_dir=PLUGINS_DIR,
- config=config,
+ settings=settings,
inspect_data=inspect_data,
static_mounts=static_mounts,
template_dir=template_dir,
@@ -171,7 +171,7 @@ def app_client_no_files():
@pytest.fixture(scope="session")
def app_client_base_url_prefix():
- with make_app_client(config={"base_url": "/prefix/"}) as client:
+ with make_app_client(settings={"base_url": "/prefix/"}) as client:
yield client
@@ -210,13 +210,13 @@ def app_client_two_attached_databases_one_immutable():
@pytest.fixture(scope="session")
def app_client_with_hash():
- with make_app_client(config={"hash_urls": True}, is_immutable=True) as client:
+ with make_app_client(settings={"hash_urls": True}, is_immutable=True) as client:
yield client
@pytest.fixture(scope="session")
def app_client_with_trace():
- with make_app_client(config={"trace_debug": True}, is_immutable=True) as client:
+ with make_app_client(settings={"trace_debug": True}, is_immutable=True) as client:
yield client
@@ -234,13 +234,13 @@ def app_client_returned_rows_matches_page_size():
@pytest.fixture(scope="session")
def app_client_larger_cache_size():
- with make_app_client(config={"cache_size_kb": 2500}) as client:
+ with make_app_client(settings={"cache_size_kb": 2500}) as client:
yield client
@pytest.fixture(scope="session")
def app_client_csv_max_mb_one():
- with make_app_client(config={"max_csv_mb": 1}) as client:
+ with make_app_client(settings={"max_csv_mb": 1}) as client:
yield client
diff --git a/tests/test_api.py b/tests/test_api.py
index 83cca521..1e93c62e 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -1711,14 +1711,14 @@ def test_suggested_facets(app_client):
def test_allow_facet_off():
- with make_app_client(config={"allow_facet": False}) as client:
+ with make_app_client(settings={"allow_facet": False}) as client:
assert 400 == client.get("/fixtures/facetable.json?_facet=planet_int").status
# Should not suggest any facets either:
assert [] == client.get("/fixtures/facetable.json").json["suggested_facets"]
def test_suggest_facets_off():
- with make_app_client(config={"suggest_facets": False}) as client:
+ with make_app_client(settings={"suggest_facets": False}) as client:
# Now suggested_facets should be []
assert [] == client.get("/fixtures/facetable.json").json["suggested_facets"]
@@ -1883,7 +1883,7 @@ def test_config_cache_size(app_client_larger_cache_size):
def test_config_force_https_urls():
- with make_app_client(config={"force_https_urls": True}) as client:
+ with make_app_client(settings={"force_https_urls": True}) as client:
response = client.get("/fixtures/facetable.json?_size=3&_facet=state")
assert response.json["next_url"].startswith("https://")
assert response.json["facet_results"]["state"]["results"][0][
@@ -1921,7 +1921,7 @@ def test_custom_query_with_unicode_characters(app_client):
@pytest.mark.parametrize("trace_debug", (True, False))
def test_trace(trace_debug):
- with make_app_client(config={"trace_debug": trace_debug}) as client:
+ with make_app_client(settings={"trace_debug": trace_debug}) as client:
response = client.get("/fixtures/simple_primary_key.json?_trace=1")
assert response.status == 200
diff --git a/tests/test_cli.py b/tests/test_cli.py
index e31a305e..763fe2e7 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -5,6 +5,7 @@ from .fixtures import (
EXPECTED_PLUGINS,
)
import asyncio
+from datasette.app import SETTINGS
from datasette.plugins import DEFAULT_PLUGINS
from datasette.cli import cli, serve
from datasette.version import __version__
@@ -147,7 +148,7 @@ def test_metadata_yaml():
root=False,
version_note=None,
get=None,
- help_config=False,
+ help_settings=False,
pdb=False,
crossdb=False,
open_browser=False,
@@ -291,3 +292,10 @@ def test_weird_database_names(ensure_eventloop, tmpdir, filename):
cli, [db_path, "--get", "/{}".format(urllib.parse.quote(filename_no_stem))]
)
assert result2.exit_code == 0, result2.output
+
+
+def test_help_settings():
+ runner = CliRunner()
+ result = runner.invoke(cli, ["--help-settings"])
+ for setting in SETTINGS:
+ assert setting.name in result.output
diff --git a/tests/test_custom_pages.py b/tests/test_custom_pages.py
index 5a71f56d..76c67397 100644
--- a/tests/test_custom_pages.py
+++ b/tests/test_custom_pages.py
@@ -14,7 +14,7 @@ def custom_pages_client():
@pytest.fixture(scope="session")
def custom_pages_client_with_base_url():
with make_app_client(
- template_dir=TEST_TEMPLATE_DIRS, config={"base_url": "/prefix/"}
+ template_dir=TEST_TEMPLATE_DIRS, settings={"base_url": "/prefix/"}
) as client:
yield client
diff --git a/tests/test_facets.py b/tests/test_facets.py
index 18fb8c3b..22927512 100644
--- a/tests/test_facets.py
+++ b/tests/test_facets.py
@@ -351,7 +351,7 @@ async def test_json_array_with_blanks_and_nulls():
@pytest.mark.asyncio
async def test_facet_size():
- ds = Datasette([], memory=True, config={"max_returned_rows": 50})
+ ds = Datasette([], memory=True, settings={"max_returned_rows": 50})
db = ds.add_database(Database(ds, memory_name="test_facet_size"))
await db.execute_write(
"create table neighbourhoods(city text, neighbourhood text)", block=True
diff --git a/tests/test_html.py b/tests/test_html.py
index f12f89cd..90fcdae7 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -214,7 +214,7 @@ def test_definition_sql(path, expected_definition_sql, app_client):
def test_table_cell_truncation():
- with make_app_client(config={"truncate_cells_html": 5}) as client:
+ with make_app_client(settings={"truncate_cells_html": 5}) as client:
response = client.get("/fixtures/facetable")
assert response.status == 200
table = Soup(response.body, "html.parser").find("table")
@@ -239,7 +239,7 @@ def test_table_cell_truncation():
def test_row_page_does_not_truncate():
- with make_app_client(config={"truncate_cells_html": 5}) as client:
+ with make_app_client(settings={"truncate_cells_html": 5}) as client:
response = client.get("/fixtures/facetable/1")
assert response.status == 200
table = Soup(response.body, "html.parser").find("table")
@@ -1072,7 +1072,9 @@ def test_database_download_disallowed_for_memory():
def test_allow_download_off():
- with make_app_client(is_immutable=True, config={"allow_download": False}) as client:
+ with make_app_client(
+ is_immutable=True, settings={"allow_download": False}
+ ) as client:
response = client.get("/fixtures")
soup = Soup(response.body, "html.parser")
assert not len(soup.findAll("a", {"href": re.compile(r"\.db$")}))
@@ -1486,7 +1488,7 @@ def test_query_error(app_client):
def test_config_template_debug_on():
- with make_app_client(config={"template_debug": True}) as client:
+ with make_app_client(settings={"template_debug": True}) as client:
response = client.get("/fixtures/facetable?_context=1")
assert response.status == 200
assert response.text.startswith("{")
@@ -1500,7 +1502,7 @@ def test_config_template_debug_off(app_client):
def test_debug_context_includes_extra_template_vars():
# https://github.com/simonw/datasette/issues/693
- with make_app_client(config={"template_debug": True}) as client:
+ with make_app_client(settings={"template_debug": True}) as client:
response = client.get("/fixtures/facetable?_context=1")
# scope_path is added by PLUGIN1
assert "scope_path" in response.text
@@ -1744,7 +1746,7 @@ def test_facet_more_links(
expected_ellipses_url,
):
with make_app_client(
- config={"max_returned_rows": max_returned_rows, "default_facet_size": 2}
+ settings={"max_returned_rows": max_returned_rows, "default_facet_size": 2}
) as client:
response = client.get(path)
soup = Soup(response.body, "html.parser")