Use new custom pages mechanism

Refs simonw/datasette#648
simonw · Apr 26, 2020 · 94a3c34 · 94a3c34
1 parent 81f7735
commit 94a3c34
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -33,8 +33,6 @@ jobs:
       run: |-
         wget https://niche-museums-j7hipcg4aq-uc.a.run.app/browse.db
         yaml-to-sqlite browse.db museums museums.yaml --pk=id
-        sqlite3 about.db ""
-        sqlite3 map.db ""
         python annotate_nominatum.py browse.db
         python annotate_timestamps.py
     - name: Set up Cloud Run
@@ -50,6 +48,7 @@ jobs:
         datasette publish cloudrun browse.db about.db map.db \
           --service niche-museums \
           --metadata metadata.yaml \
+          --branch 1b7b66c465e44025ec73421bd69752e42f108321 \
           --install=datasette-haversine \
           --install=datasette-pretty-json \
           --install=datasette-template-sql \

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,6 @@
-datasette~=0.40
+# Branch with custom pages support:
+https://github.com/simonw/datasette/archive/1b7b66c465e44025ec73421bd69752e42f108321.zip
+# datasette~=0.40
 datasette-haversine
 datasette-template-sql>=1.0
 datasette-pretty-json

diff --git a/serve.sh b/serve.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-datasette browse.db about.db map.db -p 8211 \
+datasette browse.db -p 8211 \
     --reload \
     --template-dir=templates/ \
     --plugins-dir=plugins/ \

diff --git a/templates/database-about.html → templates/pages/about.html b/templates/database-about.html → templates/pages/about.html
diff --git a/templates/database-map.html → templates/pages/map.html b/templates/database-map.html → templates/pages/map.html